some ui improvements

js/dialogs/ImportContentPanel.js

@@ -53,7 +53,8 @@ Zarafa.plugins.contactimporter.dialogs.ImportContentPanel = Ext.extend(Zarafa.co
 			items      : [
 				{
 					xtype   : 'contactimporter.importcontactpanel',
-					filename: config.filename
+					filename: config.filename,
+					folder: config.folder
 				}
 			]
 		});

js/dialogs/ImportPanel.js

@@ -39,6 +39,9 @@ Zarafa.plugins.contactimporter.dialogs.ImportPanel = Ext.extend(Ext.Panel, {
 	/* The store for the selection grid */
 	store  : null,
 
+	/* selected folder */
+	folder : null,
+
 	/**
 	 * @constructor
 	 * @param {object} config
@@ -51,6 +54,10 @@ Zarafa.plugins.contactimporter.dialogs.ImportPanel = Ext.extend(Ext.Panel, {
 			this.vcffile = config.filename;
 		}
 
+		if (!Ext.isEmpty(config.folder)) {
+			this.folder = config.folder;
+		}
+
 		// create the data store
 		// we only display the firstname, lastname, homephone and primary email address in our grid
 		this.store = new Ext.data.ArrayStore({
@@ -224,7 +231,7 @@ Zarafa.plugins.contactimporter.dialogs.ImportPanel = Ext.extend(Ext.Panel, {
 			name          : "choosen_addressbook",
 			value         : container.getSettingsModel().get("zarafa/v1/plugins/contactimporter/default_addressbook"),
 			width         : 100,
-			fieldLabel    : "Select an addressbook",
+			fieldLabel    : "Select folder",
 			store         : myStore,
 			mode          : 'local',
 			labelSeperator: ":",
@@ -245,6 +252,7 @@ Zarafa.plugins.contactimporter.dialogs.ImportPanel = Ext.extend(Ext.Panel, {
 			emptyText  : 'Select an .vcf addressbook',
 			border     : false,
 			anchor     : "100%",
+			height     : "30",
 			scope      : this,
 			allowBlank : false,
 			listeners  : {

js/plugin.contactimporter.js

@@ -266,7 +266,8 @@ Zarafa.plugins.contactimporter.ImportPlugin = Ext.extend(Zarafa.core.Plugin, {
 	openImportDialog: function (filename) {
 		var componentType = Zarafa.core.data.SharedComponentType['plugins.contactimporter.dialogs.importcontacts'];
 		var config = {
-			filename: filename
+			filename: filename,
+			modal: true
 		};
 
 		Zarafa.core.data.UIFactory.openLayerComponent(componentType, undefined, config);

js/ui/ContextMenu.js

@@ -43,7 +43,19 @@ Zarafa.plugins.contactimporter.ui.ContextMenu = Ext.extend(Zarafa.hierarchy.ui.C
 		return [{
 			xtype: 'menuseparator'
 		}, {
-			text : _('Export VCF'),
+			text : _('Import vCard'),
+			iconCls : 'icon_contactimporter_import',
+			handler : this.onContextItemImport,
+			beforeShow : function(item, record) {
+				var access = record.get('access') & Zarafa.core.mapi.Access.ACCESS_MODIFY;
+				if (!access || (record.isIPMSubTree() && !record.getMAPIStore().isDefaultStore())) {
+					item.setDisabled(true);
+				} else {
+					item.setDisabled(false);
+				}
+			}
+		}, {
+			text : _('Export vCard'),
 			iconCls : 'icon_contactimporter_export',
 			handler : this.onContextItemExport,
 			beforeShow : function(item, record) {
@@ -58,7 +70,7 @@ Zarafa.plugins.contactimporter.ui.ContextMenu = Ext.extend(Zarafa.hierarchy.ui.C
 	},
 
 	/**
-	 * Fires on selecting 'Open' menu option from {@link Zarafa.hierarchy.ui.ContextMenu ContextMenu}
+	 * Fires on selecting 'Open' menu option from {@link Zarafa.plugins.contactimporter.ui.ContextMenu ContextMenu}
 	 * @private
 	 */
 	onContextItemExport: function () {
@@ -79,6 +91,20 @@ Zarafa.plugins.contactimporter.ui.ContextMenu = Ext.extend(Zarafa.hierarchy.ui.C
 		);
 	},
 
+	/**
+	 * Fires on selecting 'Open' menu option from {@link Zarafa.plugins.contactimporter.ui.ContextMenu ContextMenu}
+	 * @private
+	 */
+	onContextItemImport: function () {
+		var componentType = Zarafa.core.data.SharedComponentType['plugins.contactimporter.dialogs.importcontacts'];
+		var config = {
+			modal: true,
+			folder: this.records.get("entryid")
+		};
+
+		Zarafa.core.data.UIFactory.openLayerComponent(componentType, undefined, config);
+	},
+
 	downloadVCF: function (response) {
 		if(response.status == false) {
 			Zarafa.common.dialogs.MessageBox.show({

resources/css/contactimporter-main.css

@@ -11,14 +11,20 @@
     background-position: center;
 }
 
+.icon_contactimporter_import {
+    background: url(../images/upload.png) no-repeat;
+    background-repeat: no-repeat;
+    background-position: center;
+}
+
 .zarafa-ciplg-container {
     width: 100%;
     height: 30px;
 }
 
-.zarafa-ciplg-button.x-btn-small {
+.zarafa-ciplg-button .x-btn-small {
     width: 80%;
     height: 25px;
     margin-left: auto;
     margin-right: auto;
-}
+}