From da2e8fa76a1e6daa1c0981c9bb54e04aa2674c98 Mon Sep 17 00:00:00 2001 From: Folker Bernitt Date: Tue, 15 Sep 2015 14:47:43 +0200 Subject: Add git revision to web-ui on build - Issue #453 --- web-ui/app/index.html | 2 ++ web-ui/app/js/page/default.js | 5 ++++- web-ui/app/js/page/version.js | 31 +++++++++++++++++++++++++++++++ web-ui/app/js/views/templates.js | 3 ++- web-ui/app/scss/styles.scss | 5 +++++ web-ui/app/templates/page/version.hbs | 1 + 6 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 web-ui/app/js/page/version.js create mode 100644 web-ui/app/templates/page/version.hbs (limited to 'web-ui/app') diff --git a/web-ui/app/index.html b/web-ui/app/index.html index df6c5afb..825d08a2 100644 --- a/web-ui/app/index.html +++ b/web-ui/app/index.html @@ -48,6 +48,8 @@
+
0.3.1-beta
+
diff --git a/web-ui/app/js/page/default.js b/web-ui/app/js/page/default.js index 0283d596..42aec759 100644 --- a/web-ui/app/js/page/default.js +++ b/web-ui/app/js/page/default.js @@ -44,6 +44,7 @@ define( 'page/logout', 'page/logout_shortcut', 'page/feedback', + 'page/version', ], function ( @@ -74,7 +75,8 @@ define( withLogging, logout, logoutShortcut, - feedback) { + feedback, + version) { 'use strict'; function initialize(path) { @@ -107,6 +109,7 @@ define( offCanvas.attachTo(document); logout.attachTo('#logout'); logoutShortcut.attachTo('#logout-shortcut'); + version.attachTo('.version'); feedback.attachTo('#feedback'); } diff --git a/web-ui/app/js/page/version.js b/web-ui/app/js/page/version.js new file mode 100644 index 00000000..e5299f52 --- /dev/null +++ b/web-ui/app/js/page/version.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 . + */ +define(['flight/lib/component', 'views/templates'], function (defineComponent, templates) { + 'use strict'; + + return defineComponent(function () { + + this.render = function () { + this.$node.html(templates.page.version()); + }; + + 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 c4ce8c26..1d9861db 100644 --- a/web-ui/app/js/views/templates.js +++ b/web-ui/app/js/views/templates.js @@ -58,7 +58,8 @@ define(['hbs/templates'], function (templates) { page: { logout: window.Pixelated['app/templates/page/logout.hbs'], logoutShortcut: window.Pixelated['app/templates/page/logout_shortcut.hbs'], - feedback: window.Pixelated['app/templates/page/feedback.hbs'] + feedback: window.Pixelated['app/templates/page/feedback.hbs'], + version: window.Pixelated['app/templates/page/version.hbs'] } }; diff --git a/web-ui/app/scss/styles.scss b/web-ui/app/scss/styles.scss index 57227fad..7b1a2ec3 100644 --- a/web-ui/app/scss/styles.scss +++ b/web-ui/app/scss/styles.scss @@ -790,6 +790,11 @@ div.side-nav-bottom { position: fixed; bottom: 0; background-color: $navigation_background; + + .version { + padding-left: 55px; + padding-bottom: 3px; + } } @import "mascot.scss"; diff --git a/web-ui/app/templates/page/version.hbs b/web-ui/app/templates/page/version.hbs new file mode 100644 index 00000000..40804ff3 --- /dev/null +++ b/web-ui/app/templates/page/version.hbs @@ -0,0 +1 @@ +version: UNKNOWN_VERSION \ No newline at end of file -- cgit v1.2.3