Upated links to web site;

added stub for Account Info data.

Updated the links to the main website to match the new content/structure.
The new Account Info is now completely static; will become dynamic as soon as the backend infrastructure will be in place.

17 files changed, 173 insertions, 26 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
@@ -586,5 +586,5 @@ table#mainPanelTABLE {
 /* @group Direct logins */
 
-div#directLoginsBlock {
+div#directLoginsBlock, div#accountStatus {
 	width: 230px;
 	padding: 0px;
@@ -594,10 +594,46 @@ div#directLoginsBlock {
 }
 
-div#directLoginsBlock div.directLoginsBlockHeaderBox {
+div#accountStatus div.accountStatus, div#accountStatus div.accountLevel, div#accountStatus div.accountExpiration {
+	font-size: 10pt;
+	color: #666666;
+	padding: 5px 16px 0px 16px;
+}
+
+div#directLoginsBlock div.directLoginsBlockHeaderBox, div#accountStatus div.header {
 /*	background: url(./images/directLoginBox.png) no-repeat -11px -13px;	*/
 	background: url(data:image/png;charset=utf-8;base64,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) no-repeat -11px -13px;
 }
 
-div#directLoginsBlock h3 {
+div#accountStatus span.label {
+	width: 52px;
+	display: inline-block;
+	margin-right: 3px;
+}
+
+div#accountStatus span.label:after {
+	content: ":";
+}
+/*
+div#accountStatus div.payButton {
+	font-size: 10pt;
+	text-align: center;
+}
+
+div#accountStatus div.payButton a {
+	color: #666666;
+	font-weight: bold;
+	text-decoration: none;
+}
+
+div#accountStatus div.payButton a:hover {
+	color: #aaaaaa;
+}
+*/
+
+div#accountStatus div.payButton {
+	text-align: center;
+}
+
+div#directLoginsBlock h3, div#accountStatus div.header h5 {
 	text-align: center;
 	color: #666666;
@@ -609,12 +645,15 @@ div#directLoginsBlock h3 {
 }
 
-ul#directLogins {
+ul#directLogins, div#accountStatus div.payButton {
 /*	padding: 7px 20px 45px 20px;	*/
-	padding: 7px 12px 45px 12px;	
-	min-height: 200px;
+	padding: 7px 12px 40px 12px;	
 /*	background: url(./images/directLoginBox.png) no-repeat -513px bottom; 	*/
 	background: url(data:image/png;charset=utf-8;base64,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) no-repeat -513px bottom; 
 }
 
+ul#directLogins {
+	min-height: 200px;
+}
+
 ul#directLogins li {
 	border-top: 1px solid white;
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
@@ -34,5 +34,5 @@ Clipperz_normalizedNewLine = '\x0d\x0a';
 			<ul>
 				<li><a href="http://www.clipperz.com/donations" id='donateHeaderLink' class='highlightedHeader' target="_blank">donate</a></li>
-				<li><a href="http://www.clipperz.com/credits" id='creditsHeaderLink' target="_blank">credits</a></li>
+				<!-- li><a href="http://www.clipperz.com/credits" id='creditsHeaderLink' target="_blank">credits</a></li -->
 				<li><a href="http://www.clipperz.com/contact" id='feedbackHeaderLink' target="_blank">feedback</a></li>
 				<li><a href="http://www.clipperz.com/support/user_guide" target="_blank" id='helpHeaderLink'>help</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
