diff --git a/bower.json b/bower.json index 9a930bc90d..cb1ec59c1f 100644 --- a/bower.json +++ b/bower.json @@ -4,8 +4,8 @@ "codemirror": "4.0.1", "Countable": "2.0.2", "device": "git://github.com/matthewhudson/device.js#5347a275b66020a0d4dfe9aad81a488f8cce448d", - "ember": "1.7.0", - "ember-data": "~1.0.0-beta.8", + "ember": "1.8.0", + "ember-data": "1.0.0-beta.11", "ember-load-initializers": "git://github.com/stefanpenner/ember-load-initializers.git#0.0.1", "ember-resolver": "git://github.com/stefanpenner/ember-jj-abrams-resolver.git#181251821cf513bb58d3e192faa13245a816f75e", "ember-simple-auth": "0.6.6", diff --git a/core/client/assets/sass/patterns/forms.scss b/core/client/assets/sass/patterns/forms.scss index 0c5ff86044..548dd09915 100644 --- a/core/client/assets/sass/patterns/forms.scss +++ b/core/client/assets/sass/patterns/forms.scss @@ -266,7 +266,7 @@ textarea { // Select Component // --- // -// {{view Ember.Select +// {{view "select" // id="activeTheme" // name="general[activeTheme]" // content=themes diff --git a/core/client/controllers/application.js b/core/client/controllers/application.js index b7692875f4..951490fd45 100644 --- a/core/client/controllers/application.js +++ b/core/client/controllers/application.js @@ -7,6 +7,12 @@ var ApplicationController = Ember.Controller.extend({ showGlobalMobileNav: false, showSettingsMenu: false, + userImageAlt: Ember.computed('session.user.name', function () { + var name = this.get('session.user.name'); + + return name + '\'s profile picture'; + }), + actions: { topNotificationChange: function (count) { this.set('topNotificationCount', count); diff --git a/core/client/templates/-navbar.hbs b/core/client/templates/-navbar.hbs index 4336dc1511..e2fc3a90f8 100644 --- a/core/client/templates/-navbar.hbs +++ b/core/client/templates/-navbar.hbs @@ -32,7 +32,7 @@