IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: change private category to lock glyph

Browse Source
This commit is contained in:
Jeff Atwood
2015-01-15 14:07:21 -08:00
parent 987504c6ab
commit 992ad7991b
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/components/category-title-link.js.es6
View File

@@ -7,7 +7,7 @@ export default Em.Component.extend({
categoryUrl = Discourse.getURL('/c/') + Discourse.Category.slugFor(category), categoryUrl = Discourse.getURL('/c/') + Discourse.Category.slugFor(category),
categoryName = Handlebars.Utils.escapeExpression(category.get('name')); categoryName = Handlebars.Utils.escapeExpression(category.get('name'));
if (category.get('read_restricted')) { buffer.push("<i class='fa fa-group'></i>"); } if (category.get('read_restricted')) { buffer.push("<i class='fa fa-lock'></i>"); }
buffer.push("<a href='" + categoryUrl + "'>"); buffer.push("<a href='" + categoryUrl + "'>");
buffer.push("<span class='category-name'>" + categoryName + "</span>"); buffer.push("<span class='category-name'>" + categoryName + "</span>");

6
app/assets/javascripts/discourse/lib/html.js
View File

@@ -111,7 +111,7 @@ Discourse.HTML = {
} }
if (restricted) { if (restricted) {
html += "><div><i class='fa fa-group'></i> " + name + "</div></" + elem + ">"; html += "><div><i class='fa fa-lock'></i> " + name + "</div></" + elem + ">";
} else { } else {
html += ">" + name + "</" + elem + ">"; html += ">" + name + "</" + elem + ">";
} }
@@ -121,9 +121,9 @@ Discourse.HTML = {
if (!parent) { parent = category; } if (!parent) { parent = category; }
categoryStyle = Discourse.HTML.categoryStyle(opts.onlyStripe ? category : parent) || ''; categoryStyle = Discourse.HTML.categoryStyle(opts.onlyStripe ? category : parent) || '';
html = "<span class='badge-wrapper'><" + elem + " class='badge-category-parent" + extraClasses + "' style=\"" + categoryStyle + html = "<span class='badge-wrapper'><" + elem + " class='badge-category-parent" + extraClasses + "' style=\"" + categoryStyle +
"\" href=\"" + (opts.link === false ? '' : url) + "\"><span class='category-name'>" + "\" href=\"" + (opts.link === false ? '' : url) + "\"><span class='category-name'>" +
(Em.get(parent, 'read_restricted') ? "<i class='fa fa-group'></i> " : "") + (Em.get(parent, 'read_restricted') ? "<i class='fa fa-lock'></i> " : "") +
Em.get(parent, 'name') + "</span></" + elem + ">" + Em.get(parent, 'name') + "</span></" + elem + ">" +
html + "</span>"; html + "</span>";
} }

2
app/assets/javascripts/discourse/templates/components/category-drop.hbs
View File

@@ -1,7 +1,7 @@
{{#if category}} {{#if category}}
<a href="#" {{action "expand"}} class="badge-category" {{bind-attr style="badgeStyle"}}> <a href="#" {{action "expand"}} class="badge-category" {{bind-attr style="badgeStyle"}}>
{{#if category.read_restricted}} {{#if category.read_restricted}}
<i class='fa fa-group'></i> <i class='fa fa-lock'></i>
{{/if}} {{/if}}
{{category.name}} {{category.name}}
</a> </a>