Fix user dropdown links

This commit is contained in:
Toby Zerner 2015-03-12 10:39:40 +10:30
parent 4395935cbe
commit f1ceb41d3f
2 changed files with 18 additions and 4 deletions

View File

@ -2,6 +2,9 @@ import Ember from 'ember';
import HasItemLists from 'flarum/mixins/has-item-lists';
import DropdownButton from 'flarum/components/ui/dropdown-button';
import NavItem from 'flarum/components/ui/nav-item';
var precompileTemplate = Ember.Handlebars.compile;
export default DropdownButton.extend(HasItemLists, {
layoutName: 'components/application/user-dropdown',
@ -13,11 +16,22 @@ export default DropdownButton.extend(HasItemLists, {
populateItems: function(items) {
var self = this;
this.addActionItem(items, 'profile', 'Profile', 'user');
this.addActionItem(items, 'settings', 'Settings', 'cog');
items.pushObjectWithTag(Ember.Component.extend({
tagName: 'li',
layout: precompileTemplate('{{#link-to "user" user}}{{fa-icon "user"}} Profile{{/link-to}}'),
user: this.get('parentController.session.user')
}));
items.pushObjectWithTag(Ember.Component.extend({
tagName: 'li',
layout: precompileTemplate('{{#link-to "settings"}}{{fa-icon "cog"}} Settings{{/link-to}}')
}));
this.addSeparatorItem(items);
this.addActionItem(items, 'logout', 'Log Out', 'sign-out', null, function() {
self.get('logout')();
self.get('parentController').send('invalidateSession');
});
}
})

View File

@ -90,7 +90,7 @@ export default Ember.View.extend(HasItemLists, {
if (this.get('controller.session.isAuthenticated')) {
items.pushObjectWithTag(UserDropdown.extend({
user: this.get('controller.session.user'),
logout: function() { controller.send('invalidateSession'); }
parentController: controller
}), 'user');
} else {
this.addActionItem(items, 'signup', 'Sign Up').reopen({className: 'btn btn-link'});