From 813c3245eebfebf9d951e082b9a7473d0116b63a Mon Sep 17 00:00:00 2001 From: Clipperz Date: Wed, 9 Jan 2013 11:06:20 +0100 Subject: [PATCH] Fixed application version ID + link Fixed the display of application version in /gamma, and added a link to the specific code version on GitHub --- frontend/beta/html/index_template.html | 4 ++-- frontend/gamma/html/index_template.html | 1 + .../gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js | 5 ++--- frontend/gamma/tests/tests/Components/FullApp/index.html | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/frontend/beta/html/index_template.html b/frontend/beta/html/index_template.html index d51540b..0b2875c 100644 --- a/frontend/beta/html/index_template.html +++ b/frontend/beta/html/index_template.html @@ -83,11 +83,11 @@ Clipperz_normalizedNewLine = '\x0d\x0a';
diff --git a/frontend/gamma/html/index_template.html b/frontend/gamma/html/index_template.html index 699e0e9..ba7c311 100644 --- a/frontend/gamma/html/index_template.html +++ b/frontend/gamma/html/index_template.html @@ -16,6 +16,7 @@ Clipperz_IEisBroken = false; Clipperz_normalizedNewLine = '\n'; Clipperz_dumpUrl = "/../dump/"; + Clipperz_version = "@application.version@"; "use strict"; diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js index a25c8f5..2b2865c 100644 --- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js +++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js @@ -49,12 +49,11 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageFooter, Clipperz.PM.UI.Co this.append(this.element(), [ {tag:'div', cls:'footerWrapper', children:[ {tag:'div', cls:'footerContent', children:[ -// {tag:'div', cls:'footerStarIcon'}, {tag:'canvas', id:this.getId('footerStarIcon'), cls:'footerStarIcon'}, - {tag:'span', cls:'copyright', html:'Copyright © 2009-2012 Clipperz Srl'}, + {tag:'span', cls:'copyright', html:'Copyright © 2009-2013 Clipperz Srl'}, {tag:'a', href:'http://www.clipperz.com/terms_of_service', target:'_blank', html:'terms of service'}, {tag:'a', href:'http://www.clipperz.com/privacy_policy', target:'_blank', html:'privacy policy'}, - {tag:'span', cls:'applicationVersion', html:'application version: [1992]'} + {tag:'span', cls:'applicationVersion', htmlString:'application version: [' + Clipperz_version + ']'} ]} ]} ]); diff --git a/frontend/gamma/tests/tests/Components/FullApp/index.html b/frontend/gamma/tests/tests/Components/FullApp/index.html index 966a16c..fab110b 100644 --- a/frontend/gamma/tests/tests/Components/FullApp/index.html +++ b/frontend/gamma/tests/tests/Components/FullApp/index.html @@ -39,6 +39,7 @@ refer to http://www.clipperz.com. Clipperz_IEisBroken = false; Clipperz_normalizedNewLine = '\n'; Clipperz_dumpUrl = "/dump/"; + Clipperz_version = ">>> hg:28fe087a9316 <<<";