4 files changed, 51 insertions, 84 deletions

diff --git a/frontend/gamma/js/Clipperz/PM/UI/Mobile/Components/CardDetail.js b/frontend/gamma/js/Clipperz/PM/UI/Mobile/Components/CardDetail.js
index 32dfa63..abf4758 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Mobile/Components/CardDetail.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Mobile/Components/CardDetail.js
@@ -2,6 +2,5 @@
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
@@ -9,10 +8,10 @@ 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 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.
+* Clipperz 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.
@@ -20,4 +19,3 @@ refer to http://www.clipperz.com.
 * 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/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
@@ -60,3 +58,2 @@ Clipperz.Base.extend(Clipperz.PM.UI.Mobile.Components.CardDetail, Clipperz.PM.UI
         'renderSelf': function () {
-console.log("CardDetail.renderSelf");
                 this.append(this.element(), {tag:'div', cls:'cardDetail', children:[
@@ -157,3 +154,2 @@ console.log("CardDetail.renderSelf");
 
-console.log("ADD DIRECT LOGIN", aDirectLogin);
         },
@@ -167,3 +163,2 @@ console.log("ADD DIRECT LOGIN", aDirectLogin);
 
-console.log("CardDetail.showCard", aCard);
                 deferredResult = new Clipperz.Async.Deferred("CardDetail.showCard", {trace:false});
@@ -268,3 +263,2 @@ console.log("CardDetail.showCard", aCard);
                 
-//console.log("TOGGLE");
                 anEvent.preventDefault;
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Mobile/Components/CardList.js b/frontend/gamma/js/Clipperz/PM/UI/Mobile/Components/CardList.js
index a4aa212..a0e4879 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Mobile/Components/CardList.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Mobile/Components/CardList.js
@@ -2,6 +2,5 @@
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
@@ -9,10 +8,10 @@ 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 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.
+* Clipperz 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.
@@ -20,4 +19,3 @@ refer to http://www.clipperz.com.
 * 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/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
@@ -92,3 +90,2 @@ Clipperz.Base.extend(Clipperz.PM.UI.Mobile.Components.CardList, Clipperz.PM.UI.C
 
-//console.log("someCards", someCards);
                 deferredResult = new Clipperz.Async.Deferred("CardList.showCards", {trace:false});
@@ -104,3 +101,2 @@ Clipperz.Base.extend(Clipperz.PM.UI.Mobile.Components.CardList, Clipperz.PM.UI.C
         'appendCardToList': function (aCardListElement, aCardInfo) {
-//console.log("appendCardToList", aCardInfo);
                 this.append(aCardListElement, {tag:'li', cls:'cardListItem arrow', cardreference:aCardInfo['_reference'], children:[
@@ -123,3 +119,2 @@ Clipperz.Base.extend(Clipperz.PM.UI.Mobile.Components.CardList, Clipperz.PM.UI.C
                 cardReference = MochiKit.DOM.getNodeAttribute(listElement, 'cardreference');
-console.log("###", listElement, cardReference);
                         //TODO: Notify card with reference MochiKit.DOM.getNodeAttribute(listElement, 'cardreference') has been selected
@@ -173,3 +168,2 @@ console.log("###", listElement, cardReference);
                         cardListReference = anEvent.target().id.match(/(cardListReference_|cardListItem_)(.*)/)[2];
-//console.log("Showing detail for card named", cardListReference);
                         MochiKit.Signal.signal(this, 'selectedCard', cardListReference);
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Mobile/Components/LoginForm.js b/frontend/gamma/js/Clipperz/PM/UI/Mobile/Components/LoginForm.js
index eafcdbc..3aeac0c 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Mobile/Components/LoginForm.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Mobile/Components/LoginForm.js
@@ -2,6 +2,5 @@
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
@@ -9,10 +8,10 @@ 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 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.
+* Clipperz 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.
@@ -20,4 +19,3 @@ refer to http://www.clipperz.com.
 * 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/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
@@ -141,3 +139,2 @@ Clipperz.Base.extend(Clipperz.PM.UI.Mobile.Components.LoginForm, Clipperz.PM.UI.
         'showErrors': function (args) {
-//console.log("LoginForm.showErrors", args);
                 if (args['previousFailedAttempt'] == 'LOGIN') {
@@ -301,3 +298,2 @@ Clipperz.Base.extend(Clipperz.PM.UI.Mobile.Components.LoginForm, Clipperz.PM.UI.
         'submitCredentialsHandler': function (anEvent) {
-//console.log("submitCredentialsHandler");
                         varcredentials;
@@ -333,3 +329,2 @@ Clipperz.Base.extend(Clipperz.PM.UI.Mobile.Components.LoginForm, Clipperz.PM.UI.
         'initProgressHandle': function (anEvent) {
-//console.log("** initProgressHandle", anEvent);
                 this._steps = anEvent['steps'];
@@ -339,3 +334,2 @@ Clipperz.Base.extend(Clipperz.PM.UI.Mobile.Components.LoginForm, Clipperz.PM.UI.
         'updateProgressHandle': function (anEvent) {
-//console.log("** updateProgressHandle", anEvent);
                 this._steps += anEvent['extraSteps'];
@@ -344,5 +338,3 @@ Clipperz.Base.extend(Clipperz.PM.UI.Mobile.Components.LoginForm, Clipperz.PM.UI.
         'advanceProgressHandle': function (anEvent) {
-//console.log("** advanceProgressHandle", anEvent);
                 this._actualSteps ++;
-//console.log("STEPS: " + this._actualSteps + "/" + this._steps);
         },
@@ -350,3 +342,2 @@ Clipperz.Base.extend(Clipperz.PM.UI.Mobile.Components.LoginForm, Clipperz.PM.UI.
         'progressDoneHandle': function (anEvent) {
-//console.log("** progressDoneHandle", anEvent);
         },
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Mobile/Controllers/MainController.js b/frontend/gamma/js/Clipperz/PM/UI/Mobile/Controllers/MainController.js
index 12a61f7..9951f44 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Mobile/Controllers/MainController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Mobile/Controllers/MainController.js
@@ -2,6 +2,5 @@
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
@@ -9,10 +8,10 @@ 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 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.
+* Clipperz 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.
@@ -20,4 +19,3 @@ refer to http://www.clipperz.com.
 * 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/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
@@ -28,3 +26,3 @@ Clipperz.Base.module('Clipperz.PM.UI.Mobile.Controllers');
 Clipperz.PM.UI.Mobile.Controllers.MainController = function() {
-                this._jQTouch   = null;
+        //      this._jQTouch   = null;
                 this._user              = null;
@@ -55,3 +53,3 @@ MochiKit.Base.update(Clipperz.PM.UI.Mobile.Controllers.MainController.prototype,
         //-------------------------------------------------------------------------
-
+/*
         'jQTouch': function () {
@@ -63,3 +61,3 @@ MochiKit.Base.update(Clipperz.PM.UI.Mobile.Controllers.MainController.prototype,
         },
-
+*/
         //=========================================================================
@@ -67,4 +65,2 @@ MochiKit.Base.update(Clipperz.PM.UI.Mobile.Controllers.MainController.prototype,
         'run': function () {
-                console.log("MainController.run");
-
                 MochiKit.Signal.connect(Clipperz.Signal.NotificationCenter, 'doLogin', MochiKit.Base.method(this, 'doLogin'));
@@ -79,3 +75,3 @@ MochiKit.Base.update(Clipperz.PM.UI.Mobile.Controllers.MainController.prototype,
 
-                this.initjQTouch();
+        //      this.initjQTouch();
 
@@ -85,3 +81,3 @@ MochiKit.Base.update(Clipperz.PM.UI.Mobile.Controllers.MainController.prototype,
         },
-
+/*
         'initjQTouch': function () {
@@ -126,3 +122,3 @@ MochiKit.Base.update(Clipperz.PM.UI.Mobile.Controllers.MainController.prototype,
         },
-
+*/
         //=========================================================================
@@ -130,3 +126,2 @@ MochiKit.Base.update(Clipperz.PM.UI.Mobile.Controllers.MainController.prototype,
         'showAddToHomeScreenBaloon': function () {
-console.log(">>> showAddToHomeScreenBaloon");
         },
@@ -136,5 +131,3 @@ console.log(">>> showAddToHomeScreenBaloon");
         'selectInitialProxy': function () {
-//console.log(">>> selectInitialProxy");
                 if (this.isOnline()) {
-//console.log("--- selectInitialProxy: using default proxy");
                         this._proxy = Clipperz.PM.Proxy.defaultProxy;
@@ -142,3 +135,2 @@ console.log(">>> showAddToHomeScreenBaloon");
                         if (this.hasLocalData()) {
-//console.log("--- selectInitialProxy: using local cache proxy");
                                 this._proxy = new Clipperz.PM.Proxy.OfflineCache({'shouldPayTolls':false});
@@ -169,3 +161,2 @@ console.log(">>> showAddToHomeScreenBaloon");
         'handleFailedCredentialsLogin': function () {
-console.log("LOGIN FAILED");
                 this.showLoginForm({'previousFailedAttempt':'LOGIN'});
@@ -192,3 +183,2 @@ console.log("LOGIN FAILED");
 
-//console.log(">>> MainController.doLogin", someArgs);
                 credentials = someArgs['credentials'];
@@ -234,3 +224,2 @@ console.log("LOGIN FAILED");
 
-console.log(">>> setupApplication");
                 deferredResult = new Clipperz.Async.Deferred("MainController.setupApplication", {trace:false});
@@ -257,3 +246,3 @@ console.log(">>> setupApplication");
                 if (this.isFirstTimeUser()) {
-                        deferredResult.addCallback(function () { console.log("--> welcome"); });
+                        deferredResult.addCallback(function () { Clipperz.log("--> welcome"); });
                 }
@@ -276,3 +265,3 @@ console.log(">>> setupApplication");
                 if (this.shouldShowPaymentReminder()) {
-                        deferredResult.addCallback(function () { console.log("--> payment reminder"); });
+                        deferredResult.addCallback(function () { Clipperz.log("--> payment reminder"); });
                 }
@@ -295,3 +284,3 @@ console.log(">>> setupApplication");
                 if (this.canCopyDataLocally()) {
-                        deferredResult.addCallback(function () { console.log("--> copy data locally"); });
+                        deferredResult.addCallback(function () { Clipperz.log("--> copy data locally"); });
                 }
@@ -308,3 +297,2 @@ console.log(">>> setupApplication");
 
-//console.log(">>> runApplication");
                 deferredResult = new Clipperz.Async.Deferred('MainController.runApplication', {trace:true});
@@ -364,3 +352,3 @@ console.log(">>> setupApplication");
                 this.cardList().showCards(someCards);
-                this.jQTouch().goTo('#cardList', 'slideleft');
+        //      this.jQTouch().goTo('#cardList', 'slideleft');
         },
@@ -382,3 +370,3 @@ console.log(">>> setupApplication");
                 deferredResult.addMethod(this.cardDetail(), 'render');
-                deferredResult.addMethod(this.jQTouch(), 'goTo', '#cardDetail', 'slideleft');
+        //      deferredResult.addMethod(this.jQTouch(), 'goTo', '#cardDetail', 'slideleft');
                 deferredResult.addMethod(this.user(), 'getRecord', aCardReference);