summaryrefslogtreecommitdiff
path: root/frontend/gamma
authorClipperz <info@clipperz.com>2013-01-09 10:06:20 (UTC)
committer Clipperz <info@clipperz.com>2013-01-09 10:06:20 (UTC)
commit813c3245eebfebf9d951e082b9a7473d0116b63a (patch) (side-by-side diff)
tree32ac818904fb6a86d999b078a378c1e6be94656d /frontend/gamma
parent33e6f0ae7748d3f7f94d6bfe007703cf8df22ed6 (diff)
downloadclipperz-813c3245eebfebf9d951e082b9a7473d0116b63a.zip
clipperz-813c3245eebfebf9d951e082b9a7473d0116b63a.tar.gz
clipperz-813c3245eebfebf9d951e082b9a7473d0116b63a.tar.bz2
Fixed application version ID + link
Fixed the display of application version in /gamma, and added a link to the specific code version on GitHub
Diffstat (limited to 'frontend/gamma') (more/less context) (ignore whitespace changes)
-rw-r--r--frontend/gamma/html/index_template.html1
-rw-r--r--frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js5
-rw-r--r--frontend/gamma/tests/tests/Components/FullApp/index.html1
3 files changed, 4 insertions, 3 deletions
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";
</script>
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 &copy; 2009-2012 Clipperz Srl'},
+ {tag:'span', cls:'copyright', html:'Copyright &copy; 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: [<a href="https://github.com/clipperz/password-manager/tree/' + Clipperz_version + '" target="github">' + Clipperz_version + '</a>]'}
]}
]}
]);
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 <<<";
</script>
<!--[if IE]><script>