diff options
Diffstat (limited to 'web-ui')
| -rw-r--r-- | web-ui/app/index.html | 1 | ||||
| -rw-r--r-- | web-ui/app/js/page/default.js | 8 | ||||
| -rw-r--r-- | web-ui/app/js/page/feedback.js | 31 | ||||
| -rw-r--r-- | web-ui/app/js/views/templates.js | 3 | ||||
| -rw-r--r-- | web-ui/app/scss/styles.scss | 24 | ||||
| -rw-r--r-- | web-ui/app/templates/page/feedback.hbs | 8 | ||||
| -rw-r--r-- | web-ui/test/spec/page/feedback.spec.js | 0 |
7 files changed, 68 insertions, 7 deletions
diff --git a/web-ui/app/index.html b/web-ui/app/index.html index 0f4a36f8..df6c5afb 100644 --- a/web-ui/app/index.html +++ b/web-ui/app/index.html @@ -48,6 +48,7 @@ </a> <nav id="tag-list"></nav> <div class="side-nav-bottom"> + <nav id="feedback"></nav> <nav id="logout"></nav> </div> </section> diff --git a/web-ui/app/js/page/default.js b/web-ui/app/js/page/default.js index 1571202e..a4c545a1 100644 --- a/web-ui/app/js/page/default.js +++ b/web-ui/app/js/page/default.js @@ -42,7 +42,8 @@ define( 'views/recipientListFormatter', 'flight/lib/logger', 'page/logout', - 'page/logout_shortcut' + 'page/logout_shortcut', + 'page/feedback', ], function ( @@ -72,7 +73,8 @@ define( recipientListFormatter, withLogging, logout, - logoutShortcut) { + logoutShortcut, + feedback) { 'use strict'; function initialize(path) { @@ -105,6 +107,8 @@ define( offCanvas.attachTo(document); logout.attachTo('#logout'); logoutShortcut.attachTo('#logout-shortcut'); + + feedback.attachTo("#feedback"); } return initialize; diff --git a/web-ui/app/js/page/feedback.js b/web-ui/app/js/page/feedback.js new file mode 100644 index 00000000..032aedbc --- /dev/null +++ b/web-ui/app/js/page/feedback.js @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2015 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 <http://www.gnu.org/licenses/>. + */ + +define(['flight/lib/component', 'views/templates'], function (defineComponent, templates) { + 'use strict'; + + return defineComponent(function () { + this.render = function () { + this.$node.html(templates.page.feedback()); + }; + + this.after('initialize', function () { + this.render(); + }); + + }); +}); diff --git a/web-ui/app/js/views/templates.js b/web-ui/app/js/views/templates.js index 5e991a20..c4ce8c26 100644 --- a/web-ui/app/js/views/templates.js +++ b/web-ui/app/js/views/templates.js @@ -57,7 +57,8 @@ define(['hbs/templates'], function (templates) { }, page: { logout: window.Pixelated['app/templates/page/logout.hbs'], - logoutShortcut: window.Pixelated['app/templates/page/logout_shortcut.hbs'] + logoutShortcut: window.Pixelated['app/templates/page/logout_shortcut.hbs'], + feedback: window.Pixelated['app/templates/page/feedback.hbs'] } }; diff --git a/web-ui/app/scss/styles.scss b/web-ui/app/scss/styles.scss index 4f2a56ee..57227fad 100644 --- a/web-ui/app/scss/styles.scss +++ b/web-ui/app/scss/styles.scss @@ -390,17 +390,15 @@ section { } } - ul#logout { + ul#logout, ul#feedback { li { - color: $action_buttons; background-color: $navigation_background; padding: 5px 10px; position: relative; @include searching(4px, 19px, #333, 0.7em); &:hover { - background-color: $action_buttons; - color: $navigation_background; + color: $navigation_background; } div { @@ -417,6 +415,24 @@ section { } } + ul#logout li{ + color: $action_buttons; + &:hover { + background-color: $action_buttons; + } + } + + ul#feedback{ + margin-bottom: 0; + + li { + color: $light_orange; + &:hover { + background-color: $light_orange; + } + } + } + h3 { color: white; text-transform: uppercase; diff --git a/web-ui/app/templates/page/feedback.hbs b/web-ui/app/templates/page/feedback.hbs new file mode 100644 index 00000000..7c5c4d0c --- /dev/null +++ b/web-ui/app/templates/page/feedback.hbs @@ -0,0 +1,8 @@ +<ul id="feedback"> + <a title="feedback" href=""> + <li> + <div class="fa fa-exclamation-circle"></div> + <i class="shortcut-label"></i> Feedback + </li> + </a> +</ul> diff --git a/web-ui/test/spec/page/feedback.spec.js b/web-ui/test/spec/page/feedback.spec.js new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/web-ui/test/spec/page/feedback.spec.js |