4 files changed, 26 insertions, 37 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 @@ -27,6 +27,6 @@ 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. @@ -37,7 +37,9 @@ 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(); @@ -46,15 +48,5 @@ function Clipperz_PM_UI_Canvas_Logo_normal(canvas, aMainColor, aSecondaryColor) - // 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); 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 @@ -53,3 +53,3 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageFooter, Clipperz.PM.UI.Co {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'}, 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 @@ -70,4 +70,7 @@ 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!"} + ]} ]}, @@ -80,3 +83,5 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Co ]}, - {tag:'div', id:this.getId('newsGrip'), cls:'grip', children:[]} + {tag:'div', id:this.getId('newsGrip'), cls:'grip', children:[ + {tag:'div', cls:'gripHandler', children:[]} + ]} ]}, @@ -99,2 +104,3 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Co MochiKit.Signal.connect(this.getElement('iframe'), 'onload', this, 'handleIframeDidLoad'); + this.setLogoDefaultColors(); }, @@ -166,2 +172,6 @@ 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"); + }, diff --git a/frontend/gamma/js/main.js b/frontend/gamma/js/main.js index 352c4c7..a9fd65e 100644 --- a/frontend/gamma/js/main.js +++ b/frontend/gamma/js/main.js @@ -53,7 +53,2 @@ function run() { var controllerParameters; -// var iPhoneDesign; - -// MochiKit.Signal.connect(document.body, 'onkeydown', _pm_logEvent); -// MochiKit.Signal.connect(document.body, 'onkeypress', _pm_logEvent); -// MochiKit.Signal.connect(document.body, 'onclick', _pm_logEvent); @@ -61,3 +56,3 @@ function run() { - MochiKit.DOM.removeElement('javaScriptAlert'); +// MochiKit.DOM.removeElement('javaScriptAlert'); Clipperz.PM.Strings.Languages.initSetup(); @@ -74,8 +69,2 @@ function run() { -// if ((window.location.search.indexOf('iPhone') != -1) || (navigator.userAgent.match('iPhone'))) { -// iPhoneDesign = true; -// } else { -// iPhoneDesign = false; -// } - if (window.location.search.indexOf('compact') != -1) { @@ -88,4 +77,2 @@ function run() { Clipperz.PM.RunTime.mainController = new Clipperz.PM.UI.Compact.Controllers.MainController(controllerParameters); -// } else if (iPhoneDesign == true) { -// Clipperz.PM.RunTime.mainController = new Clipperz.PM.UI.iPhone.Controllers.MainController(); } else { |