Added static resources used when exiting the application

Signed-off-by: Giulio Cesare Solaroli <giulio.cesare@clipperz.com>

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
@@ -26,8 +26,8 @@ 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.
 //
@@ -36,26 +36,18 @@ 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
@@ -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");
+	},
 	
 	//-------------------------------------------------------------------------
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
@@ -52,13 +52,8 @@ function run() {
 	var useCompactDesign;
 	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);
 
 	controllerParameters = {};
 
-	MochiKit.DOM.removeElement('javaScriptAlert');
+//	MochiKit.DOM.removeElement('javaScriptAlert');
 	Clipperz.PM.Strings.Languages.initSetup();
 
@@ -73,10 +68,4 @@ 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) {
 		useCompactDesign = true;
@@ -87,6 +76,4 @@ function run() {
 	if (useCompactDesign == true) {
 		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 {
 		Clipperz.PM.RunTime.mainController = new Clipperz.PM.UI.Web.Controllers.MainController(controllerParameters);