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) (unidiff) | |
tree | d9366dae335a9bded5c0ee859895abe251790818 /frontend/gamma/js/Clipperz/PM | |
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') (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 | |||
@@ -25,38 +25,30 @@ refer to http://www.clipperz.com. | |||
25 | 25 | ||
26 | // | 26 | // |
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. |
33 | // | 33 | // |
34 | 34 | ||
35 | var kClipperz_PM_UI_Canvas_Logo_normalWidth = 150.0; | 35 | var kClipperz_PM_UI_Canvas_Logo_normalWidth = 150.0; |
36 | var kClipperz_PM_UI_Canvas_Logo_normalHeight = 39.0; | 36 | 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 | 42 | canvas.width = kClipperz_PM_UI_Canvas_Logo_normalWidth; | |
43 | canvas.height = kClipperz_PM_UI_Canvas_Logo_normalHeight; | ||
44 | |||
43 | context.save(); | 45 | context.save(); |
44 | context.scale(canvas.width / kClipperz_PM_UI_Canvas_Logo_normalWidth, canvas.height / kClipperz_PM_UI_Canvas_Logo_normalHeight); | 46 | context.scale(canvas.width / kClipperz_PM_UI_Canvas_Logo_normalWidth, canvas.height / kClipperz_PM_UI_Canvas_Logo_normalHeight); |
45 | context.clearRect(0.0, 0.0, kClipperz_PM_UI_Canvas_Logo_normalWidth, kClipperz_PM_UI_Canvas_Logo_normalHeight); | 47 | context.clearRect(0.0, 0.0, kClipperz_PM_UI_Canvas_Logo_normalWidth, kClipperz_PM_UI_Canvas_Logo_normalHeight); |
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 | ||
61 | context.restore(); | 53 | context.restore(); |
62 | } | 54 | } |
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 | |||
@@ -51,7 +51,7 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageFooter, Clipperz.PM.UI.Co | |||
51 | {tag:'div', cls:'footerContent', children:[ | 51 | {tag:'div', cls:'footerContent', children:[ |
52 | // {tag:'div', cls:'footerStarIcon'}, | 52 | // {tag:'div', cls:'footerStarIcon'}, |
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'}, |
56 | {tag:'a', href:'http://www.clipperz.com/privacy_policy',target:'_blank', html:'privacy policy'}, | 56 | {tag:'a', href:'http://www.clipperz.com/privacy_policy',target:'_blank', html:'privacy policy'}, |
57 | {tag:'span', cls:'applicationVersion', html:'application version: [1992]'} | 57 | {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 | |||
@@ -68,8 +68,11 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Co | |||
68 | ]} | 68 | ]} |
69 | ]}, | 69 | ]}, |
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 | ]}, |
74 | {tag:'div', id:'news', cls:'hidden', children:[ | 77 | {tag:'div', id:'news', cls:'hidden', children:[ |
75 | // {tag:'div', cls:'close', children:[ | 78 | // {tag:'div', cls:'close', children:[ |
@@ -78,7 +81,9 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Co | |||
78 | {tag:'div', id:'newsframe', children:[ | 81 | {tag:'div', id:'newsframe', children:[ |
79 | {tag:'iframe', id:this.getId('iframe'), src:this.iframeURL()} | 82 | {tag:'iframe', id:this.getId('iframe'), src:this.iframeURL()} |
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 | ]}, |
83 | {tag:'div', id:'featureTabs', children:[ | 88 | {tag:'div', id:'featureTabs', children:[ |
84 | {tag:'table', children:[{tag:'tr', children:[ | 89 | {tag:'table', children:[{tag:'tr', children:[ |
@@ -97,6 +102,7 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Co | |||
97 | 102 | ||
98 | MochiKit.Signal.connect(this.getElement('newsGrip'), 'onclick', this, 'toggleTips'); | 103 | MochiKit.Signal.connect(this.getElement('newsGrip'), 'onclick', this, 'toggleTips'); |
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 | }, |
101 | 107 | ||
102 | //------------------------------------------------------------------------- | 108 | //------------------------------------------------------------------------- |
@@ -164,6 +170,10 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Co | |||
164 | this.toggleNewsIsOpen(); | 170 | this.toggleNewsIsOpen(); |
165 | } | 171 | } |
166 | }, | 172 | }, |
173 | |||
174 | 'setLogoDefaultColors': function () { | ||
175 | Clipperz.PM.UI.Canvas.logo.normal(this.getElement('logo'), "clipperz", "28.0pt", "#ffffff"); | ||
176 | }, | ||
167 | 177 | ||
168 | //------------------------------------------------------------------------- | 178 | //------------------------------------------------------------------------- |
169 | 179 | ||