Fixed minor issues reported by user after official release of /delta

frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/DataImport.js

@@ -79,9 +79,7 @@ Clipperz.PM.UI.Components.ExtraFeatures.DataImportClass = React.createClass({
 			]),
 			React.DOM.div({'className': 'content' + ' ' + currentStep + ' ' + this.importContext().inputFormat()}, [
 				React.DOM.div({'className': 'step' + ' ' + currentStep}, [
-					new this.componentWithName(this.importContext().currentStep())({
-						'importContext': this.importContext(),
-					}),
+					new this.componentWithName(this.importContext().currentStep())({'importContext': this.importContext()}),
 				]),
 				this.renderNavbar(currentStep),
 				React.DOM.div({'className': 'buttons' + ' ' + currentStep}, [

frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/DataImport/Import.js

@@ -28,7 +28,13 @@ Clipperz.PM.UI.Components.ExtraFeatures.DataImport.ImportClass = React.createCla
 	//=========================================================================
 
 	importHandler: function (anEvent) {
-		MochiKit.Signal.signal(Clipperz.Signal.NotificationCenter, 'importCards', this.props.importContext.state('recordsToImport'));
+		var recordsToImport = this.props.importContext.state('recordsToImport');
+
+		if (this.props.importContext.state('useImportTag') && this.props.importContext.state('importTag')) {
+			this.props.importContext.enhanceJsonDataWithImportTag(recordsToImport, this.props.importContext.state('importTag'))
+		}
+
+		MochiKit.Signal.signal(Clipperz.Signal.NotificationCenter, 'importCards', recordsToImport);
 	},
 
 	render: function() {

frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/DataImport/Preview.js

@@ -28,7 +28,7 @@ Clipperz.PM.UI.Components.ExtraFeatures.DataImport.PreviewClass = React.createCl
 
 	getInitialState: function() {
 		var	recordsToImport;
-		
+
 		recordsToImport = MochiKit.Iter.reduce(
 			function (acc, item) { acc[item['reference']] = item; return acc; },
 			MochiKit.Base.filter(
@@ -47,6 +47,53 @@ Clipperz.PM.UI.Components.ExtraFeatures.DataImport.PreviewClass = React.createCl
 
 	//=========================================================================
 
+	selectRecordsToImport: function(records) {
+		var newRecordsToImport;
+		var i;
+
+		newRecordsToImport = {};
+		for (i in records) {
+			newRecordsToImport[records[i]['reference']] = records[i];
+		}
+
+		this.setState({'recordsToImport': newRecordsToImport});
+		this.props.importContext.setState('recordsToImport', MochiKit.Base.values(newRecordsToImport));
+	},
+
+	selectAll: function() {
+		this.selectRecordsToImport(this.props.importContext.state('jsonData'));
+	},
+
+	selectNone: function() {
+		this.selectRecordsToImport({});
+	},
+
+	selectNotArchived: function() {
+		this.selectRecordsToImport(MochiKit.Base.filter(function (aRecord) {
+			return !Clipperz.PM.DataModel.Record.labelContainsArchiveTag(aRecord['label']);
+		}, this.props.importContext.state('jsonData')));
+	},
+
+	selectArchived: function() {
+		this.selectRecordsToImport(MochiKit.Base.filter(function (aRecord) {
+			return Clipperz.PM.DataModel.Record.labelContainsArchiveTag(aRecord['label']);
+		}, this.props.importContext.state('jsonData')));
+	},
+
+	//-------------------------------------------------------------------------
+
+	handleImportTagTextChange: function() {
+		var newTag = this.refs['importTagText'].getDOMNode().value;
+
+		this.props.importContext.setState('importTag', newTag);
+	},
+
+	handleImportTagCheckboxChange: function() {
+		this.props.importContext.setState('useImportTag', ! this.props.importContext.state('useImportTag'));
+	},
+
+	//-------------------------------------------------------------------------
+
 	toggleRecordToImport: function(record) {
 		var newRecordsToImport;
 		var recordPosition;
@@ -76,6 +123,10 @@ Clipperz.PM.UI.Components.ExtraFeatures.DataImport.PreviewClass = React.createCl
 		tagList = MochiKit.Base.keys(tagObject);
 		tagList = MochiKit.Base.filter(function(aTag) { return !Clipperz.PM.DataModel.Record.isSpecialTag(aTag); }, tagList);
 
+		if (this.props.importContext.state('useImportTag') && this.props.importContext.state('importTag')) {
+			tagList.push(this.props.importContext.state('importTag'));
+		}
+
 		if (tagList.length > 0) {
 			result = React.DOM.ul({'className': 'tagList'},
 				MochiKit.Base.map(function(aTag){
@@ -123,7 +174,32 @@ Clipperz.PM.UI.Components.ExtraFeatures.DataImport.PreviewClass = React.createCl
 	},
 
 	render: function() {
+		var inputFormat = this.props.importContext.inputFormat();
+
 		return React.DOM.div({'className': 'preview'},
+			React.DOM.div({'className': 'selectButtons'},
+				React.DOM.span({}, "Select:"),
+				React.DOM.a({'onClick': this.selectAll}, "All"),
+				React.DOM.a({'onClick': this.selectNone}, "None"),
+				(inputFormat == 'JSON') ? React.DOM.a({'onClick': this.selectNotArchived}, "Not Archived") : null,
+				(inputFormat == 'JSON') ? React.DOM.a({'onClick': this.selectArchived}, "Archived") : null
+			),
+			React.DOM.div({'className': 'tagButtons'},
+				React.DOM.input({
+					'type': 'checkbox',
+					'id': 'tagCheckbox',
+					'checked': this.props.importContext.state('useImportTag'),
+					'onChange': this.handleImportTagCheckboxChange
+				}),
+				React.DOM.label({'htmlFor': 'tagCheckbox'}, "Apply the following tag to imported cards:"),
+				React.DOM.input({
+					'ref': 'importTagText',
+					'type': 'text',
+					'value': this.props.importContext.state('importTag'),
+					'disabled': ! this.props.importContext.state('useImportTag'),
+					'onChange': this.handleImportTagTextChange
+				})
+			),
 			React.DOM.ul({}, MochiKit.Base.map(MochiKit.Base.method(this, 'renderCard'), this.props.importContext.state('jsonData')))
 		);
 	},

frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/Passphrase.js

@@ -120,7 +120,7 @@ Clipperz.PM.UI.Components.ExtraFeatures.PassphraseClass = React.createClass({
 
 						React.DOM.p({}, [
 							React.DOM.input({'key':'confirm', 'id':'changePassphraseConfirmCheckbox', 'className':'confirmCheckbox', 'type':'checkbox', 'name':'confirm', 'ref':'confirm'}),
-							React.DOM.label({'htmlFor':'changePassphraseConfirmCheckbox'}, "I understand that Clipperz will not be able to help me recovering a lost passphrase.")
+							React.DOM.label({'htmlFor':'changePassphraseConfirmCheckbox'}, "I understand that Clipperz is unable to recover a lost passphrase.")
 						]),
 					]),
 					React.DOM.button({'key':'button', 'type':'submit', 'disabled':!this.shouldEnableChangePassphraseButton(), 'className':'button'}, "Change passphrase"),