summaryrefslogtreecommitdiff
path: root/frontend
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) (unidiff)
tree32ac818904fb6a86d999b078a378c1e6be94656d /frontend
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') (more/less context) (ignore whitespace changes)
-rw-r--r--frontend/beta/html/index_template.html4
-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
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
@@ -74,27 +74,27 @@ Clipperz_normalizedNewLine = '\x0d\x0a';
74 Clipperz.PM.Proxy.defaultProxy = new Clipperz.PM.Proxy.JSON({'url':'@request.path@', 'shouldPayTolls':@should.pay.toll@}); 74 Clipperz.PM.Proxy.defaultProxy = new Clipperz.PM.Proxy.JSON({'url':'@request.path@', 'shouldPayTolls':@should.pay.toll@});
75 /*offline_data_placeholder*/ 75 /*offline_data_placeholder*/
76</script> 76</script>
77 77
78 <div id="javaScriptAlert"> 78 <div id="javaScriptAlert">
79 <h1>Attention!</h1> 79 <h1>Attention!</h1>
80 <p>If you can read this message, the chances are that your browser does not properly support JavaScript? or you have disabled this functionality yourself.</p> 80 <p>If you can read this message, the chances are that your browser does not properly support JavaScript? or you have disabled this functionality yourself.</p>
81 <h3>Javascript is required to access Clipperz.</h3> 81 <h3>Javascript is required to access Clipperz.</h3>
82 <h5>Please enable scripting or upgrade your browser.</h5> 82 <h5>Please enable scripting or upgrade your browser.</h5>
83 </div> 83 </div>
84 </div> 84 </div>
85 <div id="footer"> 85 <div id="footer">
86 Copyright &copy; 2008 Clipperz Srl - 86 Copyright &copy; 2008-2013 Clipperz Srl -
87 <a href="http://www.clipperz.com/terms_of_service" target="black">Terms of service</a> - 87 <a href="http://www.clipperz.com/terms_of_service" target="black">Terms of service</a> -
88 <a href="http://www.clipperz.com/privacy_policy" target="black">Privacy policy</a> 88 <a href="http://www.clipperz.com/privacy_policy" target="black">Privacy policy</a>
89 &nbsp;-&nbsp; 89 &nbsp;-&nbsp;
90 Application version: @application.version@ 90 Application version: <a href="https://github.com/clipperz/password-manager/tree/@application.version@" target="github">@application.version@</a>
91 </div> 91 </div>
92 92
93 <div id="recordDetailEditModeHeaderMask"></div> 93 <div id="recordDetailEditModeHeaderMask"></div>
94 <div id="recordDetailEditModeVerticalMask"></div> 94 <div id="recordDetailEditModeVerticalMask"></div>
95</div> 95</div>
96 96
97<div id="applicationVersionType" class="@application.version.type@" /> 97<div id="applicationVersionType" class="@application.version.type@" />
98 98
99</body> 99</body>
100</html> 100</html>
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
@@ -7,24 +7,25 @@
7--> 7-->
8 8
9@css@ 9@css@
10 10
11 <link rel="shortcut icon" href="./clipperz.ico" /> 11 <link rel="shortcut icon" href="./clipperz.ico" />
12 12
13 <meta name="description" content="Login to your web accounts with just one click. Never type a password again! Use multiple complex passwords and forget them. A password manager that enhances your online security." /> 13 <meta name="description" content="Login to your web accounts with just one click. Never type a password again! Use multiple complex passwords and forget them. A password manager that enhances your online security." />
14 <meta name="keywords" content="password manager,gestor de contraseñas,gerenciador de senhas,Kennwortmanager,passwords,security,privacy,cryptography" /> 14 <meta name="keywords" content="password manager,gestor de contraseñas,gerenciador de senhas,Kennwortmanager,passwords,security,privacy,cryptography" />
15<script> 15<script>
16 Clipperz_IEisBroken = false; 16 Clipperz_IEisBroken = false;
17 Clipperz_normalizedNewLine = '\n'; 17 Clipperz_normalizedNewLine = '\n';
18 Clipperz_dumpUrl = "/../dump/"; 18 Clipperz_dumpUrl = "/../dump/";
19 Clipperz_version = "@application.version@";
19 "use strict"; 20 "use strict";
20</script> 21</script>
21 22
22<!--[if IE]><script> 23<!--[if IE]><script>
23Clipperz_IEisBroken = true; 24Clipperz_IEisBroken = true;
24Clipperz_normalizedNewLine = '\x0d\x0a'; 25Clipperz_normalizedNewLine = '\x0d\x0a';
25</script><![endif]--> 26</script><![endif]-->
26 27
27@js_LINKED@ 28@js_LINKED@
28 29
29</head> 30</head>
30<body> 31<body>
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
@@ -40,29 +40,28 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageFooter, Clipperz.PM.UI.Co
40 //------------------------------------------------------------------------- 40 //-------------------------------------------------------------------------
41 41
42 'toString': function () { 42 'toString': function () {
43 return "Clipperz.PM.UI.Web.Components.PageFooter component"; 43 return "Clipperz.PM.UI.Web.Components.PageFooter component";
44 }, 44 },
45 45
46 //------------------------------------------------------------------------- 46 //-------------------------------------------------------------------------
47 47
48 'renderSelf': function(/*aContainer, aPosition*/) { 48 'renderSelf': function(/*aContainer, aPosition*/) {
49 this.append(this.element(), [ 49 this.append(this.element(), [
50 {tag:'div', cls:'footerWrapper', children:[ 50 {tag:'div', cls:'footerWrapper', children:[
51 {tag:'div', cls:'footerContent', children:[ 51 {tag:'div', cls:'footerContent', children:[
52 // {tag:'div', cls:'footerStarIcon'},
53 {tag:'canvas', id:this.getId('footerStarIcon'), cls:'footerStarIcon'}, 52 {tag:'canvas', id:this.getId('footerStarIcon'), cls:'footerStarIcon'},
54 {tag:'span', cls:'copyright', html:'Copyright &copy; 2009-2012 Clipperz Srl'}, 53 {tag:'span', cls:'copyright', html:'Copyright &copy; 2009-2013 Clipperz Srl'},
55 {tag:'a', href:'http://www.clipperz.com/terms_of_service',target:'_blank', html:'terms of service'}, 54 {tag:'a', href:'http://www.clipperz.com/terms_of_service',target:'_blank', html:'terms of service'},
56 {tag:'a', href:'http://www.clipperz.com/privacy_policy',target:'_blank', html:'privacy policy'}, 55 {tag:'a', href:'http://www.clipperz.com/privacy_policy',target:'_blank', html:'privacy policy'},
57 {tag:'span', cls:'applicationVersion', html:'application version: [1992]'} 56 {tag:'span', cls:'applicationVersion', htmlString:'application version: [<a href="https://github.com/clipperz/password-manager/tree/' + Clipperz_version + '" target="github">' + Clipperz_version + '</a>]'}
58 ]} 57 ]}
59 ]} 58 ]}
60 ]); 59 ]);
61 60
62 Clipperz.PM.UI.Canvas.star.normal(this.getElement('footerStarIcon'), "#7e7e7e"); 61 Clipperz.PM.UI.Canvas.star.normal(this.getElement('footerStarIcon'), "#7e7e7e");
63 }, 62 },
64 63
65 //------------------------------------------------------------------------- 64 //-------------------------------------------------------------------------
66 65
67 __syntaxFix__: "syntax fix" 66 __syntaxFix__: "syntax fix"
68}); 67});
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
@@ -30,24 +30,25 @@ refer to http://www.clipperz.com.
30 30
31 31
32 <link rel="stylesheet" type="text/css" href="../../../../css/web.css" /> 32 <link rel="stylesheet" type="text/css" href="../../../../css/web.css" />
33 33
34 <link rel="shortcut icon" href="./clipperz.ico" /> 34 <link rel="shortcut icon" href="./clipperz.ico" />
35 35
36 <meta name="description" content="Login to your web accounts with just one click. Never type a password again! Use multiple complex passwords and forget them. A password manager that enhances your online security." /> 36 <meta name="description" content="Login to your web accounts with just one click. Never type a password again! Use multiple complex passwords and forget them. A password manager that enhances your online security." />
37 <meta name="keywords" content="password manager,gestor de contraseñas,gerenciador de senhas,Kennwortmanager,passwords,security,privacy,cryptography" /> 37 <meta name="keywords" content="password manager,gestor de contraseñas,gerenciador de senhas,Kennwortmanager,passwords,security,privacy,cryptography" />
38<script> 38<script>
39 Clipperz_IEisBroken = false; 39 Clipperz_IEisBroken = false;
40 Clipperz_normalizedNewLine = '\n'; 40 Clipperz_normalizedNewLine = '\n';
41 Clipperz_dumpUrl = "/dump/"; 41 Clipperz_dumpUrl = "/dump/";
42 Clipperz_version = ">>> hg:28fe087a9316 <<<";
42</script> 43</script>
43 44
44<!--[if IE]><script> 45<!--[if IE]><script>
45Clipperz_IEisBroken = true; 46Clipperz_IEisBroken = true;
46Clipperz_normalizedNewLine = '\x0d\x0a'; 47Clipperz_normalizedNewLine = '\x0d\x0a';
47</script><![endif]--> 48</script><![endif]-->
48 49
49 50
50 <script type='text/javascript' src='../../../../js/Bookmarklet.js'></script> 51 <script type='text/javascript' src='../../../../js/Bookmarklet.js'></script>
51 <script type='text/javascript' src='../../../../js/Bookmarklet_IE.js'></script> 52 <script type='text/javascript' src='../../../../js/Bookmarklet_IE.js'></script>
52 53
53 <script type='text/javascript' src='../../../../js/MochiKit/Base.js'></script> 54 <script type='text/javascript' src='../../../../js/MochiKit/Base.js'></script>