From c2e35f9a9be1bb697c190b27b64521f8ad680e35 Mon Sep 17 00:00:00 2001
From: Jason Williams <jaswilli@gmail.com>
Date: Tue, 21 Oct 2014 16:02:11 +0000
Subject: [PATCH] Update Ember to 1.8.0.

Closes #4316
- Ember@1.8.0.
- Ember-Data@1.0.0-beta.11.
- Change templates to use new Ember.Select syntax and other minor
  cleanup.
- Adjust functional tests.
---
 ghost/admin/assets/sass/patterns/forms.scss  | 2 +-
 ghost/admin/controllers/application.js       | 6 ++++++
 ghost/admin/templates/-navbar.hbs            | 2 +-
 ghost/admin/templates/post-settings-menu.hbs | 2 +-
 ghost/admin/templates/settings/general.hbs   | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ghost/admin/assets/sass/patterns/forms.scss b/ghost/admin/assets/sass/patterns/forms.scss
index 0c5ff86044..548dd09915 100644
--- a/ghost/admin/assets/sass/patterns/forms.scss
+++ b/ghost/admin/assets/sass/patterns/forms.scss
@@ -266,7 +266,7 @@ textarea {
 // Select Component
 // ---
 // <span class="gh-select">
-//     {{view Ember.Select
+//     {{view "select"
 //         id="activeTheme"
 //         name="general[activeTheme]"
 //         content=themes
diff --git a/ghost/admin/controllers/application.js b/ghost/admin/controllers/application.js
index b7692875f4..951490fd45 100644
--- a/ghost/admin/controllers/application.js
+++ b/ghost/admin/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/ghost/admin/templates/-navbar.hbs b/ghost/admin/templates/-navbar.hbs
index 4336dc1511..e2fc3a90f8 100644
--- a/ghost/admin/templates/-navbar.hbs
+++ b/ghost/admin/templates/-navbar.hbs
@@ -32,7 +32,7 @@
     <div class="nav-item user-menu" data-href="#">
         {{#gh-dropdown-button dropdownName="user-menu" tagName="div" classNames="nav-label clearfix"}}
             {{#if session.user.image}}
-            <div class="image"><img {{bind-attr src="session.user.image"}} alt="{{session.user.name}}'s profile picture" /></div>
+            <div class="image"><img {{bind-attr src=session.user.image alt=userImageAlt}} /></div>
             {{else}}
             <div class="image"><img src="{{gh-path "blog" "shared/img/user-image.png"}}" alt="Profile picture" /></div>
             {{/if}}
diff --git a/ghost/admin/templates/post-settings-menu.hbs b/ghost/admin/templates/post-settings-menu.hbs
index a07999ef49..a8d8061f34 100644
--- a/ghost/admin/templates/post-settings-menu.hbs
+++ b/ghost/admin/templates/post-settings-menu.hbs
@@ -28,7 +28,7 @@
                 <label for="author-list">Author</label>
                 <span class="input-icon icon-user">
                     <span class="gh-select" tabindex="0">
-                    {{view Ember.Select
+                    {{view "select"
                         name="post-setting-author"
                         id="author-list"
                         content=authors
diff --git a/ghost/admin/templates/settings/general.hbs b/ghost/admin/templates/settings/general.hbs
index a194d3d736..b7bbd963ec 100644
--- a/ghost/admin/templates/settings/general.hbs
+++ b/ghost/admin/templates/settings/general.hbs
@@ -72,7 +72,7 @@
             <div class="form-group for-select">
                 <label for="activeTheme">Theme</label>
                 <span class="gh-select" {{bind-attr data-select-text=selectedTheme.label}} tabindex="0">
-                   {{view Ember.Select
+                   {{view "select"
                        id="activeTheme"
                        name="general[activeTheme]"
                        content=themes