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: clean up title for user avatar hover in header

Browse Source
This commit is contained in:
Sam 2015-06-01 17:08:19 +10:00
parent 9910dc041f
commit b2b4af213c
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/controllers/header.js.es6
View File

@ -18,10 +18,6 @@ const HeaderController = DiscourseController.extend({
return Discourse.User.current() && !this.get('topic.isPrivateMessage'); return Discourse.User.current() && !this.get('topic.isPrivateMessage');
}.property('topic.isPrivateMessage'), }.property('topic.isPrivateMessage'),
userDisplayName: function() {
return (Discourse.SiteSettings.enable_names && this.get('currentUser.name')) ? this.get('currentUser.name') : this.get('currentUser.username');
}.property('currentUser.name', 'currentUser.username'),
_resetCachedNotifications: function() { _resetCachedNotifications: function() {
// a bit hacky, but if we have no focus, hide notifications first // a bit hacky, but if we have no focus, hide notifications first
const visible = $("#notifications-dropdown").is(":visible"); const visible = $("#notifications-dropdown").is(":visible");

4
app/assets/javascripts/discourse/templates/header.hbs
View File

@ -54,6 +54,7 @@
data-render="renderSiteMap" data-render="renderSiteMap"
href href
title='{{i18n 'site_map'}}' title='{{i18n 'site_map'}}'
aria-label='{{i18n 'site_map'}}'
id="site-map"> id="site-map">
{{fa-icon "bars" label="site_map"}} {{fa-icon "bars" label="site_map"}}
</a> </a>
@ -68,7 +69,8 @@
data-dropdown="user-dropdown" data-dropdown="user-dropdown"
data-render="renderUserDropdown" data-render="renderUserDropdown"
href="#" href="#"
title='{{i18n 'user.avatar.title' name=userDisplayName}}' title='{{i18n 'user.avatar.header_title'}}'
aria-label='{{i18n 'user.avatar.header_title'}}'
id="current-user"> id="current-user">
{{bound-avatar currentUser "medium"}} {{bound-avatar currentUser "medium"}}
</a> </a>

3
config/locales/client.en.yml
View File

@ -587,7 +587,8 @@ en:
registration_ip_address: registration_ip_address:
title: "Registration IP Address" title: "Registration IP Address"
avatar: avatar:
title: "{{name}} profile" title: "Profile Picture"
header_title: "profile, messages, bookmarks and preferences"
title: title:
title: "Title" title: "Title"