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/js/page/default.js | 7 +++++-- web-ui/app/js/page/logout_shortcut.js | 33 +++++++++++++++++++++++++++++++++ web-ui/app/js/views/templates.js | 3 ++- 3 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 web-ui/app/js/page/logout_shortcut.js (limited to 'web-ui/app/js') 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'] } }; -- cgit v1.2.3