4 files changed, 25 insertions, 36 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. | |||
27 | //normal.js | 27 | //normal.js |
28 | //normal | 28 | //New Image |
29 | // | 29 | // |
30 | //Created by Giulio Cesare Solaroli on 3/25/10 | 30 | //Created by Giulio Cesare Solaroli on 2/13/12 |
31 | //Copyright 2010 Clipperz | 31 | //Copyright 2012 Clipperz |
32 | //This code was generated by Opacity. You may use or modify it in any way. | 32 | //This code was generated by Opacity. You may use or modify it in any way. |
@@ -37,6 +37,8 @@ var kClipperz_PM_UI_Canvas_Logo_normalHeight = 39.0; | |||
37 | 37 | ||
38 | function Clipperz_PM_UI_Canvas_Logo_normal(canvas, aMainColor, aSecondaryColor) | 38 | function Clipperz_PM_UI_Canvas_Logo_normal(canvas, logo, fontSize, text_color) |
39 | { | 39 | { |
40 | var context = canvas.getContext("2d"); | 40 | var context = canvas.getContext("2d"); |
41 | var string; | 41 | |
42 | canvas.width = kClipperz_PM_UI_Canvas_Logo_normalWidth; | ||
43 | canvas.height = kClipperz_PM_UI_Canvas_Logo_normalHeight; | ||
42 | 44 | ||
@@ -46,15 +48,5 @@ function Clipperz_PM_UI_Canvas_Logo_normal(canvas, aMainColor, aSecondaryColor) | |||
46 | 48 | ||
47 | // clipper… | 49 | context.font = fontSize + " HelveticaNeue-Bold"; |
48 | 50 | context.fillStyle = text_color; | |
49 | string = "clipper"; | 51 | context.fillText(logo, 3, 30); |
50 | context.font = "38.0pt Helvetica-Bold"; | ||
51 | context.fillStyle = aMainColor; | ||
52 | context.fillText(string, -9.0, -9.0); | ||
53 | |||
54 | // …z | ||
55 | |||
56 | string = "z"; | ||
57 | context.font = "38.0pt Helvetica-Bold"; | ||
58 | context.fillStyle = aSecondaryColor; | ||
59 | context.fillText(string, 125.0, -9.0); | ||
60 | 52 | ||
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 | |||
53 | {tag:'canvas', id:this.getId('footerStarIcon'), cls:'footerStarIcon'}, | 53 | {tag:'canvas', id:this.getId('footerStarIcon'), cls:'footerStarIcon'}, |
54 | {tag:'span', cls:'copyright', html:'Copyright © 2009 Clipperz Srl'}, | 54 | {tag:'span', cls:'copyright', html:'Copyright © 2009-2012 Clipperz Srl'}, |
55 | {tag:'a', href:'http://www.clipperz.com/terms_of_service',target:'_blank', html:'terms of service'}, | 55 | {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 | |||
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 | ]}, |
@@ -80,3 +83,5 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Co | |||
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 | ]}, |
@@ -99,2 +104,3 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Co | |||
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 | }, |
@@ -167,2 +173,6 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Co | |||
167 | 173 | ||
174 | 'setLogoDefaultColors': function () { | ||
175 | Clipperz.PM.UI.Canvas.logo.normal(this.getElement('logo'), "clipperz", "28.0pt", "#ffffff"); | ||
176 | }, | ||
177 | |||
168 | //------------------------------------------------------------------------- | 178 | //------------------------------------------------------------------------- |
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() { | |||
53 | var controllerParameters; | 53 | var controllerParameters; |
54 | //var iPhoneDesign; | ||
55 | |||
56 | //MochiKit.Signal.connect(document.body, 'onkeydown', _pm_logEvent); | ||
57 | //MochiKit.Signal.connect(document.body, 'onkeypress', _pm_logEvent); | ||
58 | //MochiKit.Signal.connect(document.body, 'onclick', _pm_logEvent); | ||
59 | 54 | ||
@@ -61,3 +56,3 @@ function run() { | |||
61 | 56 | ||
62 | MochiKit.DOM.removeElement('javaScriptAlert'); | 57 | //MochiKit.DOM.removeElement('javaScriptAlert'); |
63 | Clipperz.PM.Strings.Languages.initSetup(); | 58 | Clipperz.PM.Strings.Languages.initSetup(); |
@@ -74,8 +69,2 @@ function run() { | |||
74 | 69 | ||
75 | //if ((window.location.search.indexOf('iPhone') != -1) || (navigator.userAgent.match('iPhone'))) { | ||
76 | // iPhoneDesign = true; | ||
77 | //} else { | ||
78 | // iPhoneDesign = false; | ||
79 | //} | ||
80 | |||
81 | if (window.location.search.indexOf('compact') != -1) { | 70 | if (window.location.search.indexOf('compact') != -1) { |
@@ -88,4 +77,2 @@ function run() { | |||
88 | Clipperz.PM.RunTime.mainController = new Clipperz.PM.UI.Compact.Controllers.MainController(controllerParameters); | 77 | Clipperz.PM.RunTime.mainController = new Clipperz.PM.UI.Compact.Controllers.MainController(controllerParameters); |
89 | //} else if (iPhoneDesign == true) { | ||
90 | // Clipperz.PM.RunTime.mainController = new Clipperz.PM.UI.iPhone.Controllers.MainController(); | ||
91 | } else { | 78 | } else { |