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) (side-by-side diff) | |
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) (show 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 {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')}]} ]} ]}, {tag:'div', id:'logoFrame', children:[ - {tag:'a', href:'http://www.clipperz.com', target:'_blank', children:[{tag:'div', id:'logo'}]}, - {tag:'h5', cls:'clipperzPayoff', html:'keep it to yourself!'} + {tag:'a', href:'http://www.clipperz.com', target:'_blank', children:[ +// {tag:'h1', cls:'logo', html:"clipperz"}, + {tag:'canvas', id:this.getId('logo'), cls:'logo'}, + {tag:'h5', cls:'clipperzPayoff', html:"keep it to yourself!"} + ]} ]}, {tag:'div', id:'news', cls:'hidden', children:[ // {tag:'div', cls:'close', children:[ // {tag:'a', href:'#', id:this.getId('closeTips'), html:'x'} // ]}, {tag:'div', id:'newsframe', children:[ {tag:'iframe', id:this.getId('iframe'), src:this.iframeURL()} ]}, - {tag:'div', id:this.getId('newsGrip'), cls:'grip', children:[]} + {tag:'div', id:this.getId('newsGrip'), cls:'grip', children:[ + {tag:'div', cls:'gripHandler', children:[]} + ]} ]}, {tag:'div', id:'featureTabs', children:[ {tag:'table', children:[{tag:'tr', children:[ {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 Clipperz.PM.UI.Canvas.features.share(this.getElement('shareIcon'), "#ffffff", "#ffffff", "#ff0000"); MochiKit.Signal.connect(this.getElement('newsGrip'), 'onclick', this, 'toggleTips'); MochiKit.Signal.connect(this.getElement('iframe'), 'onload', this, 'handleIframeDidLoad'); + this.setLogoDefaultColors(); }, //------------------------------------------------------------------------- @@ -164,8 +170,12 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Co this.toggleNewsIsOpen(); } }, + 'setLogoDefaultColors': function () { + Clipperz.PM.UI.Canvas.logo.normal(this.getElement('logo'), "clipperz", "28.0pt", "#ffffff"); + }, + //------------------------------------------------------------------------- 'handleIframeDidLoad': function (anEvent) { if (this.isNewsOpen() == false) { |