@@ -63,5 +63,5 @@ YAHOO.extendX(Clipperz.PM.Components.Compact.CompactHeader, Clipperz.PM.Componen
 				{tag:'ul', children:[
 					{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'}]},
 					{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
 					]},
 					{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:[
 							{tag:'div', cls:'directLoginsBlockHeaderBox', children:[{tag:'h3', id:'directLoginTitle', htmlString:Clipperz.PM.Strings['mainPanelDirectLoginBlockLabel']}]},
@@ -137,5 +159,7 @@ 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();
 
@@ -143,4 +167,10 @@ YAHOO.extendX(Clipperz.PM.Components.Panels.MainPanel, Clipperz.PM.Components.Pa
 		YAHOO.ext.Element.get('recordCreationWizardMainBlock').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide();
 	},
+
+	//-------------------------------------------------------------------------
+
+	'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
@@ -54,5 +54,5 @@ MochiKit.Base.update(Clipperz.PM.Main.prototype, {
 		YAHOO.ext.Element.get('donateHeaderIconLink').dom.href = Clipperz.PM.Strings['donateHeaderLinkUrl'];
 		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'];
 		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
 'registrationFormRetypePassphraseLabel':	"Wiederhole Sicherheitssatz",
 '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?",
 '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
 	'registrationFormRetypePassphraseLabel':				"Εισάγετε ξανά την κωδική φράση",
 	'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':		"Έχετε ήδη έναν λογαριασμό?",
 	'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'] = {
 '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",
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
 'registrationFormRetypePassphraseLabel':	"reingrese la frase clave",
 '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?",
 '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
 'registrationFormRetypePassphraseLabel':	"re-saisissez votre phrase secrète",
 '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?",
 '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
 'registrationFormRetypePassphraseLabel':	"ripeti frase segreta",
 '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?",
 '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
 'registrationFormRetypePassphraseLabel':	"entre novamente sua frase chave",
 '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?",
 '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
 'registrationFormRetypePassphraseLabel':	"повторите пароль",
 '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':	"у вас уже есть аккаунт?",
 '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
 'registrationFormRetypePassphraseLabel':	"确认密码短语",
 '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 帐户",
 'registrationFormSimplyLoginLabel':	"在此登录",
diff --git a/frontend/gamma/css/web.css b/frontend/gamma/css/web.css
index 011831a..7d1745b 100644
--- a/frontend/gamma/css/web.css
+++ b/frontend/gamma/css/web.css
@@ -891,5 +891,5 @@ div.userInfoBox {
   position: absolute;
   width: 160px;
-  height: 120px;
+  height: 200px;
   top: 100px;
   left: 15px;
@@ -959,7 +959,57 @@ div.userInfoBox div.body ul li span.number {
   padding-right: 3px;
 }
+div.userInfoBox div.body div.accountInfo {
+  margin-top: 6px;
+  border-top: 1px solid white;
+  border-color: #f4aa84;
+}
+div.userInfoBox div.body div.accountInfo h5 {
+  margin: 0px;
+  padding-top: 8px;
+  padding-bottom: 8px;
+  font-size: 8pt;
+  font-weight: normal;
+}
+div.userInfoBox div.body div.accountInfo span.label {
+  font-size: 9pt;
+  font-weight: normal;
+  padding-right: 4px;
+  display: inline-block;
+  width: 45px;
+}
+div.userInfoBox div.body div.accountInfo span.label:after {
+  content: ":";
+}
+div.userInfoBox div.body div.accountInfo span.status {
+  font-size: 10pt;
+}
+div.userInfoBox div.body div.accountInfo span.expriation {
+  font-size: 9pt;
+}
+div.userInfoBox div.body div.accountInfo div.payButton {
+  float: right;
+  padding-top: 6px;
+  text-align: right;
+}
+div.userInfoBox div.body div.accountInfo div.payButton a {
+  border: 0px;
+  margin-top: 0px;
+  padding: 0px;
+  color: white;
+  display: inline-block;
+  padding: 2px 5px 2px 5px;
+  border-radius: 4px;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  font-size: 9pt;
+  font-weight: normal;
+  background-color: #d15a22;
+}
+div.userInfoBox div.body div.accountInfo div.payButton a:hover {
+  background-color: #8c3b15;
+}
 div.userInfoBox div.body a {
   display: block;
-  margin-top: 8px;
+  margin-top: 4px;
   border-top: 1px solid white;
   padding-top: 6px;
@@ -975,5 +1025,5 @@ div.userInfoBox div.body a:hover {
 div.sidePanels {
   float: left;
-  margin-top: 106px;
+  margin-top: 186px;
   margin-left: 20px;
   width: 160px;
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageHeader.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageHeader.js
index 5e49fb5..3c57f67 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageHeader.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageHeader.js
@@ -50,5 +50,5 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Co
 	'iframeURL': function () {
 //		return './rss_view.html';
-		return 'http://www.clipperz.com/files/clipperz.com/appTips/index.html';
+		return 'https://www.clipperz.com/tips/index.html';
 	},
 
@@ -61,5 +61,5 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Co
 					{tag:'li', children:[{tag:'a', id:'donateHeaderLink',	stringID:'pageHeader.donation',	href:'http://www.clipperz.com/donations',			target:'_blank', html:Clipperz.PM.Strings.getValue('pageHeader.donation')}]},
 					{tag:'li', children:[{tag:'a', id:'forumHeaderLink',	stringID:'pageHeader.forum',	href:'http://www.clipperz.com/forum',				target:'_blank', html:Clipperz.PM.Strings.getValue('pageHeader.forum')}]},
-					{tag:'li', children:[{tag:'a', id:'creditsHeaderLink',	stringID:'pageHeader.credits',	href:'http://www.clipperz.com/credits',				target:'_blank', html:Clipperz.PM.Strings.getValue('pageHeader.credits')}]},
+//					{tag:'li', children:[{tag:'a', id:'creditsHeaderLink',	stringID:'pageHeader.credits',	href:'http://www.clipperz.com/credits',				target:'_blank', html:Clipperz.PM.Strings.getValue('pageHeader.credits')}]},
 					{tag:'li', children:[{tag:'a', id:'feedbackHeaderLink',	stringID:'pageHeader.feedback',	href:'http://www.clipperz.com/contact',				target:'_blank', html:Clipperz.PM.Strings.getValue('pageHeader.feedback')}]},
 					{tag:'li', children:[{tag:'a', id:'helpHeaderLink',		stringID:'pageHeader.help',		href:'http://www.clipperz.com/support/user_guide',	target:'_blank', html:Clipperz.PM.Strings.getValue('pageHeader.help')}]}
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/UserInfoBox.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/UserInfoBox.js
index fbf58e0..91085cf 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/UserInfoBox.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/UserInfoBox.js
@@ -167,4 +167,24 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.UserInfoBox, Clipperz.PM.UI.C
 					]}
 				]},
+				{tag:'div', cls:'accountInfo', children:[
+					{tag:'div', cls:'payButton', children:[
+						{tag:'a', href:'#', id:this.getId('payButton'), cls:'info', html:"info"}
+					]},
+					{tag:'h5', html:"Account info"},
+					{tag:'div', cls:'accountStatus', 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:'a', href:'#', id:this.getId('logout'), html:"logout >"}
 			]},
@@ -172,6 +192,7 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.UserInfoBox, Clipperz.PM.UI.C
 		]);
 
-		MochiKit.Signal.connect(this.getElement('logout'), 'onclick', this, 'handleLogout');
-		MochiKit.Signal.connect(this.getElement('lock'), 'onclick', this, 'toggleLock');
+		MochiKit.Signal.connect(this.getElement('logout'),		'onclick', this, 'handleLogout');
+		MochiKit.Signal.connect(this.getElement('lock'),		'onclick', this, 'toggleLock');
+		MochiKit.Signal.connect(this.getElement('payButton'),	'onclick', this, 'handlePayButton');
 
 		this._lockTooltip = new Clipperz.PM.UI.Common.Components.Tooltip({
@@ -192,4 +213,11 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.UserInfoBox, Clipperz.PM.UI.C
 
 	//-------------------------------------------------------------------------
+
+	'handlePayButton': function (anEvent) {
+		anEvent.preventDefault();
+		window.open('https://www.clipperz.com/pricing/', '_blank');
+	},
+
+	//-------------------------------------------------------------------------
 /*
 	'drawUserInfoBackground': function (canvas) {