3 files changed, 3 insertions, 3 deletions
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 | |||
@@ -133,49 +133,49 @@ Clipperz.PM.Strings.Languages['en-us'] = { | |||
133 | 'userLoginPanelDecryptingUserDataMessageTitle': "User authenticated", | 133 | 'userLoginPanelDecryptingUserDataMessageTitle': "User authenticated", |
134 | 'userLoginPanelDecryptingUserDataMessageText': "Local decryption of card headers", | 134 | 'userLoginPanelDecryptingUserDataMessageText': "Local decryption of card headers", |
135 | 'userLoginPanelDecryptingUserStatisticsMessageTitle': "User authenticated", | 135 | 'userLoginPanelDecryptingUserStatisticsMessageTitle': "User authenticated", |
136 | 'userLoginPanelDecryptingUserStatisticsMessageText': "Local decryption of usage statistics", | 136 | 'userLoginPanelDecryptingUserStatisticsMessageText': "Local decryption of usage statistics", |
137 | 137 | ||
138 | //Registration page - splash alert | 138 | //Registration page - splash alert |
139 | 'splashAlertTitle':"Welcome to Clipperz!", | 139 | 'splashAlertTitle':"Welcome to Clipperz!", |
140 | 'splashAlertText': "\ | 140 | 'splashAlertText': "\ |
141 | <!-- FIX CSS DONE! -->\ | 141 | <!-- FIX CSS DONE! -->\ |
142 | <p>Some security advice</p>\ | 142 | <p>Some security advice</p>\ |
143 | <ul>\ | 143 | <ul>\ |
144 | <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>\ | 144 | <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>\ |
145 | <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>\ | 145 | <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>\ |
146 | <li><p>Clipperz will not be able to recover a lost passphrase!</p></li>\ | 146 | <li><p>Clipperz will not be able to recover a lost passphrase!</p></li>\ |
147 | </ul>\ | 147 | </ul>\ |
148 | <p>For any further information, please refer to <a href=\"http://www.clipperz.com\" target=\"_blank\">Clipperz</a> website.</p>", | 148 | <p>For any further information, please refer to <a href=\"http://www.clipperz.com\" target=\"_blank\">Clipperz</a> website.</p>", |
149 | 'splashAlertCloseButtonLabel':"Ok", | 149 | 'splashAlertCloseButtonLabel':"Ok", |
150 | 150 | ||
151 | // Registration page - form | 151 | // Registration page - form |
152 | 'registrationFormTitle': "create your account", | 152 | 'registrationFormTitle': "create your account", |
153 | 'registrationFormUsernameLabel': "username", | 153 | 'registrationFormUsernameLabel': "username", |
154 | 'registrationFormPassphraseLabel': "passphrase", | 154 | 'registrationFormPassphraseLabel': "passphrase", |
155 | 'registrationFormRetypePassphraseLabel': "re-enter passphrase", | 155 | 'registrationFormRetypePassphraseLabel': "re-enter passphrase", |
156 | 'registrationFormSafetyCheckLabel': "I understand that Clipperz will not be able to recover a lost passphrase.", | 156 | 'registrationFormSafetyCheckLabel': "I understand that Clipperz will not be able to recover a lost passphrase.", |
157 | 'registrationFormTermsOfServiceCheckLabel': "I have read and agreed to the <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Terms of Service</a>.", | 157 | 'registrationFormTermsOfServiceCheckLabel': "I have read and agreed to the <a href='https://www.clipperz.com/terms_service' target='_blank'>Terms of Service</a>.", |
158 | 'registrationFormDoYouAlreadyHaveAnAccountLabel': "do you already have an account?", | 158 | 'registrationFormDoYouAlreadyHaveAnAccountLabel': "do you already have an account?", |
159 | 'registrationFormSimplyLoginLabel': "simply login", | 159 | 'registrationFormSimplyLoginLabel': "simply login", |
160 | 'registrationFormButtonLabel': "Register", | 160 | 'registrationFormButtonLabel': "Register", |
161 | 161 | ||
162 | // Registration page - warning messages | 162 | // Registration page - warning messages |
163 | 'registrationFormWarningMessageNotMatchingPassphrases':"Your passphrases don't match, please re-type them.", | 163 | 'registrationFormWarningMessageNotMatchingPassphrases':"Your passphrases don't match, please re-type them.", |
164 | 'registrationFormWarningMessageSafetyCheckNotSelected':"Please read and check all the boxes below.", | 164 | 'registrationFormWarningMessageSafetyCheckNotSelected':"Please read and check all the boxes below.", |
165 | 'registrationFormWarningMessageTermsOfServiceCheckNotSelected':"You need to agree to the Terms of Service.", | 165 | 'registrationFormWarningMessageTermsOfServiceCheckNotSelected':"You need to agree to the Terms of Service.", |
166 | 166 | ||
167 | // Registration page - message panel | 167 | // Registration page - message panel |
168 | 'registrationMessagePanelInitialTitle': "Creating account …", | 168 | 'registrationMessagePanelInitialTitle': "Creating account …", |
169 | 'registrationMessagePanelInitialText': "---", | 169 | 'registrationMessagePanelInitialText': "---", |
170 | 'registrationMessagePanelInitialButtonLabel': "Cancel", | 170 | 'registrationMessagePanelInitialButtonLabel': "Cancel", |
171 | 'registrationMessagePanelRegistrationDoneTitle': "Registration", | 171 | 'registrationMessagePanelRegistrationDoneTitle': "Registration", |
172 | 'registrationMessagePanelRegistrationDoneText': "Done", | 172 | 'registrationMessagePanelRegistrationDoneText': "Done", |
173 | 'registrationMessagePanelFailureTitle': "Registration failed", | 173 | 'registrationMessagePanelFailureTitle': "Registration failed", |
174 | 'registrationMessagePanelFailureButtonLabel': "Close", | 174 | 'registrationMessagePanelFailureButtonLabel': "Close", |
175 | 175 | ||
176 | // Registration page - message panel - connection | 176 | // Registration page - message panel - connection |
177 | 'connectionRegistrationSendingRequestMessageText': "Verifying credentials", | 177 | 'connectionRegistrationSendingRequestMessageText': "Verifying credentials", |
178 | 'connectionRegistrationSendingCredentialsMessageText':"Sending credentials", | 178 | 'connectionRegistrationSendingCredentialsMessageText':"Sending credentials", |
179 | 179 | ||
180 | // Registration page - splash panel | 180 | // Registration page - splash panel |
181 | 'registrationSplashPanelTitle': "Security advice", | 181 | 'registrationSplashPanelTitle': "Security advice", |
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 | |||
@@ -134,49 +134,49 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.NewUserCreationComponent, Cli | |||
134 | {tag:'li', id:this.getId('credentialsTab'), children:[{tag:'span', html:"credentials"}]}, | 134 | {tag:'li', id:this.getId('credentialsTab'), children:[{tag:'span', html:"credentials"}]}, |
135 | {tag:'li', id:this.getId('checkCredentialsTab'),children:[{tag:'span', html:"credentials check"}]}, | 135 | {tag:'li', id:this.getId('checkCredentialsTab'),children:[{tag:'span', html:"credentials check"}]}, |
136 | {tag:'li', id:this.getId('termsOfServiceTab'), children:[{tag:'span', html:"terms of service"}]}, | 136 | {tag:'li', id:this.getId('termsOfServiceTab'), children:[{tag:'span', html:"terms of service"}]}, |
137 | {tag:'li', id:this.getId('createUserTab'), children:[{tag:'span', html:"create user"}]}//, | 137 | {tag:'li', id:this.getId('createUserTab'), children:[{tag:'span', html:"create user"}]}//, |
138 | // {tag:'li', id:this.getId('loginTab'), children:[{tag:'span', html:"login"}]}, | 138 | // {tag:'li', id:this.getId('loginTab'), children:[{tag:'span', html:"login"}]}, |
139 | ]}, | 139 | ]}, |
140 | {tag:'ul', cls:'tabPanels', children:[ | 140 | {tag:'ul', cls:'tabPanels', children:[ |
141 | {tag:'li', id:this.getId('credentialsTabpanel'), cls:'tabPanel credentials', children:[ | 141 | {tag:'li', id:this.getId('credentialsTabpanel'), cls:'tabPanel credentials', children:[ |
142 | {tag:'div', cls:'wizardStepDescription', children:[{tag:'span', html:Clipperz.PM.Strings.getValue('Wizards.NewUserWizard.CREDENTIALS.description')}]}, | 142 | {tag:'div', cls:'wizardStepDescription', children:[{tag:'span', html:Clipperz.PM.Strings.getValue('Wizards.NewUserWizard.CREDENTIALS.description')}]}, |
143 | {tag:'ul', cls:'credentials', children:[ | 143 | {tag:'ul', cls:'credentials', children:[ |
144 | {tag:'li', children:[{tag:'span', cls:'label', html:"username"},{tag:'input', type:'text', id:this.getId('username')/*, value:'test'*/}]}, | 144 | {tag:'li', children:[{tag:'span', cls:'label', html:"username"},{tag:'input', type:'text', id:this.getId('username')/*, value:'test'*/}]}, |
145 | {tag:'li', children:[{tag:'span', cls:'label', html:"passphrase"},{tag:'input', type:'password', id:this.getId('passphrase')/*, value:'test'*/}]} | 145 | {tag:'li', children:[{tag:'span', cls:'label', html:"passphrase"},{tag:'input', type:'password', id:this.getId('passphrase')/*, value:'test'*/}]} |
146 | ]} | 146 | ]} |
147 | ]}, | 147 | ]}, |
148 | {tag:'li', id:this.getId('checkCredentialsTabpanel'), cls:'tabPanel checkCredentials', children:[ | 148 | {tag:'li', id:this.getId('checkCredentialsTabpanel'), cls:'tabPanel checkCredentials', children:[ |
149 | {tag:'div', cls:'wizardStepDescription', children:[{tag:'span', html:Clipperz.PM.Strings.getValue('Wizards.NewUserWizard.CHECK_CREDENTIALS.description')}]}, | 149 | {tag:'div', cls:'wizardStepDescription', children:[{tag:'span', html:Clipperz.PM.Strings.getValue('Wizards.NewUserWizard.CHECK_CREDENTIALS.description')}]}, |
150 | {tag:'ul', cls:'credentials', children:[ | 150 | {tag:'ul', cls:'credentials', children:[ |
151 | {tag:'li', children:[{tag:'span', cls:'label', html:"re-passphrase"},{tag:'input', type:'password', id:this.getId('re-passphrase')/*, value:'test'*/}]} | 151 | {tag:'li', children:[{tag:'span', cls:'label', html:"re-passphrase"},{tag:'input', type:'password', id:this.getId('re-passphrase')/*, value:'test'*/}]} |
152 | ]} | 152 | ]} |
153 | ]}, | 153 | ]}, |
154 | {tag:'li', id:this.getId('termsOfServiceTabpanel'), cls:'tabPanel termsOfService', children:[ | 154 | {tag:'li', id:this.getId('termsOfServiceTabpanel'), cls:'tabPanel termsOfService', children:[ |
155 | {tag:'div', cls:'wizardStepDescription', children:[{tag:'span', html:Clipperz.PM.Strings.getValue('Wizards.NewUserWizard.TERMS_OF_SERVICE.description')}]}, | 155 | {tag:'div', cls:'wizardStepDescription', children:[{tag:'span', html:Clipperz.PM.Strings.getValue('Wizards.NewUserWizard.TERMS_OF_SERVICE.description')}]}, |
156 | {tag:'ul', cls:'termsOfService', children:[ | 156 | {tag:'ul', cls:'termsOfService', children:[ |
157 | {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."}]}, | 157 | {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."}]}, |
158 | {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>."}]} | 158 | {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>."}]} |
159 | ]} | 159 | ]} |
160 | ]}, | 160 | ]}, |
161 | {tag:'li', id:this.getId('createUserTabpanel'), cls:'tabPanel createUser', children:[ | 161 | {tag:'li', id:this.getId('createUserTabpanel'), cls:'tabPanel createUser', children:[ |
162 | {tag:'div', cls:'wizardStepDescription', children:[{tag:'span', html:Clipperz.PM.Strings.getValue('Wizards.NewUserWizard.CREATE_USER.description')}]}, | 162 | {tag:'div', cls:'wizardStepDescription', children:[{tag:'span', html:Clipperz.PM.Strings.getValue('Wizards.NewUserWizard.CREATE_USER.description')}]}, |
163 | {tag:'ul', cls:'createUserStates', children:[ | 163 | {tag:'ul', cls:'createUserStates', children:[ |
164 | {tag:'li', cls:'creating', id:this.getId('creatingRegistering'), children:[{tag:'span', html:"registering user"}]}, | 164 | {tag:'li', cls:'creating', id:this.getId('creatingRegistering'), children:[{tag:'span', html:"registering user"}]}, |
165 | {tag:'li', cls:'done', id:this.getId('creatingDone'), children:[{tag:'span', html:"done"}]}, | 165 | {tag:'li', cls:'done', id:this.getId('creatingDone'), children:[{tag:'span', html:"done"}]}, |
166 | {tag:'li', cls:'fail', id:this.getId('creatingFailed'), children:[{tag:'span', html:"fail"}]} | 166 | {tag:'li', cls:'fail', id:this.getId('creatingFailed'), children:[{tag:'span', html:"fail"}]} |
167 | ]} | 167 | ]} |
168 | ]}//, | 168 | ]}//, |
169 | // {tag:'li', id:this.getId('loginTabpanel'), cls:'tabPanel login', children:[ | 169 | // {tag:'li', id:this.getId('loginTabpanel'), cls:'tabPanel login', children:[ |
170 | // {tag:'div', cls:'wizardStepDescription', children:[{tag:'span', html:Clipperz.PM.Strings.getValue('Wizards.NewUserWizard.LOGIN.description')}]}, | 170 | // {tag:'div', cls:'wizardStepDescription', children:[{tag:'span', html:Clipperz.PM.Strings.getValue('Wizards.NewUserWizard.LOGIN.description')}]}, |
171 | // ]} | 171 | // ]} |
172 | ]} | 172 | ]} |
173 | ]} | 173 | ]} |
174 | ]}, | 174 | ]}, |
175 | {tag:'div', id:this.getId('footer'), cls:'footer', children:[ | 175 | {tag:'div', id:this.getId('footer'), cls:'footer', children:[ |
176 | {tag:'div', cls:'buttonArea', children:[ | 176 | {tag:'div', cls:'buttonArea', children:[ |
177 | // {tag:'div', cls:'cancel', id:this.getId('cancelButton'), html:"cancel"}, | 177 | // {tag:'div', cls:'cancel', id:this.getId('cancelButton'), html:"cancel"}, |
178 | // {tag:'div', cls:'save disabled', id:this.getId('saveButton'), html:"save"} | 178 | // {tag:'div', cls:'save disabled', id:this.getId('saveButton'), html:"save"} |
179 | ]} | 179 | ]} |
180 | ]} | 180 | ]} |
181 | ]}, | 181 | ]}, |
182 | {tag:'div', cls:'clear'} | 182 | {tag:'div', cls:'clear'} |
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 | |||
@@ -28,38 +28,38 @@ Clipperz.PM.UI.Web.Components.PageFooter = function(args) { | |||
28 | 28 | ||
29 | Clipperz.PM.UI.Web.Components.PageFooter.superclass.constructor.apply(this, arguments); | 29 | Clipperz.PM.UI.Web.Components.PageFooter.superclass.constructor.apply(this, arguments); |
30 | 30 | ||
31 | return this; | 31 | return this; |
32 | } | 32 | } |
33 | 33 | ||
34 | //============================================================================= | 34 | //============================================================================= |
35 | 35 | ||
36 | Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageFooter, Clipperz.PM.UI.Common.Components.BaseComponent, { | 36 | Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageFooter, Clipperz.PM.UI.Common.Components.BaseComponent, { |
37 | 37 | ||
38 | //------------------------------------------------------------------------- | 38 | //------------------------------------------------------------------------- |
39 | 39 | ||
40 | 'toString': function () { | 40 | 'toString': function () { |
41 | return "Clipperz.PM.UI.Web.Components.PageFooter component"; | 41 | return "Clipperz.PM.UI.Web.Components.PageFooter component"; |
42 | }, | 42 | }, |
43 | 43 | ||
44 | //------------------------------------------------------------------------- | 44 | //------------------------------------------------------------------------- |
45 | 45 | ||
46 | 'renderSelf': function(/*aContainer, aPosition*/) { | 46 | 'renderSelf': function(/*aContainer, aPosition*/) { |
47 | this.append(this.element(), [ | 47 | this.append(this.element(), [ |
48 | {tag:'div', cls:'footerWrapper', children:[ | 48 | {tag:'div', cls:'footerWrapper', children:[ |
49 | {tag:'div', cls:'footerContent', children:[ | 49 | {tag:'div', cls:'footerContent', children:[ |
50 | {tag:'canvas', id:this.getId('footerStarIcon'), cls:'footerStarIcon'}, | 50 | {tag:'canvas', id:this.getId('footerStarIcon'), cls:'footerStarIcon'}, |
51 | {tag:'span', cls:'copyright', html:'Copyright © 2009-2013 Clipperz Srl'}, | 51 | {tag:'span', cls:'copyright', html:'Copyright © 2009-2013 Clipperz Srl'}, |
52 | {tag:'a', href:'http://www.clipperz.com/terms_of_service',target:'_blank', html:'terms of service'}, | 52 | {tag:'a', href:'https://www.clipperz.com/terms_service',target:'_blank', html:'terms of service'}, |
53 | {tag:'a', href:'http://www.clipperz.com/privacy_policy',target:'_blank', html:'privacy policy'}, | 53 | {tag:'a', href:'http://www.clipperz.com/privacy_policy',target:'_blank', html:'privacy policy'}, |
54 | {tag:'div', cls:'applicationVersion', htmlString:'application version: <a href="https://github.com/clipperz/password-manager/tree/' + Clipperz_version + '" target="github">' + Clipperz_version + '</a>'} | 54 | {tag:'div', cls:'applicationVersion', htmlString:'application version: <a href="https://github.com/clipperz/password-manager/tree/' + Clipperz_version + '" target="github">' + Clipperz_version + '</a>'} |
55 | ]} | 55 | ]} |
56 | ]} | 56 | ]} |
57 | ]); | 57 | ]); |
58 | 58 | ||
59 | Clipperz.PM.UI.Canvas.star.normal(this.getElement('footerStarIcon'), "#7e7e7e"); | 59 | Clipperz.PM.UI.Canvas.star.normal(this.getElement('footerStarIcon'), "#7e7e7e"); |
60 | }, | 60 | }, |
61 | 61 | ||
62 | //------------------------------------------------------------------------- | 62 | //------------------------------------------------------------------------- |
63 | 63 | ||
64 | __syntaxFix__: "syntax fix" | 64 | __syntaxFix__: "syntax fix" |
65 | }); | 65 | }); |