summaryrefslogtreecommitdiff
path: root/frontend/beta
Unidiff
Diffstat (limited to 'frontend/beta') (more/less context) (ignore whitespace changes)
-rw-r--r--frontend/beta/css/clipperz/clipperz.css51
-rw-r--r--frontend/beta/html/index_template.html2
-rw-r--r--frontend/beta/js/Clipperz/PM/Components/Compact/CompactHeader.js2
-rw-r--r--frontend/beta/js/Clipperz/PM/Components/Panels/MainPanel.js32
-rw-r--r--frontend/beta/js/Clipperz/PM/Main.js2
-rw-r--r--frontend/beta/js/Clipperz/PM/Strings/Strings_de-DE.js2
-rw-r--r--frontend/beta/js/Clipperz/PM/Strings/Strings_el-GR.js2
-rw-r--r--frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js2
-rw-r--r--frontend/beta/js/Clipperz/PM/Strings/Strings_es-ES.js2
-rw-r--r--frontend/beta/js/Clipperz/PM/Strings/Strings_fr-FR.js2
-rw-r--r--frontend/beta/js/Clipperz/PM/Strings/Strings_it-IT.js2
-rw-r--r--frontend/beta/js/Clipperz/PM/Strings/Strings_pt-BR.js2
-rw-r--r--frontend/beta/js/Clipperz/PM/Strings/Strings_ru-RU.js2
-rw-r--r--frontend/beta/js/Clipperz/PM/Strings/Strings_zh-CN.js2
14 files changed, 88 insertions, 19 deletions
diff --git a/frontend/beta/css/clipperz/clipperz.css b/frontend/beta/css/clipperz/clipperz.css
index 31458c1..476143d 100644
--- a/frontend/beta/css/clipperz/clipperz.css
+++ b/frontend/beta/css/clipperz/clipperz.css
@@ -587,3 +587,3 @@ table#mainPanelTABLE {
587 587
588div#directLoginsBlock { 588div#directLoginsBlock, div#accountStatus {
589 width: 230px; 589 width: 230px;
@@ -595,3 +595,9 @@ div#directLoginsBlock {
595 595
596div#directLoginsBlock div.directLoginsBlockHeaderBox { 596div#accountStatus div.accountStatus, div#accountStatus div.accountLevel, div#accountStatus div.accountExpiration {
597 font-size: 10pt;
598 color: #666666;
599 padding: 5px 16px 0px 16px;
600}
601
602div#directLoginsBlock div.directLoginsBlockHeaderBox, div#accountStatus div.header {
597 /* background: url(./images/directLoginBox.png) no-repeat -11px -13px;*/ 603 /* background: url(./images/directLoginBox.png) no-repeat -11px -13px;*/
@@ -600,3 +606,33 @@ div#directLoginsBlock div.directLoginsBlockHeaderBox {
600 606
601div#directLoginsBlock h3 { 607div#accountStatus span.label {
608 width: 52px;
609 display: inline-block;
610 margin-right: 3px;
611}
612
613div#accountStatus span.label:after {
614 content: ":";
615}
616/*
617div#accountStatus div.payButton {
618 font-size: 10pt;
619 text-align: center;
620}
621
622div#accountStatus div.payButton a {
623 color: #666666;
624 font-weight: bold;
625 text-decoration: none;
626}
627
628div#accountStatus div.payButton a:hover {
629 color: #aaaaaa;
630}
631*/
632
633div#accountStatus div.payButton {
634 text-align: center;
635}
636
637div#directLoginsBlock h3, div#accountStatus div.header h5 {
602 text-align: center; 638 text-align: center;
@@ -610,6 +646,5 @@ div#directLoginsBlock h3 {
610 646
611ul#directLogins { 647ul#directLogins, div#accountStatus div.payButton {
612 /* padding: 7px 20px 45px 20px;*/ 648 /* padding: 7px 20px 45px 20px;*/
613 padding: 7px 12px 45px 12px; 649 padding: 7px 12px 40px 12px;
614 min-height: 200px;
615 /* background: url(./images/directLoginBox.png) no-repeat -513px bottom; */ 650 /* background: url(./images/directLoginBox.png) no-repeat -513px bottom; */
@@ -618,2 +653,6 @@ ul#directLogins {
618 653
654ul#directLogins {
655 min-height: 200px;
656}
657
619ul#directLogins li { 658ul#directLogins li {
diff --git a/frontend/beta/html/index_template.html b/frontend/beta/html/index_template.html
index 0b2875c..c3fd727 100644
--- a/frontend/beta/html/index_template.html
+++ b/frontend/beta/html/index_template.html
@@ -35,3 +35,3 @@ Clipperz_normalizedNewLine = '\x0d\x0a';
35 <li><a href="http://www.clipperz.com/donations" id='donateHeaderLink' class='highlightedHeader' target="_blank">donate</a></li> 35 <li><a href="http://www.clipperz.com/donations" id='donateHeaderLink' class='highlightedHeader' target="_blank">donate</a></li>
36 <li><a href="http://www.clipperz.com/credits" id='creditsHeaderLink' target="_blank">credits</a></li> 36 <!-- li><a href="http://www.clipperz.com/credits" id='creditsHeaderLink' target="_blank">credits</a></li -->
37 <li><a href="http://www.clipperz.com/contact" id='feedbackHeaderLink' target="_blank">feedback</a></li> 37 <li><a href="http://www.clipperz.com/contact" id='feedbackHeaderLink' target="_blank">feedback</a></li>
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
@@ -64,3 +64,3 @@ YAHOO.extendX(Clipperz.PM.Components.Compact.CompactHeader, Clipperz.PM.Componen
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'}]},
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
@@ -85,2 +85,24 @@ YAHOO.extendX(Clipperz.PM.Components.Panels.MainPanel, Clipperz.PM.Components.Pa
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:[
@@ -138,3 +160,5 @@ YAHOO.extendX(Clipperz.PM.Components.Panels.MainPanel, Clipperz.PM.Components.Pa
138 YAHOO.ext.Element.get('directLogins').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); 160 YAHOO.ext.Element.get('directLogins').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide();
139 161 //TODO
162 new YAHOO.ext.Button('payButton', {text:"Info", handler:this.payButtonHandler, scope:this});
163
140 this.recordDetailComponent(); 164 this.recordDetailComponent();
@@ -144,2 +168,8 @@ YAHOO.extendX(Clipperz.PM.Components.Panels.MainPanel, Clipperz.PM.Components.Pa
144 }, 168 },
169
170 //-------------------------------------------------------------------------
171
172 'payButtonHandler': function(anEvent) {
173 window.open('https://www.clipperz.com/pricing/', '_blank');
174 },
145 175
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
@@ -55,3 +55,3 @@ MochiKit.Base.update(Clipperz.PM.Main.prototype, {
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'];
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
@@ -70,3 +70,3 @@ Clipperz.PM.Strings.Languages['de-DE'.toLowerCase()] = MochiKit.Base.merge(Clipp
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?",
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
@@ -151,3 +151,3 @@ Clipperz.PM.Strings.Languages['el-gr'] = MochiKit.Base.merge(Clipperz.PM.Strings
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': "Έχετε ήδη έναν λογαριασμό?",
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
@@ -161,3 +161,3 @@ Clipperz.PM.Strings.Languages['en-us'] = {
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?",
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
@@ -77,3 +77,3 @@ Clipperz.PM.Strings.Languages['es-ES'.toLowerCase()] = MochiKit.Base.merge(Clipp
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?",
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
@@ -70,3 +70,3 @@ Clipperz.PM.Strings.Languages['fr-FR'.toLowerCase()] = MochiKit.Base.merge(Clipp
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?",
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
@@ -79,3 +79,3 @@ Clipperz.PM.Strings.Languages['it-IT'.toLowerCase()] = MochiKit.Base.merge(Clipp
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?",
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
@@ -77,3 +77,3 @@ Clipperz.PM.Strings.Languages['pt-BR'.toLowerCase()] = MochiKit.Base.merge(Clipp
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?",
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
@@ -84,3 +84,3 @@ Clipperz.PM.Strings.Languages['ru-RU'.toLowerCase()] = MochiKit.Base.merge(Clipp
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':"у вас уже есть аккаунт?",
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
@@ -77,3 +77,3 @@ Clipperz.PM.Strings.Languages['zh-CN'.toLowerCase()] = MochiKit.Base.merge(Clipp
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 帐户",