1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost-Admin.git synced 2023-12-14 02:33:04 +01:00

Merge pull request #4361 from jaswilli/ember18

Update Ember to 1.8.0.
This commit is contained in:
Matt Enlow 2014-10-30 08:26:26 -06:00
commit 0dc81c5324
5 changed files with 10 additions and 4 deletions

View file

@ -266,7 +266,7 @@ textarea {
// Select Component
// ---
// <span class="gh-select">
// {{view Ember.Select
// {{view "select"
// id="activeTheme"
// name="general[activeTheme]"
// content=themes

View file

@ -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);

View file

@ -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}}

View file

@ -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

View file

@ -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