10 files changed, 102 insertions, 141 deletions

diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/AppController.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/AppController.js
index 1ab2e69..3d9d6d3 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/AppController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/AppController.js
@@ -1,34 +1,32 @@
 /*
 
-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
 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.
 
 * 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/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Controllers');
 
 Clipperz.PM.UI.Web.Controllers.AppController = function(args) {
 
         this._user = null;
         this._tabSlotNames = {
                         //tabName:       slotName
                         'cards':        'cardGrid',
         //              'directLogins':'directLoginGrid',
@@ -315,25 +313,24 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.AppController.prototype, {
 
         'handleUnlock': function (anEvent) {
                 return Clipperz.Async.callbacks("AppController.handleUnock", [
                         MochiKit.Base.partial(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'initProgress'),
                         MochiKit.Base.method(this.user(), 'login'),
                         MochiKit.Base.method(this.cardsController(), 'focus'),
                         MochiKit.Base.partial(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'progressDone'),
                         MochiKit.Base.method(this.userInfoBox(), 'unlock')
                 ], {trace:false});
         },
 
         'handleDownloadOfflineCopy': function (anEvent) {
-console.log("AppController.handleDownloadOfflineCopy");
                 var downloadHref;
                 
                 downloadHref = window.location.href.replace(/\/[^\/]*$/,'') + Clipperz_dumpUrl;
 
                 if (Clipperz_IEisBroken == true) {
                         window.open(downloadHref, "");
                 } else {
                                 vardeferredResult;
                         var newWindow;
 
                         newWindow = window.open("", "");
 
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/CardDialogController.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/CardDialogController.js
index effde31..b1ff81f 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/CardDialogController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/CardDialogController.js
@@ -1,34 +1,32 @@
 /*
 
-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
 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.
 
 * 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/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Controllers');
 
 Clipperz.PM.UI.Web.Controllers.CardDialogController = function(args) {
         args = args || {};
         
         Clipperz.PM.UI.Web.Controllers.CardDialogController.superclass.constructor.call(this, args);
         
                 this._record    = args.record   || Clipperz.Base.exception.raise('MandatoryParameter');
                 this._delegate  = args.delegate         || Clipperz.Base.exception.raise('MandatoryParameter');
@@ -365,25 +363,24 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Controllers.CardDialogController, Object
 
                         MochiKit.Base.method(this, 'addCardDialogComponentWithField'),
                         MochiKit.Base.method(this.cardDialogComponent(), 'resetNewFieldInputs'),
 
                         MochiKit.Base.method(this.cardDialogComponent(), 'fixRendering'),
                         MochiKit.Base.method(this, 'handleChangedValue')
                 ], {trace:false})
         },
 
         //-------------------------------------------------------------------------
 
         'handlePerformFieldAction': function (aFieldID, aTargetElement) {
-//console.log("### targetElement", aTargetElement);
                 return Clipperz.Async.callbacks("CardDialogController.handleDeleteField", [
                         MochiKit.Base.method(this.record(), 'fields'),
                         MochiKit.Base.itemgetter(aFieldID),
                         Clipperz.Async.collectResults("CardDialogController.handleDeleteField <collect results>", {
                                         'value':MochiKit.Base.methodcaller('value'),
                                         'type':         MochiKit.Base.methodcaller('actionType')
                         }, {trace:false}),
                         MochiKit.Base.bind(function (someValues) {
                                 switch (someValues['type']) {
                                         case 'NONE':
                                                 throw "this event handler should not be triggered for fields with type 'NONE'";
                                                 break;
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/CardsController.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/CardsController.js
index f58f0b8..68b5b9f 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/CardsController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/CardsController.js
@@ -1,34 +1,32 @@
 /*
 
-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
 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.
 
 * 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/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Controllers');
 
 Clipperz.PM.UI.Web.Controllers.CardsController = function() {
         Clipperz.PM.UI.Web.Controllers.CardsController.superclass.constructor.apply(this, arguments);
 
         MochiKit.Signal.connect(Clipperz.Signal.NotificationCenter, 'cardDialogComponentClosed', this, 'handleHideCard');
 
         return this;
 }
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/DirectLoginWizardController.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/DirectLoginWizardController.js
index c025a51..92ed6e3 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/DirectLoginWizardController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/DirectLoginWizardController.js
@@ -1,34 +1,32 @@
 /*
 
-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
 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.
 
 * 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/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Controllers');
 
 Clipperz.PM.UI.Web.Controllers.DirectLoginWizardController = function(args) {
                 this._directLoginEditingComponent       = args.directLoginEditingComponent|| Clipperz.Base.exception.raise('MandatoryParameter');
                 this._cardLabel                                         = args.cardLabel                                || Clipperz.Base.exception.raise('MandatoryParameter');
 
                 MochiKit.Signal.connect(this._directLoginEditingComponent, 'changedValue',this, 'handleChangedValue');
                 MochiKit.Signal.connect(this._directLoginEditingComponent, 'moveForward',this, 'handleMoveForward');
                 MochiKit.Signal.connect(this._directLoginEditingComponent, 'keyPressed',this, 'handleDirectLoginEditingComponentKeyPressed');
@@ -154,25 +152,24 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.DirectLoginWizardController.
                 }
                 
                 return result;
         },
 
         //-----------------------------------------------------------------------------
 
         'originalBindings': function () {
                 return this._originalBindings;
         },
         
         'setOriginalBindings': function (aValue) {
-//console.log("BINDINGS", aValue);
                 this._originalBindings = aValue;
         },
 
         //=============================================================================
 
         'rulerComponent': function () {
                 if (this._rulerComponent == null) {
                         this._rulerComponent = new Clipperz.PM.UI.Web.Components.RulerComponent({
                                 translationContext:'Wizards.DirectLoginWizard'
                         });
                         this._rulerComponent.render();
                         
@@ -398,26 +395,24 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.DirectLoginWizardController.
 
                 Clipperz.Async.callbacks("DirectLoginWizardController.done", [
                         MochiKit.Base.method(this.directLoginEditingComponent(), 'label'),
                         MochiKit.Base.method(this.directLogin(), 'setLabel'),
                         
                         MochiKit.Base.method(this.directLoginEditingComponent(), 'bookmarkletConfiguration'),
                         MochiKit.Base.method(this.directLogin(), 'setBookmarkletConfiguration'),
 
                                 //Bindings
                         MochiKit.Base.method(this.directLoginEditingComponent(), 'bindingComponents'),
         //              MochiKit.Base.partial(MochiKit.Base.map, MochiKit.Base.bind(function (aBindingComponent) {
                         Clipperz.Async.forEach(MochiKit.Base.bind(function (aBindingComponent) {
-//console.log("aBindingComponent", aBindingComponent);
-        //                      this.directLogin().
                                 return Clipperz.Async.callbacks("DirectLoginWizardController.done - update directLogin bindings", [
                                         MochiKit.Base.method(this.directLogin(), 'bindings'),
                                         MochiKit.Base.itemgetter(aBindingComponent.formFieldName()),
                                         MochiKit.Base.methodcaller('setFieldKey', aBindingComponent.selectedValue())
                                 ], {trace:false});
                         }, this)),
 
                         MochiKit.Base.method(this.directLoginEditingComponent(), 'favicon'),
                         MochiKit.Base.method(this.directLogin(), 'setFavicon'),
                         
                         MochiKit.Base.partial(MochiKit.Signal.signal, this, 'done', {
                                         'directLogin':  this.directLogin(),
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/DirectLoginsController.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/DirectLoginsController.js
index 6ca3be4..7ab512a 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/DirectLoginsController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/DirectLoginsController.js
@@ -1,34 +1,32 @@
 /*
 
-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
 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.
 
 * 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/.
 
 */
 
 /*
 Clipperz.Base.module('Clipperz.PM.UI.Web.Controllers');
 
 Clipperz.PM.UI.Web.Controllers.DirectLoginsController = function() {
         Clipperz.PM.UI.Web.Controllers.DirectLoginsController.superclass.constructor.apply(this, arguments);
         
         return this;
 };
 
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/FilterController.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/FilterController.js
index bfc093a..de59ec3 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/FilterController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/FilterController.js
@@ -1,34 +1,32 @@
 /*
 
-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
 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.
 
 * 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/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Controllers');
 
 Clipperz.PM.UI.Web.Controllers.FilterController = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Web.Controllers.FilterController.superclass.constructor.call(this, args);
 
         this._filterElements = [];
         this._filter = "";
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/GridController.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/GridController.js
index 8bb3016..44fbdef 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/GridController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/GridController.js
@@ -1,34 +1,32 @@
 /*
 
-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
 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.
 
 * 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/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Controllers');
 
 Clipperz.PM.UI.Web.Controllers.GridController = function(args) {
         args = args || {};
         
         Clipperz.PM.UI.Web.Controllers.GridController.superclass.constructor.call(this, args);
         
         this._grid = null;
         this._user = null;
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/LoginController.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/LoginController.js
index a57152d..ac85d36 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/LoginController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/LoginController.js
@@ -1,34 +1,32 @@
 /*
 
-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
 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.
 
 * 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/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Controllers');
 
 Clipperz.PM.UI.Web.Controllers.LoginController = function(args) {
         this._args = args || {};
 
         this._loginPage = null;
 
         this._newUserWizardController = null;
         this._newUserCreationComponent = null;
@@ -203,48 +201,46 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.LoginController.prototype, {
                 deferredResult.addErrback(function (aValue) { Clipperz.log("WTF!! Error doing the login after creating a new user" + aValue)});
                 deferredResult.callback();
                 
                 return deferredResult;
         },
 
 
         //=========================================================================
 
         'handleFailedLogin': function(aLoginProgress, anError) {
                 var result;
 
-//console.log("anError", anError);
                 if (anError instanceof MochiKit.Async.CancelledError) {
                         result = anError;
                 } else {
                         var deferredResult;
                         
-MochiKit.Logging.logError("## MainController - FAILED LOGIN: " + anError);
+Clipperz.logError("## MainController - FAILED LOGIN: " + anError);
                         deferredResult = new MochiKit.Async.Deferred();
 
                         aLoginProgress.showErrorMessage("failed login");
         //              Clipperz.NotificationCenter.register(loginProgress, 'cancelEvent', deferredResult, 'callback');
                         MochiKit.Signal.connect(aLoginProgress, 'cancelEvent', deferredResult, 'callback');
                         deferredResult.addCallback(MochiKit.Async.fail, anError)
                         result = deferredResult;
                 }
         
                 return result;
         },
 
         'handleGenericError': function(anError) {
                 var result;
                 
                 if (anError instanceof MochiKit.Async.CancelledError) {
                         result = anError;
                 } else {
-MochiKit.Logging.logError("## MainController - GENERIC ERROR" + "\n" + "==>> " + anError + " <<==\n" + anError.stack);
-//console.log(anError);
+Clipperz.logError("## MainController - GENERIC ERROR" + "\n" + "==>> " + anError + " <<==\n" + anError.stack);
                         result = new MochiKit.Async.CancelledError(anError);
                 }
         
                 return result;
         },
 
         //-----------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
 });
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/MainController.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/MainController.js
index c83e3c0..9194125 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/MainController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/MainController.js
@@ -1,34 +1,32 @@
 /*
 
-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
 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.
 
 * 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/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Controllers');
 
 Clipperz.PM.UI.Web.Controllers.MainController = function(args) {
         this._args = args;
 
                 //controllers
                 this._loginController =null;
                 this._appController =null;
 
@@ -166,32 +164,26 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.MainController.prototype, {
         //.........................................................................
 
         'removePassphraseDelegate': function (aDelegate) {
                 if (this._passphraseDelegate == aDelegate) {
                         this._passphraseDelegate = null;
                         this._passphraseDelegateLock.acquire();
                 }
         },
 
         //-------------------------------------------------------------------------
 
         'loginControllerUserLoggedInCallback': function(anEvent) {
-//Clipperz.log(">>> loginControllerUserLoggedInCallback", anEvent);
-        //      this.setUser(anEvent.parameters()['user']);
-//console.log("--- loginControllerUserLoggedInCallback - 1");
-
-//console.log("--- loginControllerUserLoggedInCallback - 2");
                 this.headerComponent().switchToLoggedMode();
                 this.appController().run({slot:this.pageComponent().slotNamed('body'), user:anEvent['user']});
-//Clipperz.log("<<< loginControllerUserLoggedInCallback");
         },
 
         //-----------------------------------------------------------------------------
 
         'handleRemoteRequestSent': function () {
 //Clipperz.log("REMOTE REQUEST sent >>>");
         },
 
         'handleRemoteRequestReceived': function () {
 //Clipperz.log("REMOTE REQUEST received <<<");
         },
 
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/NewUserWizardController.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/NewUserWizardController.js
index 7db6888..b70aa17 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/NewUserWizardController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/NewUserWizardController.js
@@ -1,34 +1,32 @@
 /*
 
-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
 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.
 
 * 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/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Controllers');
 
 Clipperz.PM.UI.Web.Controllers.NewUserWizardController = function(args) {
                 this._newUserCreationComponent  = args.newUserCreationComponent|| Clipperz.Base.exception.raise('MandatoryParameter');
 
                 MochiKit.Signal.connect(this._newUserCreationComponent, 'changedValue',this, 'handleChangedValue');
                 MochiKit.Signal.connect(this._newUserCreationComponent, 'moveForward',this, 'handleMoveForward');
                 MochiKit.Signal.connect(this._newUserCreationComponent, 'keyPressed',this, 'handleNewUserCreationComponentKeyPressed');
 
@@ -63,25 +61,24 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.NewUserWizardController.prot
         
         'setUser': function (aValue) {
                 this._user = aValue;
         },
 
         //-----------------------------------------------------------------------------
 
         'userCreationState': function () {
                 return this._userCreationState;
         },
         
         'setUserCreationState': function (aValue) {
-//console.log("+++ NewUserWizardController.setUserCreationState", aValue);
                 this._userCreationState = aValue;
                 this.checkState();
         },
 
         //=============================================================================
 
         'resetCurrentStepIndex': function () {
                 this._currentStepIndex = 0;
                 this.rulerComponent().resetStatus({animateTransition:true});
         },
 
         //-----------------------------------------------------------------------------
@@ -213,34 +210,31 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.NewUserWizardController.prot
                                 );
         //                      enablePrevious = false;
                                 break;
                         case 'CHECK_CREDENTIALS':
                                 this.newUserCreationComponent().enableCheckCredentialsPanel();
 
                                 enableNext = (this.newUserCreationComponent().passphrase() == this.newUserCreationComponent().rePassphrase());
         //                      enablePrevious = true;
                                 break
                         case 'TERMS_OF_SERVICE':
                                 this.newUserCreationComponent().enableTermsOfServicePanel();
 
-//console.log("awareOfUnrecoverablePassphrase", this.newUserCreationComponent().awareOfUnrecoverablePassphrase());
-//console.log("readTermsOfService", this.newUserCreationComponent().readTermsOfService());
                                 enableNext = (
                                         (this.newUserCreationComponent().awareOfUnrecoverablePassphrase() == 'on')
                                         &&
                                         (this.newUserCreationComponent().readTermsOfService() == 'on')
                                 )
                                 break;
                         case 'CREATE_USER':
-//console.log(">>> CREATE_USER", this.userCreationState());
                                 this.newUserCreationComponent().enableCreateUserPanel();
 
                                 switch (this.userCreationState()) {
                                         case 'IDLE':
                                                 this.setUserCreationState('IN PROGRESS');
                                                 this.preformActualUserRegistration();
 
                                                 enablePrevious = false;
                                                 enableNext = false;
                                                 break;
                                         case 'IN PROGRESS':
                                                 enablePrevious = false;
@@ -328,25 +322,24 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.NewUserWizardController.prot
                 this.doneWithRuler();
                 MochiKit.Signal.signal(this, 'done', {'user': this.user()});
         },
         
         //=============================================================================
 
         'handleMoveBackward': function () {
                 if (this._currentStepIndex > 0) {
                                 varafterMoveAction;
 
                         afterMoveAction = MochiKit.Base.noop;
 
-//console.log("<-- backward", this.currentStep());
                         switch(this.currentStep()) {
                                 case 'CREDENTIALS':
                                 case 'CHECK_CREDENTIALS':
                                 case 'TERMS_OF_SERVICE':
                                         this._currentStepIndex --;
                                         this.rulerComponent().moveBackward(afterMoveAction);
                                         break;
                                 case 'CREATE_USER':
                                         this.setUser(null);
                                         this.newUserCreationComponent().hideAllProgeressStates();
                                         this.resetCurrentStepIndex();
                                         this.setUserCreationState('IDLE');
@@ -397,25 +390,24 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.NewUserWizardController.prot
                 ], {trace:false});
         },
 
         //-------------------------------------------------------------------------
 
         'handleChangedValue': function (anEvent) {
                 this.checkState();
         },
 
         //-------------------------------------------------------------------------
 
         'handleNewUserCreationComponentKeyPressed': function (anEvent) {
-//console.log(">>> handleNewUserCreationComponentKeyPressed", anEvent.key().string);
                 if (anEvent.key().string == 'KEY_ENTER') {
                         if (anEvent.target().nodeName != 'TEXTAREA') {
                                 anEvent.preventDefault();
                                 this.handleMoveForward();
                         }
                 } else if (anEvent.key().string == 'KEY_TAB') {
                         if (anEvent.target() == this.newUserCreationComponent().usernameElement()) {
                         } else {
                                 this.handleMoveForward();
                                 if ((anEvent.target().nodeName == 'INPUT') || (anEvent.target().nodeName == 'TEXTAREA')) {
                                         anEvent.preventDefault();
                                 }