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/UI/Web | |
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/UI/Web') (more/less context) (ignore whitespace changes)
-rw-r--r-- | frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js | 2 | ||||
-rw-r--r-- | frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageHeader.js | 16 |
2 files changed, 14 insertions, 4 deletions
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 | |||
@@ -52,5 +52,5 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageFooter, Clipperz.PM.UI.Co | |||
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'}, |
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 | |||
@@ -69,6 +69,9 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Co | |||
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:[ |
@@ -79,5 +82,7 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Co | |||
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:[ |
@@ -98,4 +103,5 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Co | |||
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 | ||
@@ -165,4 +171,8 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Co | |||
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 | //------------------------------------------------------------------------- |