github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-20 15:41:51 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add span to various labels so they can be targetted

Browse Source
This commit is contained in:
Robin Ward 2017-09-07 11:09:49 -04:00
parent 70d0e175a2
commit 8e88bf019f
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@
{{#if category.read_restricted}}
{{d-icon "lock"}}
{{/if}}
{{category.name}}
<span class='d-label'>{{category.name}}</span>
</a>
{{else}}
{{#if noSubcategories}}

18
app/assets/javascripts/discourse/widgets/header.js.es6
View File

@ -37,9 +37,12 @@ createWidget('header-notifications', {
const unreadNotifications = user.get('unread_notifications');
if (!!unreadNotifications) {
contents.push(this.attach('link', { action: attrs.action,
className: 'badge-notification unread-notifications',
rawLabel: unreadNotifications }));
contents.push(this.attach('link', {
action: attrs.action,
className: 'badge-notification unread-notifications',
rawLabel: unreadNotifications,
omitSpan: true
}));
}
const unreadPMs = user.get('unread_private_messages');
@ -55,9 +58,12 @@ createWidget('header-notifications', {
}
};
contents.push(this.attach('link', { action: attrs.action,
className: 'badge-notification unread-private-messages',
rawLabel: unreadPMs }));
contents.push(this.attach('link', {
action: attrs.action,
className: 'badge-notification unread-private-messages',
rawLabel: unreadPMs,
omitSpan: true
}));
}
return contents;

8
app/assets/javascripts/discourse/widgets/link.js.es6
View File

@ -54,7 +54,13 @@ export default createWidget('link', {
}
if (!attrs.hideLabel) {
result.push(this.label(attrs));
let label = this.label(attrs);
if (attrs.omitSpan) {
result.push(label);
} else {
result.push(h('span.d-label', label));
}
}
const currentUser = this.currentUser;