1 files changed, 10 insertions, 12 deletions

diff --git a/frontend/beta/js/Clipperz/PM/Components/Import/CSVImportComponent.js b/frontend/beta/js/Clipperz/PM/Components/Import/CSVImportComponent.js
index c1dd1a9..bd305c3 100644
--- a/frontend/beta/js/Clipperz/PM/Components/Import/CSVImportComponent.js
+++ b/frontend/beta/js/Clipperz/PM/Components/Import/CSVImportComponent.js
@@ -1,214 +1,212 @@
 /*
 
-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/.
 
 */
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; }
 if (typeof(Clipperz.PM.Components.Import) == 'undefined') { Clipperz.PM.Components.Import = {}; }
 
 //#############################################################################
 
 Clipperz.PM.Components.Import.CSVImportComponent = function(anElement, args) {
         args = args || {};
 
         this._steps = this._steps || ['CSV_EDIT', 'CSV_COLUMNS', 'CSV_HEADER', 'CSV_TITLE', 'CSV_NOTES', 'CSV_FIELDS', 'PREVIEW', 'IMPORT'];
 
     Clipperz.PM.Components.Import.CSVImportComponent.superclass.constructor.call(this, anElement, args);
 
         this._step1Component = null;
         this._step2Component = null;
         this._step3Component = null;
         this._step4Component = null;
         this._step5Component = null;
 
         this._isFirstRowHeader = false;
         this._titleColumnIndex = -1;
         this._notesColumnIndex = -1;
         this._fieldSettings = {};
         this._skippedColumns = new Clipperz.Set();
 
         this.render();
 
         return this;
 }
 
 //=============================================================================
 
 YAHOO.extendX(Clipperz.PM.Components.Import.CSVImportComponent, Clipperz.PM.Components.Import.GenericImportComponent, {
 
         'toString': function() {
                 return "Clipperz.PM.Components.Import.CSVImportComponent component";
         },
 
         //-------------------------------------------------------------------------
 
         'render': function() {
                 this.domHelper().append(this.element(), {tag:'div', cls:'csvImportWizard', children:[
                         {tag:'h3', htmlString:Clipperz.PM.Strings['CSV_ImportWizard_Title']},
                         {tag:'div', cls:'importSteps', id:this.getId('importSteps')},
                         {tag:'div', cls:'importStepBlocks', children:[
                                 {tag:'div', cls:'step_0', id:this.getId('step_0'), children:[
                                         {tag:'div', children:[
                                                 {tag:'div', cls:'importOptionsDescription', htmlString:Clipperz.PM.Strings['importOptions_csv_description']},
                                                 {tag:'div', cls:'importOptionsParameters', children:[
                                                         {tag:'div', cls:'CSVImportOptionsParameters', children:[
                                                                 {tag:'ul', children:[
                                                                         {tag:'li', children:[
                                                                                 {tag:'label', 'for':this.getId('CSV_inputOptions_separator'), html:"separator"},
                                                                                 {tag:'select', name:this.getId('CSV_inputOptions_separator'), id:this.getId('CSV_inputOptions_separator'), children:[
                                                                                         {tag:'option', name:'comma', value:',', html:"comma (,)", selected:true},
                                                                                         {tag:'option', name:'tab', value:'\t', html:"tab"}
                                                                                 ]}
                                                                         ]},
 
                                                                         {tag:'li', children:[
                                                                                 {tag:'label', 'for':this.getId('CSV_inputOptions_quote'), html:"quote"},
                                                                                 {tag:'select', name:this.getId('CSV_inputOptions_quote'), id:this.getId('CSV_inputOptions_quote'), children:[
                                                                                         {tag:'option', name:'doubleQuote', value:'\"', html:"double quote (\")", selected:true},
                                                                                         {tag:'option', name:'singleQuote', value:'\'', html:"single quote (\')"}
                                                                                 ]}
                                                                         ]},
 
                                                                         {tag:'li', children:[
                                                                                 {tag:'label', 'for':this.getId('CSV_inputOptions_escape'), html:"escape"},
                                                                                 {tag:'select', name:this.getId('CSV_inputOptions_escape'), id:this.getId('CSV_inputOptions_escape'), children:[
                                                                                         {tag:'option', name:'doubleQuote', value:'\"', html:"double quote (\")", selected:true},
                                                                                         {tag:'option', name:'slash', value:'\/', html:"slash (\/)"},
                                                                                         {tag:'option', name:'backslash', value:'\\', html:"backslash (\\)"}
                                                                                 ]}
                                                                         ]}
                                                                 ]}
                                                         ]}
                                                 ]},
                                                 this.textAreaConfig()
                                         ]}
                                 ]},
                                 {tag:'div', cls:'step_1', id:this.getId('step_1'), children:[]},
                                 {tag:'div', cls:'step_2', id:this.getId('step_2'), children:[]},
                                 {tag:'div', cls:'step_3', id:this.getId('step_3'), children:[]},
                                 {tag:'div', cls:'step_4', id:this.getId('step_4'), children:[]},
                                 {tag:'div', cls:'step_5', id:this.getId('step_5'), children:[]},
                                 {tag:'div', cls:'step_6', id:this.getId('step_6'), children:[
                                         {tag:'div', children:[
                                                 {tag:'div', id:this.getId('previewDiv'), html:"preview"}
                                         ]}
                                 ]},
                                 {tag:'div', cls:'step_7', id:this.getId('step_7'), children:[
                                         {tag:'div', children:[
                                                 {tag:'h4', html:"done"}
                                         ]}
                                 ]}
                         ]},
                         {tag:'div', cls:'importOptionsButtons', children:[
                                 {tag:'table', children:[
                                         {tag:'tbody', children:[
                                                 {tag:'tr', children:[
                                                         {tag:'td', html:'&nbsp;'},
                                                         {tag:'td', children:[
                                                                 {tag:'div', id:this.getId('backActionButton')}
                                                         ]},
                                                         {tag:'td', html:'&nbsp;'},
                                                         {tag:'td', children:[
                                                                 {tag:'div', id:this.getId('nextActionButton')}
                                                         ]},
                                                         {tag:'td', html:'&nbsp;'}
                                                 ]}
                                         ]}
                                 ]}
                         ]}
                 ]});
                 
                 this.setBackButton(new YAHOO.ext.Button(this.getDom('backActionButton'), {text:"back", handler:this.backAction, scope:this}));
                 this.setNextButton(new YAHOO.ext.Button(this.getDom('nextActionButton'), {text:"next", handler:this.nextAction, scope:this}));
 
                 this.updateSteps();
                 
                 this.getElement('step_0').setVisibilityMode(YAHOO.ext.Element.DISPLAY).show()
                 this.getElement('step_1').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide();
                 this.getElement('step_2').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide();
                 this.getElement('step_3').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide();
                 this.getElement('step_4').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide();
                 this.getElement('step_5').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide();
                 this.getElement('step_6').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide();
                 this.getElement('step_7').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide();
                 
         //      this.backButton().disable();
         },
 
         //-------------------------------------------------------------------------
         
         'nextAction': function() {
                 switch (this.currentStep()) {
                                 case 0:         //-> 1
                                 Clipperz.PM.Components.MessageBox.showProgressPanel(
                                         MochiKit.Base.method(this, 'deferredParseValues'),
                                         MochiKit.Base.method(this, 'handleParseError'),
                                         this.getDom('nextActionButton')
                                 );
                                 break;
                                 case 1:         //-> 2
                                 this.getElement('step_1').hide();
                                 this.step2Component().render();
                                 this.setCurrentStep(2);
                                 this.getElement('step_2').show();
                                 break;
                                 case 2:         //-> 3
                                 this.getElement('step_2').hide();
                                 this.step3Component().render();
                                 this.setCurrentStep(3);
                                 this.getElement('step_3').show();
                                 break;
                                 case 3:         //-> 4
                                 this.getElement('step_3').hide();
                                 this.step4Component().render();
                                 this.setCurrentStep(4);
                                 this.getElement('step_4').show();
                                 break;
                                 case 4:         //-> 5
                                 this.getElement('step_4').hide();
                                 this.step5Component().render();
                                 this.setCurrentStep(5);
                                 this.getElement('step_5').show();
                                 break;
                                 case 5:         //-> 6
                                 this.previewValues();
                                 break;
                                 case 6:         //-> 7
                                 this.importValues();
                                 break;
                 }
         },
 
         //-------------------------------------------------------------------------
         
         'deferredParseValues': function() {
                 var deferredResult;
 
                 deferredResult = new MochiKit.Async.Deferred();
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("CSVImportComponent.deferredParseValues - 1 " + res.substring(0,50)); return res;});
                 deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'parseImportData');
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("CSVImportComponent.deferredParseValues - 2 " + res.substring(0,50)); return res;});
                 deferredResult.addCallback(MochiKit.Base.bind(function(res) {
                         this.startProcessing();