summaryrefslogtreecommitdiff
path: root/frontend/gamma/js/Clipperz/PM/UI/Web
Side-by-side diff
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.js2
-rw-r--r--frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageHeader.js16
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
// {tag:'div', cls:'footerStarIcon'},
{tag:'canvas', id:this.getId('footerStarIcon'), cls:'footerStarIcon'},
- {tag:'span', cls:'copyright', html:'Copyright © 2009 Clipperz Srl'},
+ {tag:'span', cls:'copyright', html:'Copyright © 2009-2012 Clipperz Srl'},
{tag:'a', href:'http://www.clipperz.com/terms_of_service', target:'_blank', html:'terms of service'},
{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
]},
{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:[
@@ -79,5 +82,7 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Co
{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:[
@@ -98,4 +103,5 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Co
MochiKit.Signal.connect(this.getElement('newsGrip'), 'onclick', this, 'toggleTips');
MochiKit.Signal.connect(this.getElement('iframe'), 'onload', this, 'handleIframeDidLoad');
+ this.setLogoDefaultColors();
},
@@ -165,4 +171,8 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Co
}
},
+
+ 'setLogoDefaultColors': function () {
+ Clipperz.PM.UI.Canvas.logo.normal(this.getElement('logo'), "clipperz", "28.0pt", "#ffffff");
+ },
//-------------------------------------------------------------------------