From e9a7228a954e6af25a97628e5e593965e59e5d7c Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 29 Nov 2013 14:59:34 +0000
Subject: [PATCH] Fix delete buttons with new dialog in mail ACL popup window

---
 mail/js/app.js                 | 18 ++++++++++++++++++
 mail/templates/default/acl.xet |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/mail/js/app.js b/mail/js/app.js
index 76d19d95b9..a2a08d4739 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -1963,6 +1963,24 @@ app.classes.mail = AppJS.extend(
 		request.sendRequest();
 	},
 
+	/**
+	*
+	*
+	*/
+	acl_delete_btn: function(_egw,_widget)
+	{
+		var that = this;
+		var buttonId = _widget.id;
+		var callbackAclDeleteDialog = function (button_id)
+		{
+			if (button_id == et2_dialog.YES_BUTTON )
+			{
+				that.et2._inst.submit(buttonId);
+			}
+		}
+		et2_dialog.show_dialog(callbackAclDeleteDialog, this.egw.lang("Do you really want to remove all rights from this account"),this.egw.lang("Delete"), {},et2_dialog.BUTTONS_YES_NO_CANCEL, et2_dialog.WARNING_MESSAGE);
+	},
+
 	/**
 	 * Edit a folder acl for account(s)
 	 *
diff --git a/mail/templates/default/acl.xet b/mail/templates/default/acl.xet
index 6893653b3f..defe0cd4a2 100755
--- a/mail/templates/default/acl.xet
+++ b/mail/templates/default/acl.xet
@@ -54,7 +54,7 @@
 						<checkbox align="center" id="${row}[acl_a]" />
 						<checkbox align="center" id="${row}[acl_recursive]"/>
 						<hbox orient=",0,0">
-							<button align="right" statustext="Delete this ACL" label="Delete" id="delete[${row}]" value="${row}" image="delete" onclick="return app.mail.acl_delete_btn();"/>
+							<button align="right" statustext="Delete this ACL" label="Delete" id="delete[${row}]" value="${row}" image="delete" onclick="app.mail.acl_delete_btn"/>
 						</hbox>
 					</row>
 				</rows>