1 files changed, 10 insertions, 18 deletions

diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/NewUserCreationComponent.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/NewUserCreationComponent.js
index feb16ad..06746d1 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/NewUserCreationComponent.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/NewUserCreationComponent.js
@@ -1,70 +1,68 @@
 /*
 
-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.Components');
 
 Clipperz.PM.UI.Web.Components.NewUserCreationComponent = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Web.Components.NewUserCreationComponent.superclass.constructor.apply(this, arguments);
 
         this._tabPanelController = null;
 
         this._initiallySelectedTab = args.selected || 'CREDENTIALS';
         this._tabPanelControllerConfiguration = {
                 'CREDENTIALS': {
                                 tab:'credentialsTab',
                                 panel:'credentialsTabpanel'
                 },
                 'CHECK_CREDENTIALS': {
                                 tab:'checkCredentialsTab',
                                 panel:'checkCredentialsTabpanel'
                 },
                 'TERMS_OF_SERVICE': {
                                 tab:'termsOfServiceTab',
                                 panel:'termsOfServiceTabpanel'
                 },
                 'CREATE_USER': {
                                 tab:'createUserTab',
                                 panel:'createUserTabpanel'
                         }//,
 /*
                 'LOGIN': {
                                 tab:'loginTab',
                                 panel:'loginTabpanel'
                 }
 */
         };
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.NewUserCreationComponent, Clipperz.PM.UI.Common.Components.TabPanelComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
@@ -78,98 +76,96 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.NewUserCreationComponent, Cli
         },
 
         //-------------------------------------------------------------------------
 
         'enableCredentialsPanel': function () {
                 this.tabPanelController().selectTab('CREDENTIALS');
         },
 
         'enableCheckCredentialsPanel': function () {
                 this.tabPanelController().selectTab('CHECK_CREDENTIALS');
         },
 
         'enableTermsOfServicePanel': function () {
                 this.tabPanelController().selectTab('TERMS_OF_SERVICE');
         },
 
         'enableCreateUserPanel': function () {
                 this.tabPanelController().selectTab('CREATE_USER');
         },
 
         //'enableLoginPanel': function () {
         //      this.tabPanelController().selectTab('LOGIN');
         //},
 
         //=========================================================================
 
         'shouldShowElementWhileRendering': function() {
                 return false;
         },
         
         //=========================================================================
 
         'tabPanelController': function () {
                 if (this._tabPanelController == null) {
                         this._tabPanelController = new Clipperz.PM.UI.Common.Controllers.TabPanelController({
                                 component:this,
                                 configuration:this._tabPanelControllerConfiguration
                         });
                         
                         MochiKit.Signal.connect(this._tabPanelController, 'tabSelected', this, 'handleTabSelected')
                 }
                 
                 return this._tabPanelController;
         },
 
         //-------------------------------------------------------------------------
 
         'renderSelf': function() {
-//console.log('** Clipperz.targetModalDimensionsAndPosition', Clipperz.Base.serializeJSON(Clipperz.PM.UI.Common.Components.BaseComponent.targetModalDimensionsAndPosition));
-
                 this.append(this.element(), {tag:'div', cls:'NewUserCreation mainDialog', id:this.getId('panel'), children: [
                         {tag:'form', id:this.getId('form'), cls:'newUserCreationForm', children:[
                                 {tag:'div', cls:'header', children:[
                                         {tag:'div', cls:'title', children:[
                                                 {tag:'h3', id:this.getId('title'), html:"Create new user"}
                                         ]}
                                 ]},
                                 {tag:'div', id:this.getId('body'), cls:'body', children:[
                                         {tag:'div', cls:'tabContainer', children:[
                                                 {tag:'ul', cls:'tabs', children:[
                                                                 {tag:'li', id:this.getId('credentialsTab'),             children:[{tag:'span', html:"credentials"}]},
                                                                 {tag:'li', id:this.getId('checkCredentialsTab'),children:[{tag:'span', html:"credentials check"}]},
                                                                 {tag:'li', id:this.getId('termsOfServiceTab'),  children:[{tag:'span', html:"terms of service"}]},
                                                                 {tag:'li', id:this.getId('createUserTab'),                      children:[{tag:'span', html:"create user"}]}//,
         //                                                      {tag:'li', id:this.getId('loginTab'),                   children:[{tag:'span', html:"login"}]},
                                                 ]},
                                                 {tag:'ul', cls:'tabPanels', children:[
                                                         {tag:'li', id:this.getId('credentialsTabpanel'), cls:'tabPanel credentials', children:[
                                                                 {tag:'div', cls:'wizardStepDescription', children:[{tag:'span', html:Clipperz.PM.Strings.getValue('Wizards.NewUserWizard.CREDENTIALS.description')}]},
                                                                 {tag:'ul', cls:'credentials', children:[
                                                                                 {tag:'li', children:[{tag:'span', cls:'label', html:"username"},{tag:'input', type:'text', id:this.getId('username')/*, value:'test'*/}]},
                                                                                 {tag:'li', children:[{tag:'span', cls:'label', html:"passphrase"},{tag:'input', type:'password', id:this.getId('passphrase')/*, value:'test'*/}]}
                                                                 ]}
                                                         ]},
                                                         {tag:'li', id:this.getId('checkCredentialsTabpanel'), cls:'tabPanel checkCredentials', children:[
                                                                 {tag:'div', cls:'wizardStepDescription', children:[{tag:'span', html:Clipperz.PM.Strings.getValue('Wizards.NewUserWizard.CHECK_CREDENTIALS.description')}]},
                                                                 {tag:'ul', cls:'credentials', children:[
                                                                                 {tag:'li', children:[{tag:'span', cls:'label', html:"re-passphrase"},{tag:'input', type:'password', id:this.getId('re-passphrase')/*, value:'test'*/}]}
                                                                 ]}
                                                         ]},
                                                         {tag:'li', id:this.getId('termsOfServiceTabpanel'), cls:'tabPanel termsOfService', children:[
                                                                 {tag:'div', cls:'wizardStepDescription', children:[{tag:'span', html:Clipperz.PM.Strings.getValue('Wizards.NewUserWizard.TERMS_OF_SERVICE.description')}]},
                                                                 {tag:'ul', cls:'termsOfService', children:[
                                                                         {tag:'li', children:[{tag:'input', type:'checkbox', id:this.getId('awareOfUnrecoverablePassphrase')/*, checked:true*/}, {tag:'label', cls:'label', 'for':this.getId('awareOfUnrecoverablePassphrase'), html:"I understand that Clipperz will not be able to recover a lost passphrase."}]},
                                                                         {tag:'li', children:[{tag:'input', type:'checkbox', id:this.getId('readTermsOfService')/*, checked:true*/}, {tag:'label', cls:'label', 'for':this.getId('readTermsOfService'), htmlString:"I have read and agreed to the <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Terms of Service</a>."}]}
                                                                 ]}
                                                         ]},
                                                         {tag:'li', id:this.getId('createUserTabpanel'), cls:'tabPanel createUser', children:[
                                                                 {tag:'div', cls:'wizardStepDescription', children:[{tag:'span', html:Clipperz.PM.Strings.getValue('Wizards.NewUserWizard.CREATE_USER.description')}]},
                                                                 {tag:'ul', cls:'createUserStates', children:[
                                                                         {tag:'li', cls:'creating', id:this.getId('creatingRegistering'), children:[{tag:'span', html:"registering user"}]},
                                                                         {tag:'li', cls:'done', id:this.getId('creatingDone'), children:[{tag:'span', html:"done"}]},
                                                                         {tag:'li', cls:'fail', id:this.getId('creatingFailed'), children:[{tag:'span', html:"fail"}]}
                                                                 ]}
                                                                 ]}//,
         //                                              {tag:'li', id:this.getId('loginTabpanel'), cls:'tabPanel login', children:[
         //                                                      {tag:'div', cls:'wizardStepDescription', children:[{tag:'span', html:Clipperz.PM.Strings.getValue('Wizards.NewUserWizard.LOGIN.description')}]},
         //                                              ]}
@@ -288,100 +284,96 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.NewUserCreationComponent, Cli
                 this.bindingComponents().push(aBindingComponent);
                 aBindingComponent.renderInNode(this.append(this.getElement('bindings'), {tag:'div'}));
         },
 */
         //=========================================================================
 /*
         'formValueComponents': function () {
                 return this._formValueComponents;
         },
         
         'clearAllFormValueComponents': function () {
                 MochiKit.Iter.forEach(this.formValueComponents(), MochiKit.Base.methodcaller('remove'));
                 this._formValueComponents = [];
                 this.getElement('formValues').innerHTML = '';
         },
 
         'addFormValueComponent': function (aFormValueComponent) {
                 this.formValueComponents().push(aFormValueComponent);
                 aFormValueComponent.renderInNode(this.append(this.getElement('formValues'), {tag:'div'}));
         },
 */
         //=========================================================================
 
         'changedValue': function (anEvent) {
                 MochiKit.Signal.signal(this, 'changedValue', anEvent);
 
                 this.incrementUpdateFaviconCounter();
                 MochiKit.Async.callLater(1, MochiKit.Base.method(this, 'updateFavicon'));
         },
 
         //-------------------------------------------------------------------------
 
         'handleBackClick': function (anEvent) {
                 anEvent.preventDefault();
                 
                 MochiKit.Signal.signal(this, 'back');
         },
 
         //=========================================================================
 
         'bottomMargin': function () {
                 var result;
 
         //TODO: WTF!!!
         //              result =MochiKit.Style.getElementPosition(this.element())['y'] +
         //                              MochiKit.Style.getElementDimensions(this.element())['h'];
 
         //              result =MochiKit.Style.getElementPosition(this.getElement('footer'))['y'];
-//console.log("### bottomMargin");
-//console.log('displayElement', this.displayElement());
-//console.log('-- Clipperz.targetModalDimensionsAndPosition', Clipperz.Base.serializeJSON(Clipperz.PM.UI.Common.Components.BaseComponent.targetModalDimensionsAndPosition));
-//console.log('element', MochiKit.Style.getElementPosition('modalDialog') ['y'], MochiKit.Style.getElementDimensions('modalDialog')['h']);
         //      result = 450;
 
                         result =Clipperz.PM.UI.Common.Components.BaseComponent.targetModalDimensionsAndPosition['position']['y'] +
                                         Clipperz.PM.UI.Common.Components.BaseComponent.targetModalDimensionsAndPosition['dimensions']['h'] -
                                         60;
 
                 return result;
         },
 
         //=========================================================================
         
         'focusOnUsernameElement': function () {
                 MochiKit.Async.callLater(0.1, MochiKit.Base.method(this.getElement('username'), 'focus'));
         },
 
         'focusOnRePassphraseElement': function () {
                 this.getElement('re-passphrase').focus();
         },
         /*
         'focusOnBookmarkletConfigurationElement': function () {
                 this.getElement('bookmarkletConfiguration').focus();
         },
 
         'focusOnFaviconElement': function () {
                 this.getElement('faviconURL').focus();
         },
 */
 
         //=========================================================================
 
         'hideAllProgeressStates': function () {
                 MochiKit.Style.hideElement(this.getElement('creatingRegistering'));
                 MochiKit.Style.hideElement(this.getElement('creatingDone'));
                 MochiKit.Style.hideElement(this.getElement('creatingFailed'));
         },
 
         'showProgressOnUserCreation': function () {
 //Clipperz.log(">>> NewUserCreationComponent.showProgressOnUserCreation");
                 this.hideAllProgeressStates();
                 MochiKit.Style.showElement(this.getElement('creatingRegistering'));
         },
 
         'showUserCreationDone': function () {
 //Clipperz.log(">>> NewUserCreationComponent.showUserCreationDone");
                 this.hideAllProgeressStates();
                 MochiKit.Style.showElement(this.getElement('creatingDone'));
 //Clipperz.log("<<< NewUserCreationComponent.showUserCreationDone");
         },