4 files changed, 5 insertions, 5 deletions
diff --git a/frontend/gamma/html/index_template.html b/frontend/gamma/html/index_template.html
index ba7c311..b80a34f 100644
--- a/frontend/gamma/html/index_template.html
+++ b/frontend/gamma/html/index_template.html
@@ -1,79 +1,79 @@
 <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_dumpUrl = "@dump.path@";
        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*/
 /* * /
        MochiKit.DOM.addLoadEvent(function () {
                Clipperz.Crypto.PRNG.defaultRandomGenerator().fastEntropyAccumulationForTestingPurpose();
-                MochiKit.Signal.signal(Clipperz.Signal.NotificationCenter, 'doLogin', {username:'j', passphrase:'j'});
+        //      MochiKit.Signal.signal(Clipperz.Signal.NotificationCenter, 'doLogin', {username:'joe', passphrase:'clipperz'});
        });
 / * */
 </script>
 <!-- -->
 <!-- div id="javaScriptAlert">
        <div class="mask"></div>
        <div class="message">
                <div class="header"></div>
                <div class="body">
                        <div class="alertLogo"></div>
                        <div class="alert">
                                <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 class="footer"></div>
        </div>
 </div -->
 <!-- -->
 </body>
 </html>
diff --git a/frontend/gamma/js/Clipperz/PM/Strings/Strings_en-US.js b/frontend/gamma/js/Clipperz/PM/Strings/Strings_en-US.js
index 85d55c0..72460ba 100644
--- a/frontend/gamma/js/Clipperz/PM/Strings/Strings_en-US.js
+++ b/frontend/gamma/js/Clipperz/PM/Strings/Strings_en-US.js
@@ -109,97 +109,97 @@ Clipperz.PM.Strings.Languages['en-us'] = {
        'loginMessagePanelInitialButtonLabel':          "Cancel",
        'loginMessagePanelConnectedTitle':                      "Connected",
        'loginMessagePanelConnectedText':                       "Done",
        'loginMessagePanelFailureTitle':                        "Error",
        'loginMessagePanelFailureText':                                 "Login failed",
        'loginMessagePanelFailureButtonLabel':          "Close",
 // Regular login - message panel - connection
        'connectionLoginSendingCredentialsMessageTitle':        "Verifying credentials",
        'connectionLoginSendingCredentialsMessageText':                 "Sending credentials",
        'connectionLoginCredentialsVerificationMessageTitle':"Verifying credentials",
        'connectionLoginCredentialsVerificationMessageText':"Performing SRP authentication",
        'connectionLoginDoneMessageTitle':                                      "Verifying credentials",
        'connectionLoginDoneMessageText':                                       "Connected",
        
        //Regular login - message panel - user
        'userLoginPanelUpgradingUserCredentialsMessageTitle':                           "Verifying credentials",
        'userLoginPanelUpgradingUserCredentialsMessageText':                            "Upgrading your credentials to a new authentication schema",
        'userLoginPanelConnectedMessageTitle':                                                          "User authenticated",
        'userLoginPanelConnectedMessageText':                                                           "Successfully logged in",
        'userLoginPanelTryingAnOlderConnectionSchemaMessageTitle':                      "Verifying credentials",
        'userLoginPanelTryingAnOlderConnectionSchemaMessageText':                       "Trying an older authentication schema",
        'userLoginPanelLoadingUserDataMessageTitle':                                            "User authenticated",
        'userLoginPanelLoadingUserDataMessageText':                                                     "Downloading encrypted card headers from Clipperz",
        'userLoginPanelDecryptingUserDataMessageTitle':                                                 "User authenticated",
        'userLoginPanelDecryptingUserDataMessageText':                                          "Local decryption of card headers",
        'userLoginPanelDecryptingUserStatisticsMessageTitle':                           "User authenticated",
        'userLoginPanelDecryptingUserStatisticsMessageText':                            "Local decryption of usage statistics",
        
        //Registration page - splash alert
        'splashAlertTitle':"Welcome to Clipperz!",
 'splashAlertText': "\
                <!--    FIX CSS                 DONE!   -->\
        <p>Some security advice</p>\
        <ul>\
                <li><p>Storing your data at Clipperz is as secure as the passphrase you choose to protect them. Nobody can access them unless they know your passphrase.</p></li>\
                <li><p>If you are going to use Clipperz for safeguarding sensitive and critical information please make sure to use a strong passphrase. The longer the better!</p></li>\
                <li><p>Clipperz will not be able to recover a lost passphrase!</p></li>\
        </ul>\
        <p>For any further information, please refer to <a href=\"http://www.clipperz.com\" target=\"_blank\">Clipperz</a> website.</p>",
        'splashAlertCloseButtonLabel':"Ok",
        
        // Registration page - form
        'registrationFormTitle':                                                        "create your account",
        'registrationFormUsernameLabel':                                        "username",
        'registrationFormPassphraseLabel':                                      "passphrase",
        'registrationFormRetypePassphraseLabel':                        "re-enter passphrase",
        'registrationFormSafetyCheckLabel':                                     "I understand that Clipperz will not be able to recover a lost passphrase.",
-        'registrationFormTermsOfServiceCheckLabel':                     "I have read and agreed to the <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Terms of Service</a>.",
+        'registrationFormTermsOfServiceCheckLabel':                     "I have read and agreed to the <a href='https://www.clipperz.com/terms_service' target='_blank'>Terms of Service</a>.",
        'registrationFormDoYouAlreadyHaveAnAccountLabel':       "do you already have an account?",
        'registrationFormSimplyLoginLabel':                                     "simply login",
        'registrationFormButtonLabel':                                          "Register",
 // Registration page - warning messages
        'registrationFormWarningMessageNotMatchingPassphrases':"Your passphrases don't match, please re-type them.",
        'registrationFormWarningMessageSafetyCheckNotSelected':"Please read and check all the boxes below.",
        'registrationFormWarningMessageTermsOfServiceCheckNotSelected':"You need to agree to the Terms of Service.",
        // Registration page - message panel
        'registrationMessagePanelInitialTitle':                                 "Creating account …",
        'registrationMessagePanelInitialText':                          "---",
        'registrationMessagePanelInitialButtonLabel':           "Cancel",
        'registrationMessagePanelRegistrationDoneTitle':        "Registration",
        'registrationMessagePanelRegistrationDoneText':                 "Done",
        'registrationMessagePanelFailureTitle':                                 "Registration failed",
        'registrationMessagePanelFailureButtonLabel':           "Close",
 // Registration page - message panel - connection
        'connectionRegistrationSendingRequestMessageText':      "Verifying credentials",
        'connectionRegistrationSendingCredentialsMessageText':"Sending credentials",
 // Registration page - splash panel
        'registrationSplashPanelTitle':                         "Security advice",
        'registrationSplashPanelDescription':   "<p>These are your Clipperz credentials, take good care of them. Clipperz will never display your username and passphrase a second time!</p>",
        'registrationSplashPanelUsernameLabel':         "username",
        'registrationSplashPanelPassphraseLabel':"passphrase",
        
        'registrationSplashPanelShowPassphraseButtonLabel':"show passphrase",
        
        //Header links
        'donateHeaderLinkLabel':                                "donate",
        'creditsHeaderLinkLabel':                               "credits",
        'feedbackHeaderLinkLabel':                              "feedback",
        'helpHeaderLinkLabel':                                  "help",
        'forumHeaderLinkLabel':                                         "forum",
        
        //Menu labels
        'recordMenuLabel':                                              "cards",
        'accountMenuLabel':                                             "account",
        'dataMenuLabel':                                                "data",
        'contactsMenuLabel':                                    "contacts",
        'toolsMenuLabel':                                               "tools",
        'logoutMenuLabel':                                              "logout",
        'lockMenuLabel':                                                "lock",
        //Lock dialog
        'lockTitle':                                                    "The account is locked",
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/NewUserCreationComponent.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/NewUserCreationComponent.js
index 06746d1..cd5faa6 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/NewUserCreationComponent.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/NewUserCreationComponent.js
@@ -110,97 +110,97 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.NewUserCreationComponent, Cli
                        this._tabPanelController = new Clipperz.PM.UI.Common.Controllers.TabPanelController({
                                component:this,
                                configuration:this._tabPanelControllerConfiguration
                        });
                        
                        MochiKit.Signal.connect(this._tabPanelController, 'tabSelected', this, 'handleTabSelected')
                }
                
                return this._tabPanelController;
        },
        //-------------------------------------------------------------------------
        'renderSelf': function() {
                this.append(this.element(), {tag:'div', cls:'NewUserCreation mainDialog', id:this.getId('panel'), children: [
                        {tag:'form', id:this.getId('form'), cls:'newUserCreationForm', children:[
                                {tag:'div', cls:'header', children:[
                                        {tag:'div', cls:'title', children:[
                                                {tag:'h3', id:this.getId('title'), html:"Create new user"}
                                        ]}
                                ]},
                                {tag:'div', id:this.getId('body'), cls:'body', children:[
                                        {tag:'div', cls:'tabContainer', children:[
                                                {tag:'ul', cls:'tabs', children:[
                                                                {tag:'li', id:this.getId('credentialsTab'),             children:[{tag:'span', html:"credentials"}]},
                                                                {tag:'li', id:this.getId('checkCredentialsTab'),children:[{tag:'span', html:"credentials check"}]},
                                                                {tag:'li', id:this.getId('termsOfServiceTab'),  children:[{tag:'span', html:"terms of service"}]},
                                                                {tag:'li', id:this.getId('createUserTab'),                      children:[{tag:'span', html:"create user"}]}//,
        //                                                      {tag:'li', id:this.getId('loginTab'),                   children:[{tag:'span', html:"login"}]},
                                                ]},
                                                {tag:'ul', cls:'tabPanels', children:[
                                                        {tag:'li', id:this.getId('credentialsTabpanel'), cls:'tabPanel credentials', children:[
                                                                {tag:'div', cls:'wizardStepDescription', children:[{tag:'span', html:Clipperz.PM.Strings.getValue('Wizards.NewUserWizard.CREDENTIALS.description')}]},
                                                                {tag:'ul', cls:'credentials', children:[
                                                                                {tag:'li', children:[{tag:'span', cls:'label', html:"username"},{tag:'input', type:'text', id:this.getId('username')/*, value:'test'*/}]},
                                                                                {tag:'li', children:[{tag:'span', cls:'label', html:"passphrase"},{tag:'input', type:'password', id:this.getId('passphrase')/*, value:'test'*/}]}
                                                                ]}
                                                        ]},
                                                        {tag:'li', id:this.getId('checkCredentialsTabpanel'), cls:'tabPanel checkCredentials', children:[
                                                                {tag:'div', cls:'wizardStepDescription', children:[{tag:'span', html:Clipperz.PM.Strings.getValue('Wizards.NewUserWizard.CHECK_CREDENTIALS.description')}]},
                                                                {tag:'ul', cls:'credentials', children:[
                                                                                {tag:'li', children:[{tag:'span', cls:'label', html:"re-passphrase"},{tag:'input', type:'password', id:this.getId('re-passphrase')/*, value:'test'*/}]}
                                                                ]}
                                                        ]},
                                                        {tag:'li', id:this.getId('termsOfServiceTabpanel'), cls:'tabPanel termsOfService', children:[
                                                                {tag:'div', cls:'wizardStepDescription', children:[{tag:'span', html:Clipperz.PM.Strings.getValue('Wizards.NewUserWizard.TERMS_OF_SERVICE.description')}]},
                                                                {tag:'ul', cls:'termsOfService', children:[
                                                                        {tag:'li', children:[{tag:'input', type:'checkbox', id:this.getId('awareOfUnrecoverablePassphrase')/*, checked:true*/}, {tag:'label', cls:'label', 'for':this.getId('awareOfUnrecoverablePassphrase'), html:"I understand that Clipperz will not be able to recover a lost passphrase."}]},
-                                                                        {tag:'li', children:[{tag:'input', type:'checkbox', id:this.getId('readTermsOfService')/*, checked:true*/}, {tag:'label', cls:'label', 'for':this.getId('readTermsOfService'), htmlString:"I have read and agreed to the <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Terms of Service</a>."}]}
+                                                                        {tag:'li', children:[{tag:'input', type:'checkbox', id:this.getId('readTermsOfService')/*, checked:true*/}, {tag:'label', cls:'label', 'for':this.getId('readTermsOfService'), htmlString:"I have read and agreed to the <a href='https://www.clipperz.com/terms_service' target='_blank'>Terms of Service</a>."}]}
                                                                ]}
                                                        ]},
                                                        {tag:'li', id:this.getId('createUserTabpanel'), cls:'tabPanel createUser', children:[
                                                                {tag:'div', cls:'wizardStepDescription', children:[{tag:'span', html:Clipperz.PM.Strings.getValue('Wizards.NewUserWizard.CREATE_USER.description')}]},
                                                                {tag:'ul', cls:'createUserStates', children:[
                                                                        {tag:'li', cls:'creating', id:this.getId('creatingRegistering'), children:[{tag:'span', html:"registering user"}]},
                                                                        {tag:'li', cls:'done', id:this.getId('creatingDone'), children:[{tag:'span', html:"done"}]},
                                                                        {tag:'li', cls:'fail', id:this.getId('creatingFailed'), children:[{tag:'span', html:"fail"}]}
                                                                ]}
                                                                ]}//,
        //                                              {tag:'li', id:this.getId('loginTabpanel'), cls:'tabPanel login', children:[
        //                                                      {tag:'div', cls:'wizardStepDescription', children:[{tag:'span', html:Clipperz.PM.Strings.getValue('Wizards.NewUserWizard.LOGIN.description')}]},
        //                                              ]}
                                                ]}
                                        ]}
                                ]},
                                {tag:'div', id:this.getId('footer'), cls:'footer', children:[
                                        {tag:'div', cls:'buttonArea', children:[
        //                                      {tag:'div', cls:'cancel', id:this.getId('cancelButton'), html:"cancel"},
        //                                      {tag:'div', cls:'save disabled',   id:this.getId('saveButton'),   html:"save"}
                                        ]}
                                ]}
                        ]},
                        {tag:'div', cls:'clear'}
                ]});
                this.tabPanelController().setup();
        //      MochiKit.Signal.connect(this.getId('panel'), 'onkeydown', this, 'handleKeyEvent');
                MochiKit.Signal.connect(MochiKit.DOM.currentDocument().body, 'onkeydown', this, 'handleKeyEvent');
                MochiKit.Signal.connect(this.getId('awareOfUnrecoverablePassphrase'), 'onchange', this, 'handleTermsOfServiceCheckboxChange');
                MochiKit.Signal.connect(this.getId('readTermsOfService'), 'onchange', this, 'handleTermsOfServiceCheckboxChange');
        },
        //-------------------------------------------------------------------------
 /*
        'resetContent': function () {
                this.getElement('username').value = '';
                this.getElement('passphrase').value = '';
        },
 */
        //-------------------------------------------------------------------------
        'displayElement': function() {
                return this.getElement('panel');
        },
        //-------------------------------------------------------------------------
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 df3ca0c..1f183dc 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js
@@ -4,62 +4,62 @@ Copyright 2008-2013 Clipperz Srl
 This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 * Clipperz 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 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. 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:'canvas', id:this.getId('footerStarIcon'), cls:'footerStarIcon'},
                                        {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:'https://www.clipperz.com/terms_service',target:'_blank', html:'terms of service'},
                                                {tag:'a', href:'http://www.clipperz.com/privacy_policy',target:'_blank', html:'privacy policy'},
                                        {tag:'div', 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"
 });