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
@@ -1,62 +1,54 @@
 /*
 
 Copyright 2008-2011 Clipperz Srl
 
 This file is part of Clipperz Community Edition.
 Clipperz Community Edition is an online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
 * Clipperz Community Edition is free software: you can redistribute
   it and/or modify it under the terms of the GNU Affero General Public
   License as published by the Free Software Foundation, either version
   3 of the License, or (at your option) any later version.
 
 * Clipperz Community Edition is distributed in the hope that it will
   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
@@ -22,47 +22,47 @@ refer to http://www.clipperz.com.
   <http://www.gnu.org/licenses/>.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 Clipperz.PM.UI.Web.Components.PageFooter = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Web.Components.PageFooter.superclass.constructor.apply(this, arguments);
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageFooter, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         '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");
         },
 
         //-------------------------------------------------------------------------
 
         __syntaxFix__: "syntax fix"
 });
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
@@ -39,93 +39,99 @@ Clipperz.PM.UI.Web.Components.PageHeader = function(args) {
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.PageHeader component";
         },
 
         //-------------------------------------------------------------------------
 
         'iframeURL': function () {
         //      return './rss_view.html';
                 return 'http://www.clipperz.com/files/clipperz.com/appTips/index.html';
         },
 
         //-------------------------------------------------------------------------
 
         '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 () {
                 return this._animationDuration;
         },
 
         'offset': function () {
                 return this._offset;
         },
 
         //-------------------------------------------------------------------------
 
         'isNewsOpen': function () {
                         return this._newsIsOpen;
         },
         
         'toggleNewsIsOpen': function () {
                 this._newsIsOpen = !this._newsIsOpen;
         },
 
         'toggleTips': function(anEvent) {
                 anEvent.preventDefault();
 
@@ -135,47 +141,51 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Co
                                 y: -this.offset(),
                                 mode: 'relative',
                                 duration: this.animationDuration(),
                                 beforeStart: function () {
                                         MochiKit.DOM.setElementClass(Clipperz.DOM.get('news'), 'hiding');
                                 },
                                 afterFinish: function () {
                                         Clipperz.DOM.get('newsframe').innerHTML = "";
                                         MochiKit.DOM.setElementClass(Clipperz.DOM.get('news'), 'hidden');
                                 }
                         })
                         this.toggleNewsIsOpen();
                 } else {
                         MochiKit.DOM.addElementClass('newsframe', 'loading');
                         MochiKit.Visual.Move(Clipperz.DOM.get('news'), {
                                 x: 0,
                                 y: this.offset(),
                                 mode: 'relative',
                                 duration: this.animationDuration(),
                                 beforeStart: MochiKit.Base.bind(function () {
                                         this.append(Clipperz.DOM.get('newsframe'), {tag:'iframe', id:this.getId('iframe'), src:this.iframeURL()});
 
                                         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'));
         },
 
         //-------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
 });