summaryrefslogtreecommitdiff
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
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 (more/less context) (show 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
@@ -54,47 +54,47 @@ Clipperz_normalizedNewLine = '\x0d\x0a';
<tr id="menusTR">
<!--
<td class="selected"><div><a href="#">records</a></div></td>
<td><div><a href="./Account.html">account</a></div></td>
<td><div><a href="#">data</a></div></td>
<td><div><a href="#">bookmarklet</a></div></td>
-->
</tr>
</tbody>
</table>
</div>
</div>
</div>
<div id="main">
<h3 class="loading">loading ...</h3>
@js_EMBEDDED@
<script>
Clipperz.PM.Proxy.defaultProxy = new Clipperz.PM.Proxy.JSON({'url':'@request.path@', 'shouldPayTolls':@should.pay.toll@});
/*offline_data_placeholder*/
</script>
<div id="javaScriptAlert">
<h1>Attention!</h1>
<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>
<h3>Javascript is required to access Clipperz.</h3>
<h5>Please enable scripting or upgrade your browser.</h5>
</div>
</div>
<div id="footer">
- Copyright &copy; 2008 Clipperz Srl -
+ Copyright &copy; 2008-2013 Clipperz Srl -
<a href="http://www.clipperz.com/terms_of_service" target="black">Terms of service</a> -
<a href="http://www.clipperz.com/privacy_policy" target="black">Privacy policy</a>
&nbsp;-&nbsp;
- Application version: @application.version@
+ Application version: <a href="https://github.com/clipperz/password-manager/tree/@application.version@" target="github">@application.version@</a>
</div>
<div id="recordDetailEditModeHeaderMask"></div>
<div id="recordDetailEditModeVerticalMask"></div>
</div>
<div id="applicationVersionType" class="@application.version.type@" />
</body>
</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 @@
<html>
<head>
<title>@page.title@</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<!--
@copyright@
-->
@css@
<link rel="shortcut icon" href="./clipperz.ico" />
<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." />
<meta name="keywords" content="password manager,gestor de contraseñas,gerenciador de senhas,Kennwortmanager,passwords,security,privacy,cryptography" />
<script>
Clipperz_IEisBroken = false;
Clipperz_normalizedNewLine = '\n';
Clipperz_dumpUrl = "/../dump/";
+ Clipperz_version = "@application.version@";
"use strict";
</script>
<!--[if IE]><script>
Clipperz_IEisBroken = true;
Clipperz_normalizedNewLine = '\x0d\x0a';
</script><![endif]-->
@js_LINKED@
</head>
<body>
<div id="mainDiv">
<div id="loading">
<div>
<!-- a href="http://www.clipperz.com" target="_blank"><div id="logo"></div></a -->
<h1>clipperz</h1>
<h3 class="clipperzPayoff">keep it to yourself!</h3>
<!-- h5>loading ...</h5 -->
</div>
</div>
@js_EMBEDDED@
</div>
<!-- div id="applicationVersionType" class="@application.version.type@"></div -->
<script>
Clipperz.PM.Proxy.defaultProxy = new Clipperz.PM.Proxy.JSON({'url':'@request.path@', 'shouldPayTolls':@should.pay.toll@});
/*offline_data_placeholder*/
/* * /
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.
* You should have received a copy of the GNU Affero General Public
License along with Clipperz Community Edition. If not, see
<http://www.gnu.org/licenses/>.
*/
Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
Clipperz.PM.UI.Web.Components.PageFooter = function(args) {
args = args || {};
Clipperz.PM.UI.Web.Components.PageFooter.superclass.constructor.apply(this, arguments);
return this;
}
//=============================================================================
Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageFooter, Clipperz.PM.UI.Common.Components.BaseComponent, {
//-------------------------------------------------------------------------
'toString': function () {
return "Clipperz.PM.UI.Web.Components.PageFooter component";
},
//-------------------------------------------------------------------------
'renderSelf': function(/*aContainer, aPosition*/) {
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>]'}
]}
]}
]);
Clipperz.PM.UI.Canvas.star.normal(this.getElement('footerStarIcon'), "#7e7e7e");
},
//-------------------------------------------------------------------------
__syntaxFix__: "syntax fix"
});
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.
* Clipperz Community Edition 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.
* Clipperz Community Edition 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 Clipperz Community Edition. If not, see
<http://www.gnu.org/licenses/>.
-->
<html>
<head>
<title>FullApp TEST - WEB</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css" href="../../../../css/web.css" />
<link rel="shortcut icon" href="./clipperz.ico" />
<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." />
<meta name="keywords" content="password manager,gestor de contraseñas,gerenciador de senhas,Kennwortmanager,passwords,security,privacy,cryptography" />
<script>
Clipperz_IEisBroken = false;
Clipperz_normalizedNewLine = '\n';
Clipperz_dumpUrl = "/dump/";
+ Clipperz_version = ">>> hg:28fe087a9316 <<<";
</script>
<!--[if IE]><script>
Clipperz_IEisBroken = true;
Clipperz_normalizedNewLine = '\x0d\x0a';
</script><![endif]-->
<script type='text/javascript' src='../../../../js/Bookmarklet.js'></script>
<script type='text/javascript' src='../../../../js/Bookmarklet_IE.js'></script>
<script type='text/javascript' src='../../../../js/MochiKit/Base.js'></script>
<script type='text/javascript' src='../../../../js/MochiKit/Iter.js'></script>
<script type='text/javascript' src='../../../../js/MochiKit/Logging.js'></script>
<script type='text/javascript' src='../../../../js/MochiKit/Format.js'></script>
<script type='text/javascript' src='../../../../js/MochiKit/Async.js'></script>
<script type='text/javascript' src='../../../../js/MochiKit/DOM.js'></script>
<script type='text/javascript' src='../../../../js/MochiKit/Style.js'></script>
<script type='text/javascript' src='../../../../js/MochiKit/LoggingPane.js'></script>
<script type='text/javascript' src='../../../../js/MochiKit/Color.js'></script>
<script type='text/javascript' src='../../../../js/MochiKit/Signal.js'></script>
<script type='text/javascript' src='../../../../js/MochiKit/Position.js'></script>
<script type='text/javascript' src='../../../../js/MochiKit/Selector.js'></script>
<script type='text/javascript' src='../../../../js/MochiKit/Visual.js'></script>
<script type='text/javascript' src='../../../../js/JSON/json2.js'></script>
<script type='text/javascript' src='../../../../js/Clipperz/YUI/Utils.js'></script>
<script type='text/javascript' src='../../../../js/Clipperz/YUI/DomHelper.js'></script>
<script type='text/javascript' src='../../../../js/Clipperz/ByteArray.js'></script>
<script type='text/javascript' src='../../../../js/Clipperz/Base.js'></script>
<script type='text/javascript' src='../../../../js/Clipperz/Async.js'></script>
<script type='text/javascript' src='../../../../js/Clipperz/CSVProcessor.js'></script>
<script type='text/javascript' src='../../../../js/Clipperz/KeePassExportProcessor.js'></script>