author | Giulio Cesare Solaroli <giulio.cesare@solaroli.it> | 2012-03-03 22:06:27 (UTC) |
---|---|---|
committer | Giulio Cesare Solaroli <giulio.cesare@solaroli.it> | 2012-03-03 22:06:27 (UTC) |
commit | e7e021141d7906b537b3622ed706017f31222dfd (patch) (unidiff) | |
tree | d9366dae335a9bded5c0ee859895abe251790818 /frontend/gamma/js/Clipperz/PM | |
parent | a0661c3b02aa26d6b08ff13dc321e09478868159 (diff) | |
parent | cf9c0c34e1358452e0c7276c5b3ec6598f0c089d (diff) | |
download | clipperz-e7e021141d7906b537b3622ed706017f31222dfd.zip clipperz-e7e021141d7906b537b3622ed706017f31222dfd.tar.gz clipperz-e7e021141d7906b537b3622ed706017f31222dfd.tar.bz2 |
Merge pull request #28 from gcsolaroli/master
Added static resources used by /beta when exiting the application
Diffstat (limited to 'frontend/gamma/js/Clipperz/PM') (more/less context) (ignore whitespace changes)
3 files changed, 25 insertions, 23 deletions
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Canvas/Logo/normal.js b/frontend/gamma/js/Clipperz/PM/UI/Canvas/Logo/normal.js index de9d3aa..cc60bba 100644 --- a/frontend/gamma/js/Clipperz/PM/UI/Canvas/Logo/normal.js +++ b/frontend/gamma/js/Clipperz/PM/UI/Canvas/Logo/normal.js | |||
@@ -16,47 +16,39 @@ refer to http://www.clipperz.com. | |||
16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied |
17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
18 | See the GNU Affero General Public License for more details. | 18 | See the GNU Affero General Public License for more details. |
19 | 19 | ||
20 | * You should have received a copy of the GNU Affero General Public | 20 | * You should have received a copy of the GNU Affero General Public |
21 | License along with Clipperz Community Edition. If not, see | 21 | License along with Clipperz Community Edition. If not, see |
22 | <http://www.gnu.org/licenses/>. | 22 | <http://www.gnu.org/licenses/>. |
23 | 23 | ||
24 | */ | 24 | */ |
25 | 25 | ||
26 | // | 26 | // |
27 | //normal.js | 27 | //normal.js |
28 | //normal | 28 | //New Image |
29 | // | 29 | // |
30 | //Created by Giulio Cesare Solaroli on 3/25/10 | 30 | //Created by Giulio Cesare Solaroli on 2/13/12 |
31 | //Copyright 2010 Clipperz | 31 | //Copyright 2012 Clipperz |
32 | //This code was generated by Opacity. You may use or modify it in any way. | 32 | //This code was generated by Opacity. You may use or modify it in any way. |
33 | // | 33 | // |
34 | 34 | ||
35 | var kClipperz_PM_UI_Canvas_Logo_normalWidth = 150.0; | 35 | var kClipperz_PM_UI_Canvas_Logo_normalWidth = 150.0; |
36 | var kClipperz_PM_UI_Canvas_Logo_normalHeight = 39.0; | 36 | var kClipperz_PM_UI_Canvas_Logo_normalHeight = 39.0; |
37 | 37 | ||
38 | function Clipperz_PM_UI_Canvas_Logo_normal(canvas, aMainColor, aSecondaryColor) | 38 | function Clipperz_PM_UI_Canvas_Logo_normal(canvas, logo, fontSize, text_color) |
39 | { | 39 | { |
40 | var context = canvas.getContext("2d"); | 40 | var context = canvas.getContext("2d"); |
41 | var string; | 41 | |
42 | 42 | canvas.width = kClipperz_PM_UI_Canvas_Logo_normalWidth; | |
43 | canvas.height = kClipperz_PM_UI_Canvas_Logo_normalHeight; | ||
44 | |||
43 | context.save(); | 45 | context.save(); |
44 | context.scale(canvas.width / kClipperz_PM_UI_Canvas_Logo_normalWidth, canvas.height / kClipperz_PM_UI_Canvas_Logo_normalHeight); | 46 | context.scale(canvas.width / kClipperz_PM_UI_Canvas_Logo_normalWidth, canvas.height / kClipperz_PM_UI_Canvas_Logo_normalHeight); |
45 | context.clearRect(0.0, 0.0, kClipperz_PM_UI_Canvas_Logo_normalWidth, kClipperz_PM_UI_Canvas_Logo_normalHeight); | 47 | context.clearRect(0.0, 0.0, kClipperz_PM_UI_Canvas_Logo_normalWidth, kClipperz_PM_UI_Canvas_Logo_normalHeight); |
46 | 48 | ||
47 | // clipper… | 49 | context.font = fontSize + " HelveticaNeue-Bold"; |
48 | 50 | context.fillStyle = text_color; | |
49 | string = "clipper"; | 51 | context.fillText(logo, 3, 30); |
50 | context.font = "38.0pt Helvetica-Bold"; | ||
51 | context.fillStyle = aMainColor; | ||
52 | context.fillText(string, -9.0, -9.0); | ||
53 | |||
54 | // …z | ||
55 | |||
56 | string = "z"; | ||
57 | context.font = "38.0pt Helvetica-Bold"; | ||
58 | context.fillStyle = aSecondaryColor; | ||
59 | context.fillText(string, 125.0, -9.0); | ||
60 | 52 | ||
61 | context.restore(); | 53 | context.restore(); |
62 | } | 54 | } |
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js index 5e8cd7f..a25c8f5 100644 --- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js +++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js | |||
@@ -42,25 +42,25 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageFooter, Clipperz.PM.UI.Co | |||
42 | 'toString': function () { | 42 | 'toString': function () { |
43 | return "Clipperz.PM.UI.Web.Components.PageFooter component"; | 43 | return "Clipperz.PM.UI.Web.Components.PageFooter component"; |
44 | }, | 44 | }, |
45 | 45 | ||
46 | //------------------------------------------------------------------------- | 46 | //------------------------------------------------------------------------- |
47 | 47 | ||
48 | 'renderSelf': function(/*aContainer, aPosition*/) { | 48 | 'renderSelf': function(/*aContainer, aPosition*/) { |
49 | this.append(this.element(), [ | 49 | this.append(this.element(), [ |
50 | {tag:'div', cls:'footerWrapper', children:[ | 50 | {tag:'div', cls:'footerWrapper', children:[ |
51 | {tag:'div', cls:'footerContent', children:[ | 51 | {tag:'div', cls:'footerContent', children:[ |
52 | // {tag:'div', cls:'footerStarIcon'}, | 52 | // {tag:'div', cls:'footerStarIcon'}, |
53 | {tag:'canvas', id:this.getId('footerStarIcon'), cls:'footerStarIcon'}, | 53 | {tag:'canvas', id:this.getId('footerStarIcon'), cls:'footerStarIcon'}, |
54 | {tag:'span', cls:'copyright', html:'Copyright © 2009 Clipperz Srl'}, | 54 | {tag:'span', cls:'copyright', html:'Copyright © 2009-2012 Clipperz Srl'}, |
55 | {tag:'a', href:'http://www.clipperz.com/terms_of_service',target:'_blank', html:'terms of service'}, | 55 | {tag:'a', href:'http://www.clipperz.com/terms_of_service',target:'_blank', html:'terms of service'}, |
56 | {tag:'a', href:'http://www.clipperz.com/privacy_policy',target:'_blank', html:'privacy policy'}, | 56 | {tag:'a', href:'http://www.clipperz.com/privacy_policy',target:'_blank', html:'privacy policy'}, |
57 | {tag:'span', cls:'applicationVersion', html:'application version: [1992]'} | 57 | {tag:'span', cls:'applicationVersion', html:'application version: [1992]'} |
58 | ]} | 58 | ]} |
59 | ]} | 59 | ]} |
60 | ]); | 60 | ]); |
61 | 61 | ||
62 | Clipperz.PM.UI.Canvas.star.normal(this.getElement('footerStarIcon'), "#7e7e7e"); | 62 | Clipperz.PM.UI.Canvas.star.normal(this.getElement('footerStarIcon'), "#7e7e7e"); |
63 | }, | 63 | }, |
64 | 64 | ||
65 | //------------------------------------------------------------------------- | 65 | //------------------------------------------------------------------------- |
66 | 66 | ||
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 bce8395..b8f3b05 100644 --- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageHeader.js +++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageHeader.js | |||
@@ -59,53 +59,59 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Co | |||
59 | 'renderSelf': function(/*aContainer, aPosition*/) { | 59 | 'renderSelf': function(/*aContainer, aPosition*/) { |
60 | this.append(this.element(), [ | 60 | this.append(this.element(), [ |
61 | {tag:'div', id:'miscLinks', children:[ | 61 | {tag:'div', id:'miscLinks', children:[ |
62 | {tag:'ul', children:[ | 62 | {tag:'ul', children:[ |
63 | {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')}]}, | 63 | {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')}]}, |
64 | {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')}]}, | 64 | {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')}]}, |
65 | {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')}]}, | 65 | {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')}]}, |
66 | {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')}]}, | 66 | {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')}]}, |
67 | {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')}]} | 67 | {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')}]} |
68 | ]} | 68 | ]} |
69 | ]}, | 69 | ]}, |
70 | {tag:'div', id:'logoFrame', children:[ | 70 | {tag:'div', id:'logoFrame', children:[ |
71 | {tag:'a', href:'http://www.clipperz.com', target:'_blank', children:[{tag:'div', id:'logo'}]}, | 71 | {tag:'a', href:'http://www.clipperz.com', target:'_blank', children:[ |
72 | {tag:'h5', cls:'clipperzPayoff', html:'keep it to yourself!'} | 72 | // {tag:'h1', cls:'logo', html:"clipperz"}, |
73 | {tag:'canvas', id:this.getId('logo'), cls:'logo'}, | ||
74 | {tag:'h5', cls:'clipperzPayoff', html:"keep it to yourself!"} | ||
75 | ]} | ||
73 | ]}, | 76 | ]}, |
74 | {tag:'div', id:'news', cls:'hidden', children:[ | 77 | {tag:'div', id:'news', cls:'hidden', children:[ |
75 | // {tag:'div', cls:'close', children:[ | 78 | // {tag:'div', cls:'close', children:[ |
76 | // {tag:'a', href:'#', id:this.getId('closeTips'), html:'x'} | 79 | // {tag:'a', href:'#', id:this.getId('closeTips'), html:'x'} |
77 | // ]}, | 80 | // ]}, |
78 | {tag:'div', id:'newsframe', children:[ | 81 | {tag:'div', id:'newsframe', children:[ |
79 | {tag:'iframe', id:this.getId('iframe'), src:this.iframeURL()} | 82 | {tag:'iframe', id:this.getId('iframe'), src:this.iframeURL()} |
80 | ]}, | 83 | ]}, |
81 | {tag:'div', id:this.getId('newsGrip'), cls:'grip', children:[]} | 84 | {tag:'div', id:this.getId('newsGrip'), cls:'grip', children:[ |
85 | {tag:'div', cls:'gripHandler', children:[]} | ||
86 | ]} | ||
82 | ]}, | 87 | ]}, |
83 | {tag:'div', id:'featureTabs', children:[ | 88 | {tag:'div', id:'featureTabs', children:[ |
84 | {tag:'table', children:[{tag:'tr', children:[ | 89 | {tag:'table', children:[{tag:'tr', children:[ |
85 | {tag:'td', children:[{tag:'div', id:'feature_store', children:[{tag:'canvas', cls:'featureIcon', id:this.getId('storeIcon')}, {tag:'span', html:"Store and manage your password and online credentials"}]}]}, | 90 | {tag:'td', children:[{tag:'div', id:'feature_store', children:[{tag:'canvas', cls:'featureIcon', id:this.getId('storeIcon')}, {tag:'span', html:"Store and manage your password and online credentials"}]}]}, |
86 | {tag:'td', children:[{tag:'div', id:'feature_protect', children:[{tag:'canvas', cls:'featureIcon', id:this.getId('protectIcon')}, {tag:'span', html:"Protect all your sensitive data"}]}]}, | 91 | {tag:'td', children:[{tag:'div', id:'feature_protect', children:[{tag:'canvas', cls:'featureIcon', id:this.getId('protectIcon')}, {tag:'span', html:"Protect all your sensitive data"}]}]}, |
87 | {tag:'td', children:[{tag:'div', id:'feature_directLogin', children:[{tag:'canvas', cls:'featureIcon', id:this.getId('directLoginIcon')},{tag:'span', html:"Login to your web services without entering any username or password"}]}]}, | 92 | {tag:'td', children:[{tag:'div', id:'feature_directLogin', children:[{tag:'canvas', cls:'featureIcon', id:this.getId('directLoginIcon')},{tag:'span', html:"Login to your web services without entering any username or password"}]}]}, |
88 | {tag:'td', children:[{tag:'div', id:'feature_share', children:[{tag:'canvas', cls:'featureIcon', id:this.getId('shareIcon')}, {tag:'span', html:"Share secret with family members and associates"}]}]} | 93 | {tag:'td', children:[{tag:'div', id:'feature_share', children:[{tag:'canvas', cls:'featureIcon', id:this.getId('shareIcon')}, {tag:'span', html:"Share secret with family members and associates"}]}]} |
89 | ]}]} | 94 | ]}]} |
90 | ]} | 95 | ]} |
91 | ]); | 96 | ]); |
92 | 97 | ||
93 | Clipperz.PM.UI.Canvas.features.store(this.getElement('storeIcon'), "#ffffff"); | 98 | Clipperz.PM.UI.Canvas.features.store(this.getElement('storeIcon'), "#ffffff"); |
94 | Clipperz.PM.UI.Canvas.features.protect(this.getElement('protectIcon'), "#ffffff"); | 99 | Clipperz.PM.UI.Canvas.features.protect(this.getElement('protectIcon'), "#ffffff"); |
95 | Clipperz.PM.UI.Canvas.features.directLogin(this.getElement('directLoginIcon'), "#ffffff"); | 100 | Clipperz.PM.UI.Canvas.features.directLogin(this.getElement('directLoginIcon'), "#ffffff"); |
96 | Clipperz.PM.UI.Canvas.features.share(this.getElement('shareIcon'), "#ffffff", "#ffffff", "#ff0000"); | 101 | Clipperz.PM.UI.Canvas.features.share(this.getElement('shareIcon'), "#ffffff", "#ffffff", "#ff0000"); |
97 | 102 | ||
98 | MochiKit.Signal.connect(this.getElement('newsGrip'), 'onclick', this, 'toggleTips'); | 103 | MochiKit.Signal.connect(this.getElement('newsGrip'), 'onclick', this, 'toggleTips'); |
99 | MochiKit.Signal.connect(this.getElement('iframe'), 'onload', this, 'handleIframeDidLoad'); | 104 | MochiKit.Signal.connect(this.getElement('iframe'), 'onload', this, 'handleIframeDidLoad'); |
105 | this.setLogoDefaultColors(); | ||
100 | }, | 106 | }, |
101 | 107 | ||
102 | //------------------------------------------------------------------------- | 108 | //------------------------------------------------------------------------- |
103 | 109 | ||
104 | 'switchToLoggedMode': function() { | 110 | 'switchToLoggedMode': function() { |
105 | // MochiKit.Style.addElementClass(this.element(), 'logged'); | 111 | // MochiKit.Style.addElementClass(this.element(), 'logged'); |
106 | MochiKit.Style.hideElement('featureTabs'); | 112 | MochiKit.Style.hideElement('featureTabs'); |
107 | }, | 113 | }, |
108 | 114 | ||
109 | //------------------------------------------------------------------------- | 115 | //------------------------------------------------------------------------- |
110 | 116 | ||
111 | 'animationDuration': function () { | 117 | 'animationDuration': function () { |
@@ -155,24 +161,28 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Co | |||
155 | this.append(Clipperz.DOM.get('newsframe'), {tag:'iframe', id:this.getId('iframe'), src:this.iframeURL()}); | 161 | this.append(Clipperz.DOM.get('newsframe'), {tag:'iframe', id:this.getId('iframe'), src:this.iframeURL()}); |
156 | 162 | ||
157 | MochiKit.Signal.connect(this.getElement('iframe'), 'onload', this, 'handleIframeDidLoad'); | 163 | MochiKit.Signal.connect(this.getElement('iframe'), 'onload', this, 'handleIframeDidLoad'); |
158 | MochiKit.DOM.setElementClass(Clipperz.DOM.get('news'), 'opening'); | 164 | MochiKit.DOM.setElementClass(Clipperz.DOM.get('news'), 'opening'); |
159 | }, this), | 165 | }, this), |
160 | afterFinish: function () { | 166 | afterFinish: function () { |
161 | MochiKit.DOM.setElementClass(Clipperz.DOM.get('news'), 'open'); | 167 | MochiKit.DOM.setElementClass(Clipperz.DOM.get('news'), 'open'); |
162 | } | 168 | } |
163 | }) | 169 | }) |
164 | this.toggleNewsIsOpen(); | 170 | this.toggleNewsIsOpen(); |
165 | } | 171 | } |
166 | }, | 172 | }, |
173 | |||
174 | 'setLogoDefaultColors': function () { | ||
175 | Clipperz.PM.UI.Canvas.logo.normal(this.getElement('logo'), "clipperz", "28.0pt", "#ffffff"); | ||
176 | }, | ||
167 | 177 | ||
168 | //------------------------------------------------------------------------- | 178 | //------------------------------------------------------------------------- |
169 | 179 | ||
170 | 'handleIframeDidLoad': function (anEvent) { | 180 | 'handleIframeDidLoad': function (anEvent) { |
171 | if (this.isNewsOpen() == false) { | 181 | if (this.isNewsOpen() == false) { |
172 | this.toggleTips(anEvent); | 182 | this.toggleTips(anEvent); |
173 | } | 183 | } |
174 | 184 | ||
175 | MochiKit.DOM.removeElementClass('newsframe', 'loading'); | 185 | MochiKit.DOM.removeElementClass('newsframe', 'loading'); |
176 | MochiKit.Signal.disconnectAllTo(this.getElement('iframe')); | 186 | MochiKit.Signal.disconnectAllTo(this.getElement('iframe')); |
177 | }, | 187 | }, |
178 | 188 | ||