From bf562653fbdb2c6ef85df22f8dd5398f4a5cef44 Mon Sep 17 00:00:00 2001 From: Lisa Junger Date: Tue, 27 Jan 2015 10:37:10 +0100 Subject: Issue #242 added logout shortcut for dispatcher mode. - some new style to logout in expanded nav bar and shortcut. - to be complemented by #239. --- web-ui/app/index.html | 4 +++- web-ui/app/js/page/default.js | 7 ++++-- web-ui/app/js/page/logout_shortcut.js | 33 +++++++++++++++++++++++++++ web-ui/app/js/views/templates.js | 3 ++- web-ui/app/scss/styles.scss | 33 ++++++++++++++++++++++++--- web-ui/app/templates/page/logout.hbs | 9 +++++++- web-ui/app/templates/page/logout_shortcut.hbs | 6 +++++ 7 files changed, 87 insertions(+), 8 deletions(-) create mode 100644 web-ui/app/js/page/logout_shortcut.js create mode 100644 web-ui/app/templates/page/logout_shortcut.hbs (limited to 'web-ui/app') diff --git a/web-ui/app/index.html b/web-ui/app/index.html index 29356e3c..8123c3ef 100644 --- a/web-ui/app/index.html +++ b/web-ui/app/index.html @@ -38,11 +38,13 @@
Tags
 +
-
+
diff --git a/web-ui/app/js/page/default.js b/web-ui/app/js/page/default.js index 8ad8f1ff..57c7fd00 100644 --- a/web-ui/app/js/page/default.js +++ b/web-ui/app/js/page/default.js @@ -41,7 +41,8 @@ define( 'views/i18n', 'views/recipientListFormatter', 'flight/lib/logger', - 'page/logout' + 'page/logout', + 'page/logout_shortcut' ], function ( @@ -70,7 +71,8 @@ define( viewI18n, recipientListFormatter, withLogging, - logout) { + logout, + logoutShortcut) { 'use strict'; function initialize(path) { @@ -102,6 +104,7 @@ define( offCanvas.attachTo(document); logout.attachTo('#logout'); + logoutShortcut.attachTo('#logout-shortcut'); } return initialize; diff --git a/web-ui/app/js/page/logout_shortcut.js b/web-ui/app/js/page/logout_shortcut.js new file mode 100644 index 00000000..d79b2b9a --- /dev/null +++ b/web-ui/app/js/page/logout_shortcut.js @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2014 ThoughtWorks, Inc. + * + * Pixelated is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Pixelated is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Pixelated. If not, see . + */ +define(['flight/lib/component', 'features', 'views/templates'], function (defineComponent, features, templates) { + 'use strict'; + + return defineComponent(function () { + + this.render = function () { + var logoutShortcutHTML = templates.page.logoutShortcut(); + this.$node.html(logoutShortcutHTML); + }; + + this.after('initialize', function () { + if (features.isLogoutEnabled()) { + this.render(); + } + }); + }); +}); \ No newline at end of file diff --git a/web-ui/app/js/views/templates.js b/web-ui/app/js/views/templates.js index 91333da8..874e691d 100644 --- a/web-ui/app/js/views/templates.js +++ b/web-ui/app/js/views/templates.js @@ -53,7 +53,8 @@ define(['hbs/templates'], function (templates) { trigger: window.Pixelated['app/templates/search/search_trigger.hbs'] }, page: { - logout: window.Pixelated['app/templates/page/logout.hbs'] + logout: window.Pixelated['app/templates/page/logout.hbs'], + logoutShortcut: window.Pixelated['app/templates/page/logout_shortcut.hbs'] } }; diff --git a/web-ui/app/scss/styles.scss b/web-ui/app/scss/styles.scss index d3912da3..0bc40756 100644 --- a/web-ui/app/scss/styles.scss +++ b/web-ui/app/scss/styles.scss @@ -255,7 +255,7 @@ section { nav { padding-bottom: 25px; border-right: 1px solid lighten($secondary, 10%); - ul#default-tag-list, #custom-tag-list { + ul#default-tag-list, #custom-tag-list, #logout { li { transition: background-color 150ms ease-out; padding: 2px 10px; @@ -319,6 +319,25 @@ section { } } + ul#logout { + a { + color: #000000; + } + li { + color: #000000; + background-color: #2ba6cb; + padding: 5px 10px; + position: relative; + @include searching(4px, 19px, #333, 0.7em); + + &:before { + font-family: "FontAwesome"; + margin-right: 10px; + font-weight: normal; + } + } + } + h3 { color: white; text-transform: uppercase; @@ -327,8 +346,8 @@ section { font-weight: 600; margin: 0 10px; border-bottom: 1px dotted lighten($secondary, 10%); + } } - } } &#middle-pane { @@ -470,7 +489,11 @@ button { top: 0; z-index: 10000; position: relative; + &.logout { + color: #2ba6cb; + } } + ul.shortcuts { li { position: relative; @@ -482,8 +505,8 @@ button { cursor: default; a { color: $secondary; + } } - } @include searching(6px, 26px, #666, 0.9em); a { display: block; @@ -496,6 +519,10 @@ button { background: darken($contrast, 10%); color: $secondary; @include btn-transition; + &.logout{ + color: #000000; + background: #2ba6cb; + } } &[title]:hover:after { content: attr(title); diff --git a/web-ui/app/templates/page/logout.hbs b/web-ui/app/templates/page/logout.hbs index dda07eae..d3895a71 100644 --- a/web-ui/app/templates/page/logout.hbs +++ b/web-ui/app/templates/page/logout.hbs @@ -1 +1,8 @@ -Logout + \ No newline at end of file diff --git a/web-ui/app/templates/page/logout_shortcut.hbs b/web-ui/app/templates/page/logout_shortcut.hbs new file mode 100644 index 00000000..20df5513 --- /dev/null +++ b/web-ui/app/templates/page/logout_shortcut.hbs @@ -0,0 +1,6 @@ +
  • + + +
    Logout
    +     +
    • \ No newline at end of file -- cgit v1.2.3