12 files changed, 42 insertions, 12 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
@@ -64,3 +64,3 @@ YAHOO.extendX(Clipperz.PM.Components.Compact.CompactHeader, Clipperz.PM.Componen
                                         {tag:'li', children:[{tag:'a', id:'donateHeaderLink', html:'donate', target:'_blank'}]},
-                                        {tag:'li', children:[{tag:'a', id:'creditsHeaderLink', html:'credits', target:'_blank'}]},
+        //                              {tag:'li', children:[{tag:'a', id:'creditsHeaderLink', html:'credits', target:'_blank'}]},
                                         {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
                                         {tag:'td', valign:'top', id:'directLoginsTD', width:'200', children:[
+                                                {tag:'div', id:'accountStatus', children:[
+                                                        {tag:'div', cls:'header', children:[{tag:'h5', cls:'title', htmlString:"Account info"}]},
+        //                                              {tag:'div', cls:'accountStatus', html:"early adopter"},
+                                                        {tag:'div', cls:'accountLevel', children:[
+                                                                {tag:'span', cls:'label', html:"status"},
+                                                                {tag:'span', cls:'status', html:"early adopter"}
+                                                        ]},
+                                                        {tag:'div', cls:'accountLevel', children:[
+                                                                {tag:'span', cls:'label', html:"level"},
+        //                                                      {tag:'span', cls:'level', html:"★☆☆☆"}
+                                                                {tag:'span', cls:'level', html:"☆☆☆☆"}
+                                                        ]},
+                                                        {tag:'div', cls:'accountExpiration', children:[
+                                                                {tag:'span', cls:'label', html:"expires"},
+        //                                                      {tag:'span', cls:'expriation', html:"on 26 April 2014"}
+                                                                {tag:'span', cls:'expriation', html:"never"}
+                                                        ]},
+        //                                              {tag:'div', cls:'payButton', children:[
+        //                                                      {tag:'a', href:'#', cls:'info', html:"info"}
+        //                                              ]}
+                                                        {tag:'div', id:'payButton', cls:'payButton'}
+                                                ]},
                                                 {tag:'div', id:'directLoginsBlock', children:[
@@ -138,3 +160,5 @@ YAHOO.extendX(Clipperz.PM.Components.Panels.MainPanel, Clipperz.PM.Components.Pa
                 YAHOO.ext.Element.get('directLogins').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide();
-
+                        //TODO
+                new YAHOO.ext.Button('payButton', {text:"Info", handler:this.payButtonHandler, scope:this});
+                
                 this.recordDetailComponent();
@@ -144,2 +168,8 @@ YAHOO.extendX(Clipperz.PM.Components.Panels.MainPanel, Clipperz.PM.Components.Pa
         },
+
+        //-------------------------------------------------------------------------
+
+        'payButtonHandler': function(anEvent) {
+                window.open('https://www.clipperz.com/pricing/', '_blank');
+        },
         
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, {
                 YAHOO.ext.Element.get('donateHeaderLink').update(Clipperz.PM.Strings['donateHeaderLinkLabel']).dom.href = Clipperz.PM.Strings['donateHeaderLinkUrl'];
-                YAHOO.ext.Element.get('creditsHeaderLink').update(Clipperz.PM.Strings['creditsHeaderLinkLabel']).dom.href = Clipperz.PM.Strings['creditsHeaderLinkUrl'];
+        //      YAHOO.ext.Element.get('creditsHeaderLink').update(Clipperz.PM.Strings['creditsHeaderLinkLabel']).dom.href = Clipperz.PM.Strings['creditsHeaderLinkUrl'];
                 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
         'registrationFormSafetyCheckLabel':"Ich akzeptiere dass es Clipperz nicht möglich ist, einen verlorenen Sicherheitssatz wiederherzustellen.",
-        'registrationFormTermsOfServiceCheckLabel':"Ich habe die <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Nutzungsbedingungen</a> gelesen, verstanden und akzeptiere diese.",
+        'registrationFormTermsOfServiceCheckLabel':"Ich habe die <a href='https://www.clipperz.com/terms_service' target='_blank'>Nutzungsbedingungen</a> gelesen, verstanden und akzeptiere diese.",
         '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
                 'registrationFormSafetyCheckLabel':                                     "Κατανοώ πως το Clipperz δεν θα μπορεί να ανακτήσει μία χαμένη κωδική φράση.",
-                'registrationFormTermsOfServiceCheckLabel':                     "Έχω διαβάσει και αποδέχομαι τους Όρους Χρήσης <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Όρους Χρήσης</a>.",
+                'registrationFormTermsOfServiceCheckLabel':                     "Έχω διαβάσει και αποδέχομαι τους Όρους Χρήσης <a href='https://www.clipperz.com/terms_service' target='_blank'>Όρους Χρήσης</a>.",
                 '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'] = {
         '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?",
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
         'registrationFormSafetyCheckLabel':"Yo entiendo que Clipperz no me permite recuperar frases clave perdidas",
-        '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>.",
+        '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>.",
         '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
         'registrationFormSafetyCheckLabel':"J’accepte que Clipperz ne pourra pas récupérer ma phrase secrète.",
-        '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>.",
+        'registrationFormTermsOfServiceCheckLabel':"J’ai lu et j’accepte les <a href='https://www.clipperz.com/terms_service' target='_blank'>Conditions d’Utilisation du Service</a>.",
         '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
         'registrationFormSafetyCheckLabel':"Sono consapevole che Clipperz non è in grado di recuperare una frase segreta dimenticata.",
-        'registrationFormTermsOfServiceCheckLabel':"Dichiaro di aver letto e di accettare i <a href=\"http://www.clipperz.com/terms_of_service\" target=\"_blank\">Termini del Servizio</a> .",
+        'registrationFormTermsOfServiceCheckLabel':"Dichiaro di aver letto e di accettare i <a href=\"https://www.clipperz.com/terms_service\" target=\"_blank\">Termini del Servizio</a> .",
         '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
         'registrationFormSafetyCheckLabel':"Eu compreendo que Clipperz não será capaz de recuperar senhas perdidas.",
-        'registrationFormTermsOfServiceCheckLabel':"Eu li e concordo com os <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Termos do Serviço</a>.",
+        'registrationFormTermsOfServiceCheckLabel':"Eu li e concordo com os <a href='https://www.clipperz.com/terms_service' target='_blank'>Termos do Serviço</a>.",
         '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
         'registrationFormSafetyCheckLabel':"Я понимаю, что Clipperz не сможет восстановить забытый пароль",
-        'registrationFormTermsOfServiceCheckLabel':"Я прочитал и согласен с <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Условиями предоставления услуг</a>.",
+        'registrationFormTermsOfServiceCheckLabel':"Я прочитал и согласен с <a href='https://www.clipperz.com/terms_service' target='_blank'>Условиями предоставления услуг</a>.",
         '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
         'registrationFormSafetyCheckLabel':"我明白 Clipperz 无法找回忘记的密码短语.",
-        'registrationFormTermsOfServiceCheckLabel':"我同意接受 <a href='http://www.clipperz.com/terms_of_service' target='_blank'>服务条款</a> 款.",
+        'registrationFormTermsOfServiceCheckLabel':"我同意接受 <a href='https://www.clipperz.com/terms_service' target='_blank'>服务条款</a> 款.",
         'registrationFormDoYouAlreadyHaveAnAccountLabel':"如果已有一个 Clipperz 帐户",