TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-25 11:55:03 +03:00
Code Issues Projects Releases Wiki Activity

Fix-up remaining functional tests

Browse Source 
No Issue

- signup, signin and setup tests
- fixup other files for code styles
This commit is contained in:
cobbspur 2015-05-22 09:38:46 +01:00 committed by Hannah Wolfe
parent 4369727cd6
commit 7fbd9f84e6
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghost/admin/app/components/gh-notifications.js
View File

@ -8,7 +8,7 @@ var NotificationsComponent = Ember.Component.extend({
notification.get('status') : notification.status; notification.get('status') : notification.status;
return displayStatus === 'passive'; return displayStatus === 'passive';
}), })
}); });
export default NotificationsComponent; export default NotificationsComponent;

4
ghost/admin/app/templates/-nav-menu.hbs
View File

@ -9,7 +9,7 @@
{{/gh-dropdown-button}} {{/gh-dropdown-button}}
{{#gh-dropdown tagName="div" classNames="dropdown" name="user-menu" closeOnClick="true"}} {{#gh-dropdown tagName="div" classNames="dropdown" name="user-menu" closeOnClick="true"}}
<ul class="dropdown-menu dropdown-triangle-top js-user-menu-dropdown-menu" role="menu" style="right:-50%;left:auto;margin-right:40px"> <ul class="dropdown-menu dropdown-triangle-top js-user-menu-dropdown-menu" role="menu" style="right:-50%;left:auto;margin-right:40px">
<li role="presentation">{{#link-to "settings.about" classNames="dropdown-item js-nav-item" role="menuitem" tabindex="-1"}}<i class="icon-gh"></i> About Ghost{{/link-to}}</li> <li role="presentation">{{#link-to "settings.about" classNames="gh-nav-menu-about dropdown-item js-nav-item" role="menuitem" tabindex="-1"}}<i class="icon-gh"></i> About Ghost{{/link-to}}</li>
<li class="divider"></li> <li class="divider"></li>
<li role="presentation">{{#link-to "settings.users.user" session.user.slug classNames="dropdown-item user-menu-profile js-nav-item" role="menuitem" tabindex="-1"}}<i class="icon-user"></i> Your Profile{{/link-to}}</li> <li role="presentation">{{#link-to "settings.users.user" session.user.slug classNames="dropdown-item user-menu-profile js-nav-item" role="menuitem" tabindex="-1"}}<i class="icon-user"></i> Your Profile{{/link-to}}</li>
<li class="divider"></li> <li class="divider"></li>
@ -26,7 +26,7 @@
<li>{{#link-to "editor.new" classNames="gh-nav-main-editor"}}<i class="icon-pen"></i>New Post{{/link-to}}</li> <li>{{#link-to "editor.new" classNames="gh-nav-main-editor"}}<i class="icon-pen"></i>New Post{{/link-to}}</li>
<li>{{#link-to "posts" classNames="gh-nav-main-content"}}<i class="icon-content"></i>Content{{/link-to}}</li> <li>{{#link-to "posts" classNames="gh-nav-main-content"}}<i class="icon-content"></i>Content{{/link-to}}</li>
{{!<li><a href="#"><i class="icon-user"></i>My Posts</a></li>}} {{!<li><a href="#"><i class="icon-user"></i>My Posts</a></li>}}
<li>{{#link-to "settings.users" classnames="gh-nav-main-settings-users"}}<i class="icon-team"></i>Team{{/link-to}}</li> <li>{{#link-to "settings.users" classNames="gh-nav-main-users"}}<i class="icon-team"></i>Team{{/link-to}}</li>
{{!<li><a href="#"><i class="icon-idea"></i>Ideas</a></li>}} {{!<li><a href="#"><i class="icon-idea"></i>Ideas</a></li>}}
</ul> </ul>
<ul class="gh-nav-list gh-nav-settings"> <ul class="gh-nav-list gh-nav-settings">

4
ghost/admin/app/templates/settings/about.hbs
View File

@ -8,9 +8,9 @@
<section class="gh-env-details"> <section class="gh-env-details">
<ul class="gh-env-list"> <ul class="gh-env-list">
<li><strong>Version</strong> {{model.version}}</li> <li class="gh-env-list-version"><strong>Version</strong> {{model.version}}</li>
<li><strong>Environment</strong> {{model.environment}}</li> <li><strong>Environment</strong> {{model.environment}}</li>
<li><strong>Database</strong> {{model.database}}</li> <li class="gh-env-list-database-type"><strong>Database</strong> {{model.database}}</li>
<li><strong>Mail</strong> {{#if model.mail}}{{model.mail}}{{else}}Native{{/if}}</li> <li><strong>Mail</strong> {{#if model.mail}}{{model.mail}}{{else}}Native{{/if}}</li>
</ul> </ul>
<div class="gh-env-help"> <div class="gh-env-help">

5
ghost/admin/app/views/application.js
View File

@ -38,14 +38,13 @@ var ApplicationView = Ember.View.extend({
}); });
// #### Open and close the nav on hover // #### Open and close the nav on hover
$('.gh-nav').mouseenter(function() { $('.gh-nav').mouseenter(function () {
$('.gh-nav').addClass('open'); $('.gh-nav').addClass('open');
}); });
$('.gh-main').mouseenter(function() { $('.gh-main').mouseenter(function () {
$('.gh-nav').removeClass('open'); $('.gh-nav').removeClass('open');
}); });
mobileQuery.addListener(this.get('closeGlobalMobileNavOnDesktop')); mobileQuery.addListener(this.get('closeGlobalMobileNavOnDesktop'));
}, },