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
@@ -16,47 +16,39 @@ refer to http://www.clipperz.com.
   be useful, but WITHOUT ANY WARRANTY; without even the implied
   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
   License along with Clipperz Community Edition.  If not, see
   <http://www.gnu.org/licenses/>.
 
 */
 
 //
         //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
@@ -42,25 +42,25 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageFooter, Clipperz.PM.UI.Co
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.PageFooter component";
         },
 
         //-------------------------------------------------------------------------
 
         'renderSelf': function(/*aContainer, aPosition*/) {
                 this.append(this.element(), [
                         {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 &copy; 2009 Clipperz Srl'},
+                                        {tag:'span', cls:'copyright', html:'Copyright &copy; 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]'}
                                 ]}
                         ]}
                 ]);
 
                 Clipperz.PM.UI.Canvas.star.normal(this.getElement('footerStarIcon'), "#7e7e7e");
         },
 
         //-------------------------------------------------------------------------
 
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
@@ -59,53 +59,59 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Co
         'renderSelf': function(/*aContainer, aPosition*/) {
                 this.append(this.element(), [
                         {tag:'div', id:'miscLinks', children:[
                                 {tag:'ul', children:[
                                                 {tag:'li', children:[{tag:'a', id:'donateHeaderLink',   stringID:'pageHeader.donation',         href:'http://www.clipperz.com/donations',               target:'_blank', html:Clipperz.PM.Strings.getValue('pageHeader.donation')}]},
                                                 {tag:'li', children:[{tag:'a', id:'forumHeaderLink',    stringID:'pageHeader.forum',    href:'http://www.clipperz.com/forum',                   target:'_blank', html:Clipperz.PM.Strings.getValue('pageHeader.forum')}]},
                                                 {tag:'li', children:[{tag:'a', id:'creditsHeaderLink',  stringID:'pageHeader.credits',  href:'http://www.clipperz.com/credits',                         target:'_blank', html:Clipperz.PM.Strings.getValue('pageHeader.credits')}]},
                                                 {tag:'li', children:[{tag:'a', id:'feedbackHeaderLink',         stringID:'pageHeader.feedback',         href:'http://www.clipperz.com/contact',                         target:'_blank', html:Clipperz.PM.Strings.getValue('pageHeader.feedback')}]},
                                                 {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"}]}]},
                                                 {tag:'td', children:[{tag:'div', id:'feature_protect',          children:[{tag:'canvas', cls:'featureIcon', id:this.getId('protectIcon')},      {tag:'span', html:"Protect all your sensitive data"}]}]},
                                                 {tag:'td', children:[{tag:'div', id:'feature_directLogin',      children:[{tag:'canvas', cls:'featureIcon', id:this.getId('directLoginIcon')},{tag:'span', html:"Login to your web services without entering any username or password"}]}]},
                                                 {tag:'td', children:[{tag:'div', id:'feature_share',            children:[{tag:'canvas', cls:'featureIcon', id:this.getId('shareIcon')},        {tag:'span', html:"Share secret with family members and associates"}]}]}
                                 ]}]}
                         ]}
                 ]);
 
                 Clipperz.PM.UI.Canvas.features.store(this.getElement('storeIcon'), "#ffffff");
                 Clipperz.PM.UI.Canvas.features.protect(this.getElement('protectIcon'), "#ffffff");
                 Clipperz.PM.UI.Canvas.features.directLogin(this.getElement('directLoginIcon'), "#ffffff");
                 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();
         },
 
         //-------------------------------------------------------------------------
 
         'switchToLoggedMode': function() {
         //      MochiKit.Style.addElementClass(this.element(), 'logged');
                 MochiKit.Style.hideElement('featureTabs');
         },
 
         //-------------------------------------------------------------------------
 
         'animationDuration': function () {
@@ -156,24 +162,28 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Co
 
                                         MochiKit.Signal.connect(this.getElement('iframe'), 'onload', this, 'handleIframeDidLoad');
                                         MochiKit.DOM.setElementClass(Clipperz.DOM.get('news'), 'opening');
                                 }, this),
                                 afterFinish: function () {
                                         MochiKit.DOM.setElementClass(Clipperz.DOM.get('news'), 'open');
                                 }
                         })
                         this.toggleNewsIsOpen();
                 }
         },
         
+        'setLogoDefaultColors': function () {
+                Clipperz.PM.UI.Canvas.logo.normal(this.getElement('logo'), "clipperz", "28.0pt", "#ffffff");
+        },
+        
         //-------------------------------------------------------------------------
 
         'handleIframeDidLoad': function (anEvent) {
                 if (this.isNewsOpen() == false) {
                         this.toggleTips(anEvent);
                 }
                 
                 MochiKit.DOM.removeElementClass('newsframe', 'loading');
                 MochiKit.Signal.disconnectAllTo(this.getElement('iframe'));
         },
 
         //-------------------------------------------------------------------------
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
@@ -42,61 +42,48 @@ MochiKit.Logging.logError("## MainController - GENERIC ERROR" + "\n" + "==>> " +
 
         return result;
 }
 
 
 Clipperz.PM.RunTime = {};
 
 
 function run() {
         var shouldShowRegistrationForm;
         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();
 
         if (window.location.search.indexOf('registration') != -1) {
                 shouldShowRegistrationForm = true;
         } else {
                 shouldShowRegistrationForm = false;
         }
 
         if (window.location.search.indexOf('autocomplete') != -1) {
                 controllerParameters['autocomplete'] = 'on'
         }
 
-        //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;
         } else {
                 useCompactDesign = false;
         }
         
         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);
         }
 
         Clipperz.PM.RunTime.mainController.run(shouldShowRegistrationForm);
 
 //Clipperz.log("HASH: " + window.location.hash);
 if (window.location.hash != "") {
         window.location.hash = ""
 }
 //Clipperz.log("HASH cleaned");
         //#credentials=base64encoded({username:'joe', passphrase:'clipperz'})