Commit c30735ac authored by Nick Stenning's avatar Nick Stenning

Rename signin-control directive to login-control

parent 60f2a3bb
...@@ -137,13 +137,13 @@ module.exports = angular.module('h', [ ...@@ -137,13 +137,13 @@ module.exports = angular.module('h', [
.directive('hAutofocus', require('./directive/h-autofocus')) .directive('hAutofocus', require('./directive/h-autofocus'))
.directive('hTooltip', require('./directive/h-tooltip')) .directive('hTooltip', require('./directive/h-tooltip'))
.directive('loggedoutMessage', require('./directive/loggedout-message')) .directive('loggedoutMessage', require('./directive/loggedout-message'))
.directive('loginControl', require('./directive/login-control'))
.directive('loginForm', require('./directive/login-form').directive) .directive('loginForm', require('./directive/login-form').directive)
.directive('markdown', require('./directive/markdown')) .directive('markdown', require('./directive/markdown'))
.directive('publishAnnotationBtn', require('./directive/publish-annotation-btn')) .directive('publishAnnotationBtn', require('./directive/publish-annotation-btn'))
.directive('searchStatusBar', require('./directive/search-status-bar')) .directive('searchStatusBar', require('./directive/search-status-bar'))
.directive('shareDialog', require('./directive/share-dialog')) .directive('shareDialog', require('./directive/share-dialog'))
.directive('sidebarTutorial', require('./directive/sidebar-tutorial').directive) .directive('sidebarTutorial', require('./directive/sidebar-tutorial').directive)
.directive('signinControl', require('./directive/signin-control'))
.directive('searchInput', require('./directive/search-input')) .directive('searchInput', require('./directive/search-input'))
.directive('selectionTabs', require('./directive/selection-tabs')) .directive('selectionTabs', require('./directive/selection-tabs'))
.directive('sortDropdown', require('./directive/sort-dropdown')) .directive('sortDropdown', require('./directive/sort-dropdown'))
......
...@@ -33,6 +33,6 @@ module.exports = function () { ...@@ -33,6 +33,6 @@ module.exports = function () {
*/ */
newStyle: '<', newStyle: '<',
}, },
template: require('../../../templates/client/signin_control.html'), template: require('../../../templates/client/login_control.html'),
}; };
}; };
...@@ -17,6 +17,7 @@ $base-line-height: 20px; ...@@ -17,6 +17,7 @@ $base-line-height: 20px;
@import './group-list'; @import './group-list';
@import './help-panel'; @import './help-panel';
@import './loggedout-message'; @import './loggedout-message';
@import './login-control';
@import './markdown'; @import './markdown';
@import './primary-action-btn'; @import './primary-action-btn';
@import './publish-annotation-btn'; @import './publish-annotation-btn';
...@@ -24,7 +25,6 @@ $base-line-height: 20px; ...@@ -24,7 +25,6 @@ $base-line-height: 20px;
@import './selection-tabs'; @import './selection-tabs';
@import './share-link'; @import './share-link';
@import './sidebar-tutorial'; @import './sidebar-tutorial';
@import './signin-control';
@import './simple-search'; @import './simple-search';
@import './spinner'; @import './spinner';
@import './tags-input'; @import './tags-input';
......
.signin-control{ .login-control{
flex-shrink: 0; flex-shrink: 0;
} }
.signin-text { .login-text {
font-size: $body2-font-size; font-size: $body2-font-size;
padding-left: 6px; padding-left: 6px;
} }
/* The user account dropdown menu */ /* The user account dropdown menu */
.signin-control-menu { .login-control-menu {
.avatar { .avatar {
border-radius: 2px; border-radius: 2px;
} }
......
<!-- New controls --> <!-- New controls -->
<span class="signin-text" <span class="login-text"
ng-if="vm.newStyle && vm.auth.status === 'unknown'"></span> ng-if="vm.newStyle && vm.auth.status === 'unknown'"></span>
<span class="signin-text" <span class="login-text"
ng-if="vm.newStyle && vm.auth.status === 'signed-out'"> ng-if="vm.newStyle && vm.auth.status === 'signed-out'">
<a href="{{vm.serviceUrl}}register" target="_blank">Sign up</a> <a href="{{vm.serviceUrl}}register" target="_blank">Sign up</a>
/ <a href="" ng-click="vm.onLogin()">Log in</a> / <a href="" ng-click="vm.onLogin()">Log in</a>
</span> </span>
<div ng-if="vm.newStyle" <div ng-if="vm.newStyle"
class="pull-right signin-control-menu" class="pull-right login-control-menu"
dropdown dropdown
keyboard-nav> keyboard-nav>
<a role="button" <a role="button"
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<a href="" ng-click="vm.onLogin()">Log in</a> <a href="" ng-click="vm.onLogin()">Log in</a>
</span> </span>
<div ng-if="!vm.newStyle" <div ng-if="!vm.newStyle"
class="pull-right signin-control-menu" class="pull-right login-control-menu"
dropdown dropdown
keyboard-nav> keyboard-nav>
<span role="button" data-toggle="dropdown" dropdown-toggle> <span role="button" data-toggle="dropdown" dropdown-toggle>
......
...@@ -10,13 +10,13 @@ ...@@ -10,13 +10,13 @@
always-expanded="true"> always-expanded="true">
</search-input> </search-input>
<div class="top-bar__expander"></div> <div class="top-bar__expander"></div>
<signin-control <login-control
auth="auth" auth="auth"
new-style="false" new-style="false"
on-show-help-panel="onShowHelpPanel()" on-show-help-panel="onShowHelpPanel()"
on-login="onLogin()" on-login="onLogin()"
on-logout="onLogout()"> on-logout="onLogout()">
</signin-control> </login-control>
</div> </div>
<!-- New design for the top bar, as used in the sidebar. <!-- New design for the top bar, as used in the sidebar.
...@@ -42,13 +42,13 @@ ...@@ -42,13 +42,13 @@
title="Share this page"> title="Share this page">
<i class="h-icon-annotation-share"></i> <i class="h-icon-annotation-share"></i>
</a> </a>
<signin-control <login-control
class="signin-control" class="login-control"
auth="auth" auth="auth"
new-style="true" new-style="true"
on-show-help-panel="onShowHelpPanel()" on-show-help-panel="onShowHelpPanel()"
on-login="onLogin()" on-login="onLogin()"
on-logout="onLogout()"> on-logout="onLogout()">
</signin-control> </login-control>
</div> </div>
</div> </div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment