From 8ee506d6147394d9c6f48e4817aef97cedd6dbf7 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 10 May 2013 16:23:28 +0200
Subject: [PATCH] ACL improvements

---
 com.woltlab.wcf/template/aclPermissions.tpl      |  4 +++-
 .../files/acp/templates/aclPermissions.tpl       |  4 +++-
 wcfsetup/install/files/js/WCF.ACL.js             | 16 ++++++++++------
 wcfsetup/install/lang/de.xml                     |  3 +++
 wcfsetup/install/lang/en.xml                     |  3 +++
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/com.woltlab.wcf/template/aclPermissions.tpl b/com.woltlab.wcf/template/aclPermissions.tpl
index d960f39842..044330f729 100644
--- a/com.woltlab.wcf/template/aclPermissions.tpl
+++ b/com.woltlab.wcf/template/aclPermissions.tpl
@@ -5,7 +5,9 @@
 		WCF.Language.addObject({
 			'wcf.acl.option.deny': '{lang}wcf.acl.option.deny{/lang}',
 			'wcf.acl.option.fullAccess': '{lang}wcf.acl.option.fullAccess{/lang}',
-			'wcf.acl.option.grant': '{lang}wcf.acl.option.grant{/lang}'
+			'wcf.acl.option.grant': '{lang}wcf.acl.option.grant{/lang}',
+			'wcf.acl.search.user.description': '{lang}wcf.acl.search.user.description{/lang}',
+			'wcf.acl.search.description': '{lang}wcf.acl.search.description{/lang}',
 		});
 	});
 	//]]>
diff --git a/wcfsetup/install/files/acp/templates/aclPermissions.tpl b/wcfsetup/install/files/acp/templates/aclPermissions.tpl
index d960f39842..044330f729 100644
--- a/wcfsetup/install/files/acp/templates/aclPermissions.tpl
+++ b/wcfsetup/install/files/acp/templates/aclPermissions.tpl
@@ -5,7 +5,9 @@
 		WCF.Language.addObject({
 			'wcf.acl.option.deny': '{lang}wcf.acl.option.deny{/lang}',
 			'wcf.acl.option.fullAccess': '{lang}wcf.acl.option.fullAccess{/lang}',
-			'wcf.acl.option.grant': '{lang}wcf.acl.option.grant{/lang}'
+			'wcf.acl.option.grant': '{lang}wcf.acl.option.grant{/lang}',
+			'wcf.acl.search.user.description': '{lang}wcf.acl.search.user.description{/lang}',
+			'wcf.acl.search.description': '{lang}wcf.acl.search.description{/lang}',
 		});
 	});
 	//]]>
