-rw-r--r-- | frontend/gamma/css/web.css | 56 | ||||
-rw-r--r-- | frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageHeader.js | 4 | ||||
-rw-r--r-- | frontend/gamma/js/Clipperz/PM/UI/Web/Components/UserInfoBox.js | 32 |
3 files changed, 85 insertions, 7 deletions
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 { | |||
891 | position: absolute; | 891 | position: absolute; |
892 | width: 160px; | 892 | width: 160px; |
893 | height: 120px; | 893 | height: 200px; |
894 | top: 100px; | 894 | top: 100px; |
895 | left: 15px; | 895 | left: 15px; |
@@ -959,7 +959,57 @@ div.userInfoBox div.body ul li span.number { | |||
959 | padding-right: 3px; | 959 | padding-right: 3px; |
960 | } | 960 | } |
961 | div.userInfoBox div.body div.accountInfo { | ||
962 | margin-top: 6px; | ||
963 | border-top: 1px solid white; | ||
964 | border-color: #f4aa84; | ||
965 | } | ||
966 | div.userInfoBox div.body div.accountInfo h5 { | ||
967 | margin: 0px; | ||
968 | padding-top: 8px; | ||
969 | padding-bottom: 8px; | ||
970 | font-size: 8pt; | ||
971 | font-weight: normal; | ||
972 | } | ||
973 | div.userInfoBox div.body div.accountInfo span.label { | ||
974 | font-size: 9pt; | ||
975 | font-weight: normal; | ||
976 | padding-right: 4px; | ||
977 | display: inline-block; | ||
978 | width: 45px; | ||
979 | } | ||
980 | div.userInfoBox div.body div.accountInfo span.label:after { | ||
981 | content: ":"; | ||
982 | } | ||
983 | div.userInfoBox div.body div.accountInfo span.status { | ||
984 | font-size: 10pt; | ||
985 | } | ||
986 | div.userInfoBox div.body div.accountInfo span.expriation { | ||
987 | font-size: 9pt; | ||
988 | } | ||
989 | div.userInfoBox div.body div.accountInfo div.payButton { | ||
990 | float: right; | ||
991 | padding-top: 6px; | ||
992 | text-align: right; | ||
993 | } | ||
994 | div.userInfoBox div.body div.accountInfo div.payButton a { | ||
995 | border: 0px; | ||
996 | margin-top: 0px; | ||
997 | padding: 0px; | ||
998 | color: white; | ||
999 | display: inline-block; | ||
1000 | padding: 2px 5px 2px 5px; | ||
1001 | border-radius: 4px; | ||
1002 | -moz-border-radius: 4px; | ||
1003 | -webkit-border-radius: 4px; | ||
1004 | font-size: 9pt; | ||
1005 | font-weight: normal; | ||
1006 | background-color: #d15a22; | ||
1007 | } | ||
1008 | div.userInfoBox div.body div.accountInfo div.payButton a:hover { | ||
1009 | background-color: #8c3b15; | ||
1010 | } | ||
961 | div.userInfoBox div.body a { | 1011 | div.userInfoBox div.body a { |
962 | display: block; | 1012 | display: block; |
963 | margin-top: 8px; | 1013 | margin-top: 4px; |
964 | border-top: 1px solid white; | 1014 | border-top: 1px solid white; |
965 | padding-top: 6px; | 1015 | padding-top: 6px; |
@@ -975,5 +1025,5 @@ div.userInfoBox div.body a:hover { | |||
975 | div.sidePanels { | 1025 | div.sidePanels { |
976 | float: left; | 1026 | float: left; |
977 | margin-top: 106px; | 1027 | margin-top: 186px; |
978 | margin-left: 20px; | 1028 | margin-left: 20px; |
979 | width: 160px; | 1029 | 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 | |||
50 | 'iframeURL': function () { | 50 | 'iframeURL': function () { |
51 | // return './rss_view.html'; | 51 | // return './rss_view.html'; |
52 | return 'http://www.clipperz.com/files/clipperz.com/appTips/index.html'; | 52 | return 'https://www.clipperz.com/tips/index.html'; |
53 | }, | 53 | }, |
54 | 54 | ||
@@ -61,5 +61,5 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Co | |||
61 | {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')}]}, | 61 | {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')}]}, |
62 | {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')}]}, | 62 | {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')}]}, |
63 | {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')}]}, | 63 | // {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')}]}, |
64 | {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')}]}, | 64 | {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')}]}, |
65 | {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')}]} | 65 | {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 | |||
167 | ]} | 167 | ]} |
168 | ]}, | 168 | ]}, |
169 | {tag:'div', cls:'accountInfo', children:[ | ||
170 | {tag:'div', cls:'payButton', children:[ | ||
171 | {tag:'a', href:'#', id:this.getId('payButton'), cls:'info', html:"info"} | ||
172 | ]}, | ||
173 | {tag:'h5', html:"Account info"}, | ||
174 | {tag:'div', cls:'accountStatus', children:[ | ||
175 | {tag:'span', cls:'label', html:"status"}, | ||
176 | {tag:'span', cls:'status', html:"early adopter"} | ||
177 | ]}, | ||
178 | {tag:'div', cls:'accountLevel', children:[ | ||
179 | {tag:'span', cls:'label', html:"level"}, | ||
180 | // {tag:'span', cls:'level', html:"★☆☆☆"} | ||
181 | {tag:'span', cls:'level', html:"☆☆☆☆"} | ||
182 | ]}, | ||
183 | {tag:'div', cls:'accountExpiration', children:[ | ||
184 | {tag:'span', cls:'label', html:"expires"}, | ||
185 | // {tag:'span', cls:'expriation', html:"on 26 April 2014"} | ||
186 | {tag:'span', cls:'expriation', html:"never"} | ||
187 | ]} | ||
188 | ]}, | ||
169 | {tag:'a', href:'#', id:this.getId('logout'), html:"logout >"} | 189 | {tag:'a', href:'#', id:this.getId('logout'), html:"logout >"} |
170 | ]}, | 190 | ]}, |
@@ -172,6 +192,7 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.UserInfoBox, Clipperz.PM.UI.C | |||
172 | ]); | 192 | ]); |
173 | 193 | ||
174 | MochiKit.Signal.connect(this.getElement('logout'), 'onclick', this, 'handleLogout'); | 194 | MochiKit.Signal.connect(this.getElement('logout'), 'onclick', this, 'handleLogout'); |
175 | MochiKit.Signal.connect(this.getElement('lock'), 'onclick', this, 'toggleLock'); | 195 | MochiKit.Signal.connect(this.getElement('lock'), 'onclick', this, 'toggleLock'); |
196 | MochiKit.Signal.connect(this.getElement('payButton'),'onclick', this, 'handlePayButton'); | ||
176 | 197 | ||
177 | this._lockTooltip = new Clipperz.PM.UI.Common.Components.Tooltip({ | 198 | 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 | |||
192 | 213 | ||
193 | //------------------------------------------------------------------------- | 214 | //------------------------------------------------------------------------- |
215 | |||
216 | 'handlePayButton': function (anEvent) { | ||
217 | anEvent.preventDefault(); | ||
218 | window.open('https://www.clipperz.com/pricing/', '_blank'); | ||
219 | }, | ||
220 | |||
221 | //------------------------------------------------------------------------- | ||
194 | /* | 222 | /* |
195 | 'drawUserInfoBackground': function (canvas) { | 223 | 'drawUserInfoBackground': function (canvas) { |