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 | |||
@@ -54,47 +54,47 @@ Clipperz_normalizedNewLine = '\x0d\x0a'; | |||
54 | <tr id="menusTR"> | 54 | <tr id="menusTR"> |
55 | <!-- | 55 | <!-- |
56 | <td class="selected"><div><a href="#">records</a></div></td> | 56 | <td class="selected"><div><a href="#">records</a></div></td> |
57 | <td><div><a href="./Account.html">account</a></div></td> | 57 | <td><div><a href="./Account.html">account</a></div></td> |
58 | <td><div><a href="#">data</a></div></td> | 58 | <td><div><a href="#">data</a></div></td> |
59 | <td><div><a href="#">bookmarklet</a></div></td> | 59 | <td><div><a href="#">bookmarklet</a></div></td> |
60 | --> | 60 | --> |
61 | </tr> | 61 | </tr> |
62 | </tbody> | 62 | </tbody> |
63 | </table> | 63 | </table> |
64 | </div> | 64 | </div> |
65 | </div> | 65 | </div> |
66 | </div> | 66 | </div> |
67 | 67 | ||
68 | <div id="main"> | 68 | <div id="main"> |
69 | <h3 class="loading">loading ...</h3> | 69 | <h3 class="loading">loading ...</h3> |
70 | 70 | ||
71 | @js_EMBEDDED@ | 71 | @js_EMBEDDED@ |
72 | 72 | ||
73 | <script> | 73 | <script> |
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 © 2008 Clipperz Srl - | 86 | Copyright © 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 | - | 89 | - |
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 | |||
@@ -1,50 +1,51 @@ | |||
1 | <html> | 1 | <html> |
2 | <head> | 2 | <head> |
3 | <title>@page.title@</title> | 3 | <title>@page.title@</title> |
4 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 4 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
5 | <!-- | 5 | <!-- |
6 | @copyright@ | 6 | @copyright@ |
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> |
23 | Clipperz_IEisBroken = true; | 24 | Clipperz_IEisBroken = true; |
24 | Clipperz_normalizedNewLine = '\x0d\x0a'; | 25 | Clipperz_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> |
31 | <div id="mainDiv"> | 32 | <div id="mainDiv"> |
32 | <div id="loading"> | 33 | <div id="loading"> |
33 | <div> | 34 | <div> |
34 | <!-- a href="http://www.clipperz.com" target="_blank"><div id="logo"></div></a --> | 35 | <!-- a href="http://www.clipperz.com" target="_blank"><div id="logo"></div></a --> |
35 | <h1>clipperz</h1> | 36 | <h1>clipperz</h1> |
36 | <h3 class="clipperzPayoff">keep it to yourself!</h3> | 37 | <h3 class="clipperzPayoff">keep it to yourself!</h3> |
37 | <!-- h5>loading ...</h5 --> | 38 | <!-- h5>loading ...</h5 --> |
38 | </div> | 39 | </div> |
39 | </div> | 40 | </div> |
40 | 41 | ||
41 | @js_EMBEDDED@ | 42 | @js_EMBEDDED@ |
42 | 43 | ||
43 | </div> | 44 | </div> |
44 | <!-- div id="applicationVersionType" class="@application.version.type@"></div --> | 45 | <!-- div id="applicationVersionType" class="@application.version.type@"></div --> |
45 | 46 | ||
46 | <script> | 47 | <script> |
47 | Clipperz.PM.Proxy.defaultProxy = new Clipperz.PM.Proxy.JSON({'url':'@request.path@', 'shouldPayTolls':@should.pay.toll@}); | 48 | Clipperz.PM.Proxy.defaultProxy = new Clipperz.PM.Proxy.JSON({'url':'@request.path@', 'shouldPayTolls':@should.pay.toll@}); |
48 | /*offline_data_placeholder*/ | 49 | /*offline_data_placeholder*/ |
49 | 50 | ||
50 | /* * / | 51 | /* * / |
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 | |||
@@ -20,49 +20,48 @@ refer to http://www.clipperz.com. | |||
20 | * You should have received a copy of the GNU Affero General Public | 20 | * You should have received a copy of the GNU Affero General Public |
21 | License along with Clipperz Community Edition. If not, see | 21 | License along with Clipperz Community Edition. If not, see |
22 | <http://www.gnu.org/licenses/>. | 22 | <http://www.gnu.org/licenses/>. |
23 | 23 | ||
24 | */ | 24 | */ |
25 | 25 | ||
26 | Clipperz.Base.module('Clipperz.PM.UI.Web.Components'); | 26 | Clipperz.Base.module('Clipperz.PM.UI.Web.Components'); |
27 | 27 | ||
28 | Clipperz.PM.UI.Web.Components.PageFooter = function(args) { | 28 | Clipperz.PM.UI.Web.Components.PageFooter = function(args) { |
29 | args = args || {}; | 29 | args = args || {}; |
30 | 30 | ||
31 | Clipperz.PM.UI.Web.Components.PageFooter.superclass.constructor.apply(this, arguments); | 31 | Clipperz.PM.UI.Web.Components.PageFooter.superclass.constructor.apply(this, arguments); |
32 | 32 | ||
33 | return this; | 33 | return this; |
34 | } | 34 | } |
35 | 35 | ||
36 | //============================================================================= | 36 | //============================================================================= |
37 | 37 | ||
38 | Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageFooter, Clipperz.PM.UI.Common.Components.BaseComponent, { | 38 | Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageFooter, Clipperz.PM.UI.Common.Components.BaseComponent, { |
39 | 39 | ||
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 © 2009-2012 Clipperz Srl'}, | 53 | {tag:'span', cls:'copyright', html:'Copyright © 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 | |||
@@ -10,64 +10,65 @@ refer to http://www.clipperz.com. | |||
10 | * Clipperz Community Edition is free software: you can redistribute | 10 | * Clipperz Community Edition is free software: you can redistribute |
11 | it and/or modify it under the terms of the GNU Affero General Public | 11 | it and/or modify it under the terms of the GNU Affero General Public |
12 | License as published by the Free Software Foundation, either version | 12 | License as published by the Free Software Foundation, either version |
13 | 3 of the License, or (at your option) any later version. | 13 | 3 of the License, or (at your option) any later version. |
14 | 14 | ||
15 | * Clipperz Community Edition is distributed in the hope that it will | 15 | * Clipperz Community Edition is distributed in the hope that it will |
16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied |
17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
18 | See the GNU Affero General Public License for more details. | 18 | See the GNU Affero General Public License for more details. |
19 | 19 | ||
20 | * You should have received a copy of the GNU Affero General Public | 20 | * You should have received a copy of the GNU Affero General Public |
21 | License along with Clipperz Community Edition. If not, see | 21 | License along with Clipperz Community Edition. If not, see |
22 | <http://www.gnu.org/licenses/>. | 22 | <http://www.gnu.org/licenses/>. |
23 | 23 | ||
24 | --> | 24 | --> |
25 | 25 | ||
26 | <html> | 26 | <html> |
27 | <head> | 27 | <head> |
28 | <title>FullApp TEST - WEB</title> | 28 | <title>FullApp TEST - WEB</title> |
29 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 29 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
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> |
45 | Clipperz_IEisBroken = true; | 46 | Clipperz_IEisBroken = true; |
46 | Clipperz_normalizedNewLine = '\x0d\x0a'; | 47 | Clipperz_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> |
54 | <script type='text/javascript' src='../../../../js/MochiKit/Iter.js'></script> | 55 | <script type='text/javascript' src='../../../../js/MochiKit/Iter.js'></script> |
55 | <script type='text/javascript' src='../../../../js/MochiKit/Logging.js'></script> | 56 | <script type='text/javascript' src='../../../../js/MochiKit/Logging.js'></script> |
56 | <script type='text/javascript' src='../../../../js/MochiKit/Format.js'></script> | 57 | <script type='text/javascript' src='../../../../js/MochiKit/Format.js'></script> |
57 | <script type='text/javascript' src='../../../../js/MochiKit/Async.js'></script> | 58 | <script type='text/javascript' src='../../../../js/MochiKit/Async.js'></script> |
58 | <script type='text/javascript' src='../../../../js/MochiKit/DOM.js'></script> | 59 | <script type='text/javascript' src='../../../../js/MochiKit/DOM.js'></script> |
59 | <script type='text/javascript' src='../../../../js/MochiKit/Style.js'></script> | 60 | <script type='text/javascript' src='../../../../js/MochiKit/Style.js'></script> |
60 | <script type='text/javascript' src='../../../../js/MochiKit/LoggingPane.js'></script> | 61 | <script type='text/javascript' src='../../../../js/MochiKit/LoggingPane.js'></script> |
61 | <script type='text/javascript' src='../../../../js/MochiKit/Color.js'></script> | 62 | <script type='text/javascript' src='../../../../js/MochiKit/Color.js'></script> |
62 | <script type='text/javascript' src='../../../../js/MochiKit/Signal.js'></script> | 63 | <script type='text/javascript' src='../../../../js/MochiKit/Signal.js'></script> |
63 | <script type='text/javascript' src='../../../../js/MochiKit/Position.js'></script> | 64 | <script type='text/javascript' src='../../../../js/MochiKit/Position.js'></script> |
64 | <script type='text/javascript' src='../../../../js/MochiKit/Selector.js'></script> | 65 | <script type='text/javascript' src='../../../../js/MochiKit/Selector.js'></script> |
65 | <script type='text/javascript' src='../../../../js/MochiKit/Visual.js'></script> | 66 | <script type='text/javascript' src='../../../../js/MochiKit/Visual.js'></script> |
66 | <script type='text/javascript' src='../../../../js/JSON/json2.js'></script> | 67 | <script type='text/javascript' src='../../../../js/JSON/json2.js'></script> |
67 | <script type='text/javascript' src='../../../../js/Clipperz/YUI/Utils.js'></script> | 68 | <script type='text/javascript' src='../../../../js/Clipperz/YUI/Utils.js'></script> |
68 | <script type='text/javascript' src='../../../../js/Clipperz/YUI/DomHelper.js'></script> | 69 | <script type='text/javascript' src='../../../../js/Clipperz/YUI/DomHelper.js'></script> |
69 | <script type='text/javascript' src='../../../../js/Clipperz/ByteArray.js'></script> | 70 | <script type='text/javascript' src='../../../../js/Clipperz/ByteArray.js'></script> |
70 | <script type='text/javascript' src='../../../../js/Clipperz/Base.js'></script> | 71 | <script type='text/javascript' src='../../../../js/Clipperz/Base.js'></script> |
71 | <script type='text/javascript' src='../../../../js/Clipperz/Async.js'></script> | 72 | <script type='text/javascript' src='../../../../js/Clipperz/Async.js'></script> |
72 | <script type='text/javascript' src='../../../../js/Clipperz/CSVProcessor.js'></script> | 73 | <script type='text/javascript' src='../../../../js/Clipperz/CSVProcessor.js'></script> |
73 | <script type='text/javascript' src='../../../../js/Clipperz/KeePassExportProcessor.js'></script> | 74 | <script type='text/javascript' src='../../../../js/Clipperz/KeePassExportProcessor.js'></script> |