diff --git a/wcfsetup/install/files/js/WCF.ACL.js b/wcfsetup/install/files/js/WCF.ACL.js
index 738940d56a..ac7c406fa2 100644
--- a/wcfsetup/install/files/js/WCF.ACL.js
+++ b/wcfsetup/install/files/js/WCF.ACL.js
@@ -96,7 +96,7 @@ WCF.ACL.List = Class.extend({
 		// insert container elements
 		var $elementContainer = this._container.children('dd');
 		var $aclList = $('<ul class="aclList container" />').appendTo($elementContainer);
-		var $searchInput = $('<input type="text" class="long" />').appendTo($elementContainer);
+		var $searchInput = $('<input type="text" class="long" placeholder="' + WCF.Language.get('wcf.acl.search.' + (!includeUserGroups ? 'user.' : '') + 'description') + '" />').appendTo($elementContainer);
 		var $permissionList = $('<ul class="aclPermissionList container" />').hide().appendTo($elementContainer);
 		
 		// set elements
@@ -186,6 +186,8 @@ WCF.ACL.List = Class.extend({
 		
 		// show permissions
 		this._containerElements.permissionList.show();
+		
+		WCF.DOMNodeInsertedHandler.forceExecution();
 	},
 	
 	/**
@@ -199,7 +201,7 @@ WCF.ACL.List = Class.extend({
 	_createListItem: function(objectID, label, type) {
 		var $listItem = $('<li><span class="icon icon16 icon-' + (type === 'group' ? 'group' : 'user') + '" /> <span>' + label + '</span></li>').appendTo(this._containerElements.aclList);
 		$listItem.data('objectID', objectID).data('type', type).click($.proxy(this._click, this));
-		$('<span class="icon icon16 icon-remove jsTooltip" title="' + WCF.Language.get('wcf.global.button.delete') + '" />').click($.proxy(this._removeItem, this)).appendTo($listItem);
+		$('<span class="icon icon16 icon-remove jsTooltip pointer" title="' + WCF.Language.get('wcf.global.button.delete') + '" />').click($.proxy(this._removeItem, this)).appendTo($listItem);
 		
 		return $listItem;
 	},
@@ -258,8 +260,8 @@ WCF.ACL.List = Class.extend({
 			var $option = data.returnValues.options[$optionID];
 			
 			var $listItem = $('<li><span>' + $option.label +  '</span></li>').data('optionID', $optionID).data('optionName', $option.optionName);
-			var $grantPermission = $('<input type="checkbox" id="grant' + $optionID + '" />').appendTo($listItem).wrap('<label for="grant' + $optionID + '" />');
-			var $denyPermission = $('<input type="checkbox" id="deny' + $optionID + '" />').appendTo($listItem).wrap('<label for="deny' + $optionID + '" />');
+			var $grantPermission = $('<input type="checkbox" id="grant' + $optionID + '" />').appendTo($listItem).wrap('<label for="grant' + $optionID + '" class="jsTooltip" title="' + WCF.Language.get('wcf.acl.option.grant') + '" />');
+			var $denyPermission = $('<input type="checkbox" id="deny' + $optionID + '" />').appendTo($listItem).wrap('<label for="deny' + $optionID + '" class="jsTooltip" title="' + WCF.Language.get('wcf.acl.option.deny') + '" />');
 			
 			$grantPermission.data('type', 'grant').data('optionID', $optionID).change($.proxy(this._change, this));
 			$denyPermission.data('type', 'deny').data('optionID', $optionID).change($.proxy(this._change, this));
@@ -281,8 +283,8 @@ WCF.ACL.List = Class.extend({
 		// add a "full access" permission if there are more than one option
 		if ($count > 1) {
 			var $listItem = $('<li class="aclFullAccess"><span>' + WCF.Language.get('wcf.acl.option.fullAccess') + '</span></li>').prependTo(this._containerElements.permissionList);
-			this._containerElements.grantAll = $('<input type="checkbox" id="grantAll" />').appendTo($listItem).wrap('<label for="grantAll" />');
-			this._containerElements.denyAll = $('<input type="checkbox" id="denyAll" />').appendTo($listItem).wrap('<label for="denyAll" />');
+			this._containerElements.grantAll = $('<input type="checkbox" id="grantAll" />').appendTo($listItem).wrap('<label for="grantAll" class="jsTooltip" title="' + WCF.Language.get('wcf.acl.option.grant') + '" />');
+			this._containerElements.denyAll = $('<input type="checkbox" id="denyAll" />').appendTo($listItem).wrap('<label for="denyAll" class="jsTooltip" title="' + WCF.Language.get('wcf.acl.option.deny') + '" />');
 			
 			// bind events
 			this._containerElements.grantAll.data('type', 'grant').change($.proxy(this._changeAll, this));
@@ -334,6 +336,8 @@ WCF.ACL.List = Class.extend({
 		
 		// add options
 		this._values[type] = data.returnValues[type].option;
+		
+		WCF.DOMNodeInsertedHandler.forceExecution();
 	},
 	
 	/**
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 3249586ef1..4e03e76fad 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -5,6 +5,9 @@
 		<item name="wcf.acl.option.fullAccess"><![CDATA[Vollzugriff]]></item>
 		<item name="wcf.acl.option.grant"><![CDATA[Erlauben]]></item>
 		<item name="wcf.acl.permissions"><![CDATA[Benutzer- und Benutzergruppenrechte]]></item>
+		<item name="wcf.acl.user.permissions"><![CDATA[Benutzerrechte]]></item>
+		<item name="wcf.acl.search.description"><![CDATA[Benutzer- oder Benutzergruppenname eingeben …]]></item>
+		<item name="wcf.acl.search.user.description"><![CDATA[Benutzername eingeben …]]></item>
 	</category>
 	
 	<category name="wcf.acp.application">
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 65193576e6..a0e8c416be 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -5,6 +5,9 @@
 		<item name="wcf.acl.option.fullAccess"><![CDATA[Full Access]]></item>
 		<item name="wcf.acl.option.grant"><![CDATA[Grant]]></item>
 		<item name="wcf.acl.permissions"><![CDATA[User and Group Permissions]]></item>
+		<item name="wcf.acl.user.permissions"><![CDATA[User Permissions]]></item>
+		<item name="wcf.acl.search.description"><![CDATA[TODO: Benutzer- oder Benutzergruppenname eingeben …]]></item>
+		<item name="wcf.acl.search.user.description"><![CDATA[TODO: Benutzername eingeben …]]></item>
 	</category>
 	
 	<category name="wcf.acp.application">
-- 
2.20.1