Diffstat (limited to 'frontend/gamma/js/Clipperz/PM/UI') (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 @@ -24,39 +24,31 @@ refer to http://www.clipperz.com. */ // // normal.js -// normal +// New Image // -// Created by Giulio Cesare Solaroli on 3/25/10 -// Copyright 2010 Clipperz +// Created by Giulio Cesare Solaroli on 2/13/12 +// Copyright 2012 Clipperz // This code was generated by Opacity. You may use or modify it in any way. // var kClipperz_PM_UI_Canvas_Logo_normalWidth = 150.0; var kClipperz_PM_UI_Canvas_Logo_normalHeight = 39.0; -function Clipperz_PM_UI_Canvas_Logo_normal(canvas, aMainColor, aSecondaryColor) +function Clipperz_PM_UI_Canvas_Logo_normal(canvas, logo, fontSize, text_color) { var context = canvas.getContext("2d"); - var string; - + + canvas.width = kClipperz_PM_UI_Canvas_Logo_normalWidth; + canvas.height = kClipperz_PM_UI_Canvas_Logo_normalHeight; + context.save(); context.scale(canvas.width / kClipperz_PM_UI_Canvas_Logo_normalWidth, canvas.height / kClipperz_PM_UI_Canvas_Logo_normalHeight); context.clearRect(0.0, 0.0, kClipperz_PM_UI_Canvas_Logo_normalWidth, kClipperz_PM_UI_Canvas_Logo_normalHeight); - // clipper… - - string = "clipper"; - context.font = "38.0pt Helvetica-Bold"; - context.fillStyle = aMainColor; - context.fillText(string, -9.0, -9.0); - - // …z - - string = "z"; - context.font = "38.0pt Helvetica-Bold"; - context.fillStyle = aSecondaryColor; - context.fillText(string, 125.0, -9.0); + context.font = fontSize + " HelveticaNeue-Bold"; + context.fillStyle = text_color; + context.fillText(logo, 3, 30); context.restore(); } 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 @@ -50,9 +50,9 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageFooter, Clipperz.PM.UI.Co {tag:'div', cls:'footerWrapper', children:[ {tag:'div', cls:'footerContent', children:[ // {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'}, {tag:'span', cls:'applicationVersion', html:'application version: [1992]'} ]} 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(); }, //------------------------------------------------------------------------- @@ -163,8 +169,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) { |