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/Components/PageHeader.js | |
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/Components/PageHeader.js') (more/less context) (ignore whitespace changes)
-rw-r--r-- | frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageHeader.js | 16 |
1 files changed, 13 insertions, 3 deletions
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 | |||
@@ -67,19 +67,24 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Co | |||
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"}]}]}, |
@@ -96,8 +101,9 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Co | |||
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 | ||
@@ -163,8 +169,12 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Co | |||
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) { |