From 5bd9a496df31b54690e3513e8d3fa6371ad45716 Mon Sep 17 00:00:00 2001
From: Christoph Haas <christoph.h@sprinternet.at>
Date: Tue, 14 Jun 2016 01:09:52 +0200
Subject: [PATCH] more ui improvements

---
 js/plugin.contactimporter.js           |  39 ++-----------------------
 resources/css/contactimporter-main.css |  10 +++----
 resources/images/import_icon.png       | Bin 926 -> 407 bytes
 3 files changed, 7 insertions(+), 42 deletions(-)

diff --git a/js/plugin.contactimporter.js b/js/plugin.contactimporter.js
index 52e88e4..1557d2c 100644
--- a/js/plugin.contactimporter.js
+++ b/js/plugin.contactimporter.js
@@ -48,38 +48,10 @@ Zarafa.plugins.contactimporter.ImportPlugin = Ext.extend(Zarafa.core.Plugin, {
 		/* directly import received vcfs */
 		this.registerInsertionPoint('common.contextmenu.attachment.actions', this.createAttachmentImportButton, this);
 
-		/* add import button to south navigation */
-		this.registerInsertionPoint("navigation.south", this.createImportButton, this);
-
 		/* export a contact via rightclick */
 		this.registerInsertionPoint('context.contact.contextmenu.actions', this.createItemExportInsertionPoint, this);
 	},
 
-	/**
-	 * Creates the button
-	 *
-	 * @return {Object} Configuration object for a {@link Ext.Button button}
-	 *
-	 */
-	createImportButton: function () {
-		var button = {
-			xtype: 'panel',
-			cls: 'zarafa-ciplg-container',
-			layout: 'fit',
-			navigationContext: container.getContextByName('contact'),
-			items: [{
-				xtype            : 'button',
-				text             : _('Import Contacts'),
-				iconCls          : 'icon_contactimporter_button',
-				cls: 'zarafa-ciplg-button',
-				handler          : this.onImportButtonClick,
-				scope            : this
-			}]
-		};
-
-		return button;
-	},
-
 	/**
 	 * This method hooks to the contact context menu and allows users to export users to vcf.
 	 *
@@ -89,7 +61,7 @@ Zarafa.plugins.contactimporter.ImportPlugin = Ext.extend(Zarafa.core.Plugin, {
 	 */
 	createItemExportInsertionPoint: function (include, btn) {
 		return {
-			text   : dgettext('plugin_files', 'Export VCF'),
+			text   : dgettext('plugin_files', 'Export vCard'),
 			handler: this.exportToVCF.createDelegate(this, [btn]),
 			scope  : this,
 			iconCls: 'icon_contactimporter_export'
@@ -156,7 +128,7 @@ Zarafa.plugins.contactimporter.ImportPlugin = Ext.extend(Zarafa.core.Plugin, {
 	 */
 	createAttachmentImportButton: function (include, btn) {
 		return {
-			text      : _('Import Contacts'),
+			text      : _('Import to Contacts'),
 			handler   : this.getAttachmentFileName.createDelegate(this, [btn]),
 			scope     : this,
 			iconCls   : 'icon_contactimporter_button',
@@ -251,13 +223,6 @@ Zarafa.plugins.contactimporter.ImportPlugin = Ext.extend(Zarafa.core.Plugin, {
 		);
 	},
 
-	/**
-	 * Clickhandler for the button
-	 */
-	onImportButtonClick: function () {
-		this.openImportDialog();
-	},
-
 	/**
 	 * Open the import dialog.
 	 *
diff --git a/resources/css/contactimporter-main.css b/resources/css/contactimporter-main.css
index 258f31c..cee0e8a 100644
--- a/resources/css/contactimporter-main.css
+++ b/resources/css/contactimporter-main.css
@@ -2,7 +2,6 @@
     background: url(../images/import_icon.png) no-repeat !important;
     background-repeat: no-repeat;
     background-position: center;
-    background-size: 18px !important;
 }
 
 .icon_contactimporter_export {
@@ -19,12 +18,13 @@
 
 .zarafa-ciplg-container {
     width: 100%;
-    height: 30px;
+    height: 50px;
 }
 
 .zarafa-ciplg-button .x-btn-small {
     width: 80%;
-    height: 25px;
-    margin-left: auto;
-    margin-right: auto;
+    height: 30px;
+    margin-left: 10%;
+    margin-right: 10%;
+    margin-top: 10px;
 }
diff --git a/resources/images/import_icon.png b/resources/images/import_icon.png
index 1588aedad9a626da151f7b9bbe02a33151a393dd..fb8d7bbed78ccd1c067a28bc765f5bd977e347b4 100644
GIT binary patch
literal 407
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|wj^(N7l!{JxM1({$v_d#0*}aI
z1_o|n5N2eUHAey{$X?><>&pIsjaQseTt#}W4g&+Dil>WXh{fr(Qx@hm2Z*%okJj47
z)9Tc_gyp6}0LLljFP_svl(n@gn2v;`>T>csY|<8pxNx<$A#b(jnG2jz5sAOA+M3tz
z`#pco9c6}Tr=JQh__W()^}0rW&8N#V6!II+TkK_Ce_5@QUqac@?t{(C;upKlmF-sb
z4Q^6!xV**h{T6<aHpOL`OdF!s282#Mn^t`N_Usp2J5PPy<Cm|VVK)12pHIib1)qP`
z6qnn`wKp?NQhB*np6zX!HD5b3Lu#bZ@sAb(p`lkwc@I1-`e|uzQs)|25Ig;7QsZNb
zGtY||a&D`2DQ(hOtmFO3<~{q{@6{!-`+u)Wjf|Ma>JTWh=KAY**LEr7?v-$>SGq6%
zy<Gjz<Yfm|MzYpNDyv_N%1KgK!sZurYJI*<UZCx@HMShUAY|}#^>bP0l+XkKltQ5T

literal 926
zcmV;P17ZA$P)<h;3K|Lk000e1NJLTq003kF003kN1^@s6aN?Cz00006VoOIv00000
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-2)yD4Fj_){m=ja11m{H
zK~#9!?VZ1C8c_hpzjsPT1EpirXNDFxp{U(XacZV^OF?kSE*;!Ox+Kt0bjwo6lF_vZ
zq+s3@5=!e9sLM<92Nb7LsCGG|O;2+d@ASR9?`IOdd%pMmyq}^75JCtcBo<hHE^-`a
z4L}J%4nQUb?Y2X_ckFS^-_MNz3;~==DSs|3#BrQDfVTi1$D|WZ{C32UxdG6UQhu0s
zQR)sE?*Z%qSWnul5CItgFNF{fl~NxA3voxr9%uE?DG4FIE2X~p?k(<`@hwKvly2Mr
zc;dCD%v#(^lo2V9+>CwiHge1?a-Ieel3`vU?<6eCSH?D@TGC#7GKu_vL^M0G5(=RZ
zvSiYxH{k5-Z2I`}@)FHvlR{P{;5Nl#@t@br<uZk=Ld0G7m?XxItBl+CFIonLgd`)X
zvJxpIiU70OEQRRQn-32UDI_VfV=Kgz1(+iw0n%*-MInSjyvgVD6rvN|ZkIxcK|(e+
zHz`D?%GB$13el-D)oPVObgIm7IHVArDzme*Lm}MPPza$A3NeDCqazB@iGza!3Lz9i
zA&X$*w+%T$LZH!TP>4<p1_KJ=w8ar(oN$|=Q3yqwDkSXiOc-@`QhKy0Q=k!3R+82e
zW7d#Pr;`Yw#t7;4dWjfa{BV&%2!&9HKA84<6Pv+O2xXcsB#c1c?e9~FPQANWC>SwP
z(s36tt6W_VjOipunD<_-Rtx=ppF%2?3fk@V$^-DK!zxElI*z?R?7A*fP?{2gwIgad
zHf02FSCnnDDMPO|+LXbAA)%0HC=?15q7$`RjY4$d^wTMY=)}gx28HOv$?*w==*0Hx
zZ3@wetruINml^tJSxNtmAV&y=kW~nws1;?;;5lWH`v@5`n#dUk5i(+4kuwS+<mx`}
z;P?Mt<IZF<nPxF3ldB*?E&yByt%%1zA}12dvZh(g$mH71_&-u!Pb#H;3n6|0c*S@l
z;f<8?vu`1;l&?aF2LPTkzfkE)DR*bRn3{K|QtDU;p#VGsu+A(O;@TY<yK|>IKP5Si
zvj(69AO|4B^Gl$u?Z{ogFQk;e7zrVS5Rwr70Gr+EAA=c<R{#J207*qoM6N<$g7gxJ
A<p2Nx