12 files changed, 41 insertions, 11 deletions
diff --git a/frontend/beta/js/Clipperz/PM/Components/Compact/CompactHeader.js b/frontend/beta/js/Clipperz/PM/Components/Compact/CompactHeader.js index 14e42a5..9fda202 100644 --- a/frontend/beta/js/Clipperz/PM/Components/Compact/CompactHeader.js +++ b/frontend/beta/js/Clipperz/PM/Components/Compact/CompactHeader.js | |||
@@ -63,5 +63,5 @@ YAHOO.extendX(Clipperz.PM.Components.Compact.CompactHeader, Clipperz.PM.Componen | |||
63 | {tag:'ul', children:[ | 63 | {tag:'ul', children:[ |
64 | {tag:'li', children:[{tag:'a', id:'donateHeaderLink', html:'donate', target:'_blank'}]}, | 64 | {tag:'li', children:[{tag:'a', id:'donateHeaderLink', html:'donate', target:'_blank'}]}, |
65 | {tag:'li', children:[{tag:'a', id:'creditsHeaderLink', html:'credits', target:'_blank'}]}, | 65 | // {tag:'li', children:[{tag:'a', id:'creditsHeaderLink', html:'credits', target:'_blank'}]}, |
66 | {tag:'li', children:[{tag:'a', id:'feedbackHeaderLink', html:'feedback', target:'_blank'}]}, | 66 | {tag:'li', children:[{tag:'a', id:'feedbackHeaderLink', html:'feedback', target:'_blank'}]}, |
67 | {tag:'li', children:[{tag:'a', id:'helpHeaderLink', html:'help', target:'_blank'}]}, | 67 | {tag:'li', children:[{tag:'a', id:'helpHeaderLink', html:'help', target:'_blank'}]}, |
diff --git a/frontend/beta/js/Clipperz/PM/Components/Panels/MainPanel.js b/frontend/beta/js/Clipperz/PM/Components/Panels/MainPanel.js index c19a8a3..bab5fba 100644 --- a/frontend/beta/js/Clipperz/PM/Components/Panels/MainPanel.js +++ b/frontend/beta/js/Clipperz/PM/Components/Panels/MainPanel.js | |||
@@ -84,4 +84,26 @@ YAHOO.extendX(Clipperz.PM.Components.Panels.MainPanel, Clipperz.PM.Components.Pa | |||
84 | ]}, | 84 | ]}, |
85 | {tag:'td', valign:'top', id:'directLoginsTD', width:'200', children:[ | 85 | {tag:'td', valign:'top', id:'directLoginsTD', width:'200', children:[ |
86 | {tag:'div', id:'accountStatus', children:[ | ||
87 | {tag:'div', cls:'header', children:[{tag:'h5', cls:'title', htmlString:"Account info"}]}, | ||
88 | // {tag:'div', cls:'accountStatus', html:"early adopter"}, | ||
89 | {tag:'div', cls:'accountLevel', children:[ | ||
90 | {tag:'span', cls:'label', html:"status"}, | ||
91 | {tag:'span', cls:'status', html:"early adopter"} | ||
92 | ]}, | ||
93 | {tag:'div', cls:'accountLevel', children:[ | ||
94 | {tag:'span', cls:'label', html:"level"}, | ||
95 | // {tag:'span', cls:'level', html:"★☆☆☆"} | ||
96 | {tag:'span', cls:'level', html:"☆☆☆☆"} | ||
97 | ]}, | ||
98 | {tag:'div', cls:'accountExpiration', children:[ | ||
99 | {tag:'span', cls:'label', html:"expires"}, | ||
100 | // {tag:'span', cls:'expriation', html:"on 26 April 2014"} | ||
101 | {tag:'span', cls:'expriation', html:"never"} | ||
102 | ]}, | ||
103 | // {tag:'div', cls:'payButton', children:[ | ||
104 | // {tag:'a', href:'#', cls:'info', html:"info"} | ||
105 | // ]} | ||
106 | {tag:'div', id:'payButton', cls:'payButton'} | ||
107 | ]}, | ||
86 | {tag:'div', id:'directLoginsBlock', children:[ | 108 | {tag:'div', id:'directLoginsBlock', children:[ |
87 | {tag:'div', cls:'directLoginsBlockHeaderBox', children:[{tag:'h3', id:'directLoginTitle', htmlString:Clipperz.PM.Strings['mainPanelDirectLoginBlockLabel']}]}, | 109 | {tag:'div', cls:'directLoginsBlockHeaderBox', children:[{tag:'h3', id:'directLoginTitle', htmlString:Clipperz.PM.Strings['mainPanelDirectLoginBlockLabel']}]}, |
@@ -137,4 +159,6 @@ YAHOO.extendX(Clipperz.PM.Components.Panels.MainPanel, Clipperz.PM.Components.Pa | |||
137 | 159 | ||
138 | YAHOO.ext.Element.get('directLogins').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); | 160 | YAHOO.ext.Element.get('directLogins').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); |
161 | //TODO | ||
162 | new YAHOO.ext.Button('payButton', {text:"Info", handler:this.payButtonHandler, scope:this}); | ||
139 | 163 | ||
140 | this.recordDetailComponent(); | 164 | this.recordDetailComponent(); |
@@ -146,4 +170,10 @@ YAHOO.extendX(Clipperz.PM.Components.Panels.MainPanel, Clipperz.PM.Components.Pa | |||
146 | //------------------------------------------------------------------------- | 170 | //------------------------------------------------------------------------- |
147 | 171 | ||
172 | 'payButtonHandler': function(anEvent) { | ||
173 | window.open('https://www.clipperz.com/pricing/', '_blank'); | ||
174 | }, | ||
175 | |||
176 | //------------------------------------------------------------------------- | ||
177 | |||
148 | 'addNewRecordButton': function() { | 178 | 'addNewRecordButton': function() { |
149 | return this._addNewRecordButton; | 179 | return this._addNewRecordButton; |
diff --git a/frontend/beta/js/Clipperz/PM/Main.js b/frontend/beta/js/Clipperz/PM/Main.js index 3dded31..3329a8e 100644 --- a/frontend/beta/js/Clipperz/PM/Main.js +++ b/frontend/beta/js/Clipperz/PM/Main.js | |||
@@ -54,5 +54,5 @@ MochiKit.Base.update(Clipperz.PM.Main.prototype, { | |||
54 | YAHOO.ext.Element.get('donateHeaderIconLink').dom.href = Clipperz.PM.Strings['donateHeaderLinkUrl']; | 54 | YAHOO.ext.Element.get('donateHeaderIconLink').dom.href = Clipperz.PM.Strings['donateHeaderLinkUrl']; |
55 | YAHOO.ext.Element.get('donateHeaderLink').update(Clipperz.PM.Strings['donateHeaderLinkLabel']).dom.href = Clipperz.PM.Strings['donateHeaderLinkUrl']; | 55 | YAHOO.ext.Element.get('donateHeaderLink').update(Clipperz.PM.Strings['donateHeaderLinkLabel']).dom.href = Clipperz.PM.Strings['donateHeaderLinkUrl']; |
56 | YAHOO.ext.Element.get('creditsHeaderLink').update(Clipperz.PM.Strings['creditsHeaderLinkLabel']).dom.href = Clipperz.PM.Strings['creditsHeaderLinkUrl']; | 56 | // YAHOO.ext.Element.get('creditsHeaderLink').update(Clipperz.PM.Strings['creditsHeaderLinkLabel']).dom.href = Clipperz.PM.Strings['creditsHeaderLinkUrl']; |
57 | YAHOO.ext.Element.get('feedbackHeaderLink').update(Clipperz.PM.Strings['feedbackHeaderLinkLabel']).dom.href = Clipperz.PM.Strings['feedbackHeaderLinkUrl']; | 57 | YAHOO.ext.Element.get('feedbackHeaderLink').update(Clipperz.PM.Strings['feedbackHeaderLinkLabel']).dom.href = Clipperz.PM.Strings['feedbackHeaderLinkUrl']; |
58 | YAHOO.ext.Element.get('helpHeaderLink').update(Clipperz.PM.Strings['helpHeaderLinkLabel']).dom.href = Clipperz.PM.Strings['helpHeaderLinkUrl']; | 58 | YAHOO.ext.Element.get('helpHeaderLink').update(Clipperz.PM.Strings['helpHeaderLinkLabel']).dom.href = Clipperz.PM.Strings['helpHeaderLinkUrl']; |
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_de-DE.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_de-DE.js index 0ca4b51..1e2cb50 100644 --- a/frontend/beta/js/Clipperz/PM/Strings/Strings_de-DE.js +++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_de-DE.js | |||
@@ -69,5 +69,5 @@ Clipperz.PM.Strings.Languages['de-DE'.toLowerCase()] = MochiKit.Base.merge(Clipp | |||
69 | 'registrationFormRetypePassphraseLabel':"Wiederhole Sicherheitssatz", | 69 | 'registrationFormRetypePassphraseLabel':"Wiederhole Sicherheitssatz", |
70 | 'registrationFormSafetyCheckLabel':"Ich akzeptiere dass es Clipperz nicht möglich ist, einen verlorenen Sicherheitssatz wiederherzustellen.", | 70 | 'registrationFormSafetyCheckLabel':"Ich akzeptiere dass es Clipperz nicht möglich ist, einen verlorenen Sicherheitssatz wiederherzustellen.", |
71 | 'registrationFormTermsOfServiceCheckLabel':"Ich habe die <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Nutzungsbedingungen</a> gelesen, verstanden und akzeptiere diese.", | 71 | 'registrationFormTermsOfServiceCheckLabel':"Ich habe die <a href='https://www.clipperz.com/terms_service' target='_blank'>Nutzungsbedingungen</a> gelesen, verstanden und akzeptiere diese.", |
72 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"Hast Du bereits einen Zugang?", | 72 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"Hast Du bereits einen Zugang?", |
73 | 'registrationFormSimplyLoginLabel':"Einloggen", | 73 | 'registrationFormSimplyLoginLabel':"Einloggen", |
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_el-GR.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_el-GR.js index f7a7583..42ecf53 100644 --- a/frontend/beta/js/Clipperz/PM/Strings/Strings_el-GR.js +++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_el-GR.js | |||
@@ -150,5 +150,5 @@ Clipperz.PM.Strings.Languages['el-gr'] = MochiKit.Base.merge(Clipperz.PM.Strings | |||
150 | 'registrationFormRetypePassphraseLabel': "Εισάγετε ξανά την κωδική φράση", | 150 | 'registrationFormRetypePassphraseLabel': "Εισάγετε ξανά την κωδική φράση", |
151 | 'registrationFormSafetyCheckLabel': "Κατανοώ πως το Clipperz δεν θα μπορεί να ανακτήσει μία χαμένη κωδική φράση.", | 151 | 'registrationFormSafetyCheckLabel': "Κατανοώ πως το Clipperz δεν θα μπορεί να ανακτήσει μία χαμένη κωδική φράση.", |
152 | 'registrationFormTermsOfServiceCheckLabel': "Έχω διαβάσει και αποδέχομαι τους Όρους Χρήσης <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Όρους Χρήσης</a>.", | 152 | 'registrationFormTermsOfServiceCheckLabel': "Έχω διαβάσει και αποδέχομαι τους Όρους Χρήσης <a href='https://www.clipperz.com/terms_service' target='_blank'>Όρους Χρήσης</a>.", |
153 | 'registrationFormDoYouAlreadyHaveAnAccountLabel': "Έχετε ήδη έναν λογαριασμό?", | 153 | 'registrationFormDoYouAlreadyHaveAnAccountLabel': "Έχετε ήδη έναν λογαριασμό?", |
154 | 'registrationFormSimplyLoginLabel': "απλώς συνδεθείτε", | 154 | 'registrationFormSimplyLoginLabel': "απλώς συνδεθείτε", |
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js index 97543a4..ce8dd85 100644 --- a/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js +++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js | |||
@@ -160,5 +160,5 @@ Clipperz.PM.Strings.Languages['en-us'] = { | |||
160 | 'registrationFormRetypePassphraseLabel': "re-enter passphrase", | 160 | 'registrationFormRetypePassphraseLabel': "re-enter passphrase", |
161 | 'registrationFormSafetyCheckLabel': "I understand that Clipperz will not be able to recover a lost passphrase.", | 161 | 'registrationFormSafetyCheckLabel': "I understand that Clipperz will not be able to recover a lost passphrase.", |
162 | 'registrationFormTermsOfServiceCheckLabel': "I have read and agreed to the <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Terms of Service</a>.", | 162 | 'registrationFormTermsOfServiceCheckLabel': "I have read and agreed to the <a href='https://www.clipperz.com/terms_service' target='_blank'>Terms of Service</a>.", |
163 | 'registrationFormDoYouAlreadyHaveAnAccountLabel': "do you already have an account?", | 163 | 'registrationFormDoYouAlreadyHaveAnAccountLabel': "do you already have an account?", |
164 | 'registrationFormSimplyLoginLabel': "simply login", | 164 | 'registrationFormSimplyLoginLabel': "simply login", |
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_es-ES.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_es-ES.js index 2090913..34bdbec 100644 --- a/frontend/beta/js/Clipperz/PM/Strings/Strings_es-ES.js +++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_es-ES.js | |||
@@ -76,5 +76,5 @@ Clipperz.PM.Strings.Languages['es-ES'.toLowerCase()] = MochiKit.Base.merge(Clipp | |||
76 | 'registrationFormRetypePassphraseLabel':"reingrese la frase clave", | 76 | 'registrationFormRetypePassphraseLabel':"reingrese la frase clave", |
77 | 'registrationFormSafetyCheckLabel':"Yo entiendo que Clipperz no me permite recuperar frases clave perdidas", | 77 | 'registrationFormSafetyCheckLabel':"Yo entiendo que Clipperz no me permite recuperar frases clave perdidas", |
78 | 'registrationFormTermsOfServiceCheckLabel':"He leído y estoy de acuerdo con los <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Términos de Servicio</a>.", | 78 | 'registrationFormTermsOfServiceCheckLabel':"He leído y estoy de acuerdo con los <a href='https://www.clipperz.com/terms_service' target='_blank'>Términos de Servicio</a>.", |
79 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"¿usted ya tiene una cuenta?", | 79 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"¿usted ya tiene una cuenta?", |
80 | 'registrationFormSimplyLoginLabel':"ingreso simple", | 80 | 'registrationFormSimplyLoginLabel':"ingreso simple", |
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_fr-FR.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_fr-FR.js index 08f0c21..71ea987 100644 --- a/frontend/beta/js/Clipperz/PM/Strings/Strings_fr-FR.js +++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_fr-FR.js | |||
@@ -69,5 +69,5 @@ Clipperz.PM.Strings.Languages['fr-FR'.toLowerCase()] = MochiKit.Base.merge(Clipp | |||
69 | 'registrationFormRetypePassphraseLabel':"re-saisissez votre phrase secrète", | 69 | 'registrationFormRetypePassphraseLabel':"re-saisissez votre phrase secrète", |
70 | 'registrationFormSafetyCheckLabel':"J’accepte que Clipperz ne pourra pas récupérer ma phrase secrète.", | 70 | 'registrationFormSafetyCheckLabel':"J’accepte que Clipperz ne pourra pas récupérer ma phrase secrète.", |
71 | 'registrationFormTermsOfServiceCheckLabel':"J’ai lu et j’accepte les <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Conditions d’Utilisation du Service</a>.", | 71 | 'registrationFormTermsOfServiceCheckLabel':"J’ai lu et j’accepte les <a href='https://www.clipperz.com/terms_service' target='_blank'>Conditions d’Utilisation du Service</a>.", |
72 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"avez-vous déjà un compte?", | 72 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"avez-vous déjà un compte?", |
73 | 'registrationFormSimplyLoginLabel':"identifiez-vous", | 73 | 'registrationFormSimplyLoginLabel':"identifiez-vous", |
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_it-IT.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_it-IT.js index 0499376..9dd0511 100644 --- a/frontend/beta/js/Clipperz/PM/Strings/Strings_it-IT.js +++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_it-IT.js | |||
@@ -78,5 +78,5 @@ Clipperz.PM.Strings.Languages['it-IT'.toLowerCase()] = MochiKit.Base.merge(Clipp | |||
78 | 'registrationFormRetypePassphraseLabel':"ripeti frase segreta", | 78 | 'registrationFormRetypePassphraseLabel':"ripeti frase segreta", |
79 | 'registrationFormSafetyCheckLabel':"Sono consapevole che Clipperz non è in grado di recuperare una frase segreta dimenticata.", | 79 | 'registrationFormSafetyCheckLabel':"Sono consapevole che Clipperz non è in grado di recuperare una frase segreta dimenticata.", |
80 | 'registrationFormTermsOfServiceCheckLabel':"Dichiaro di aver letto e di accettare i <a href=\"http://www.clipperz.com/terms_of_service\" target=\"_blank\">Termini del Servizio</a> .", | 80 | 'registrationFormTermsOfServiceCheckLabel':"Dichiaro di aver letto e di accettare i <a href=\"https://www.clipperz.com/terms_service\" target=\"_blank\">Termini del Servizio</a> .", |
81 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"sei già un utente registrato?", | 81 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"sei già un utente registrato?", |
82 | 'registrationFormSimplyLoginLabel':"accedi subito", | 82 | 'registrationFormSimplyLoginLabel':"accedi subito", |
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_pt-BR.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_pt-BR.js index 8478c0d..e3c2fc7 100644 --- a/frontend/beta/js/Clipperz/PM/Strings/Strings_pt-BR.js +++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_pt-BR.js | |||
@@ -76,5 +76,5 @@ Clipperz.PM.Strings.Languages['pt-BR'.toLowerCase()] = MochiKit.Base.merge(Clipp | |||
76 | 'registrationFormRetypePassphraseLabel':"entre novamente sua frase chave", | 76 | 'registrationFormRetypePassphraseLabel':"entre novamente sua frase chave", |
77 | 'registrationFormSafetyCheckLabel':"Eu compreendo que Clipperz não será capaz de recuperar senhas perdidas.", | 77 | 'registrationFormSafetyCheckLabel':"Eu compreendo que Clipperz não será capaz de recuperar senhas perdidas.", |
78 | 'registrationFormTermsOfServiceCheckLabel':"Eu li e concordo com os <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Termos do Serviço</a>.", | 78 | 'registrationFormTermsOfServiceCheckLabel':"Eu li e concordo com os <a href='https://www.clipperz.com/terms_service' target='_blank'>Termos do Serviço</a>.", |
79 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"você já tem uma conta?", | 79 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"você já tem uma conta?", |
80 | 'registrationFormSimplyLoginLabel':"login simples", | 80 | 'registrationFormSimplyLoginLabel':"login simples", |
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_ru-RU.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_ru-RU.js index 612e745..0d71345 100644 --- a/frontend/beta/js/Clipperz/PM/Strings/Strings_ru-RU.js +++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_ru-RU.js | |||
@@ -83,5 +83,5 @@ Clipperz.PM.Strings.Languages['ru-RU'.toLowerCase()] = MochiKit.Base.merge(Clipp | |||
83 | 'registrationFormRetypePassphraseLabel':"повторите пароль", | 83 | 'registrationFormRetypePassphraseLabel':"повторите пароль", |
84 | 'registrationFormSafetyCheckLabel':"Я понимаю, что Clipperz не сможет восстановить забытый пароль", | 84 | 'registrationFormSafetyCheckLabel':"Я понимаю, что Clipperz не сможет восстановить забытый пароль", |
85 | 'registrationFormTermsOfServiceCheckLabel':"Я прочитал и согласен с <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Условиями предоставления услуг</a>.", | 85 | 'registrationFormTermsOfServiceCheckLabel':"Я прочитал и согласен с <a href='https://www.clipperz.com/terms_service' target='_blank'>Условиями предоставления услуг</a>.", |
86 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"у вас уже есть аккаунт?", | 86 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"у вас уже есть аккаунт?", |
87 | 'registrationFormSimplyLoginLabel':"просто авторизируйтесь", | 87 | 'registrationFormSimplyLoginLabel':"просто авторизируйтесь", |
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_zh-CN.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_zh-CN.js index e880954..e1e2508 100644 --- a/frontend/beta/js/Clipperz/PM/Strings/Strings_zh-CN.js +++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_zh-CN.js | |||
@@ -76,5 +76,5 @@ Clipperz.PM.Strings.Languages['zh-CN'.toLowerCase()] = MochiKit.Base.merge(Clipp | |||
76 | 'registrationFormRetypePassphraseLabel':"确认密码短语", | 76 | 'registrationFormRetypePassphraseLabel':"确认密码短语", |
77 | 'registrationFormSafetyCheckLabel':"我明白 Clipperz 无法找回忘记的密码短语.", | 77 | 'registrationFormSafetyCheckLabel':"我明白 Clipperz 无法找回忘记的密码短语.", |
78 | 'registrationFormTermsOfServiceCheckLabel':"我同意接受 <a href='http://www.clipperz.com/terms_of_service' target='_blank'>服务条款</a> 款.", | 78 | 'registrationFormTermsOfServiceCheckLabel':"我同意接受 <a href='https://www.clipperz.com/terms_service' target='_blank'>服务条款</a> 款.", |
79 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"如果已有一个 Clipperz 帐户", | 79 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"如果已有一个 Clipperz 帐户", |
80 | 'registrationFormSimplyLoginLabel':"在此登录", | 80 | 'registrationFormSimplyLoginLabel':"在此登录", |