From 8f45c0e639d0b73e9e5f9c8de599f1541321b01d Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 29 Nov 2013 14:52:52 +0000
Subject: [PATCH] Replace old dialog delete dialog with new dialog in
 addressbook edit popup

---
 addressbook/js/app.js                  | 21 +++++++++++++++++++++
 addressbook/templates/default/edit.xet | 12 ++++++------
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/addressbook/js/app.js b/addressbook/js/app.js
index f609cc299a..808d5fcc62 100644
--- a/addressbook/js/app.js
+++ b/addressbook/js/app.js
@@ -78,6 +78,27 @@ app.classes.addressbook = AppJS.extend(
 		});
 	},
 
+	/**
+	 * Creat a dialog for delete action in edit popup window.
+	 *
+	 * @param _action
+	 * @param _senders
+	 *
+	 */
+	delete_contact: function(_action, _senders)
+	{
+		var that = this;
+		var buttonId = _senders.id;
+		var callbackDeleteDialog = function (button_id)
+		{
+			if (button_id == et2_dialog.YES_BUTTON )
+			{
+				that.et2._inst.submit(buttonId);
+			}
+		}
+		et2_dialog.show_dialog(callbackDeleteDialog, this.egw.lang("Do you really want to delete this contact?"),this.egw.lang("Delete"), {},et2_dialog.BUTTONS_YES_NO_CANCEL, et2_dialog.WARNING_MESSAGE);
+	},
+
 	/**
 	 * Add appointment or show calendar for selected contacts, call default nm_action after some checks
 	 *
diff --git a/addressbook/templates/default/edit.xet b/addressbook/templates/default/edit.xet
index 8a927f3edd..0792df393d 100644
--- a/addressbook/templates/default/edit.xet
+++ b/addressbook/templates/default/edit.xet
@@ -114,12 +114,12 @@
 					<textbox id="adr_one_street" size="45" maxlength="64"/>
 				</row>
 				<row>
-					
+
 					<description/>
 					<textbox statustext="address line 2" id="adr_one_street2" size="45" maxlength="64"/>
 				</row>
 				<row disabled="@addr_format=city_state_postcode">
-					
+
 					<description for="adr_one_locality" value="city"/>
 					<hbox options="0,0">
 						<textbox statustext="ZIP Code" id="adr_one_postalcode" size="5" maxlength="64"/>
@@ -135,12 +135,12 @@
 						<textbox id="adr_one_countryname" class="custom_country"/>
 					</hbox>
 				</row>
-				
+
 				<row disabled="@addr_format=city_state_postcode">
 					<description value="Region"/>
 					<textbox statustext="State" id="adr_one_region" size="19" maxlength="64" class="leftPad5"/>
 				</row>
-				
+
 				<row disabled="!@addr_format=city_state_postcode">
 					<description/>
 					<description value="City"/>
@@ -636,9 +636,9 @@
 						<button label="Apply" id="button[apply]" class="button_apply" image="apply" background_image="1"/>
 						<button label="Cancel" id="button[cancel]" class="button_cancel" onclick="if($cont[view] || false) return true; self.close(); return false;" image="cancel" background_image="1"/>
 						<checkbox statustext="Apply changes to all members, whose fields have the same previous content" label="change all organisation members" id="change_org" span="all"/>
-						<button align="left" label="Delete" id="button[delete]" class="button_delete" onclick="return confirm('Are you shure you want to delete this contact?');" tabindex="25" image="delete" background_image="1"/>
+						<button align="left" label="Delete" id="button[delete]" class="button_delete" onclick="app.addressbook.delete_contact" tabindex="25" image="delete" background_image="1"/>
 					</hbox>
-					
+
 				</row>
 			</rows>
 		</grid>