From: Marcel Werk <burntime@woltlab.com>
Date: Mon, 11 Jul 2016 16:21:34 +0000 (+0200)
Subject: Improved gui in moderation
X-Git-Tag: 3.0.0_Beta_1~1198
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8f0273e2ec21e2df0cad936e6eb9690836e79bf0;p=GitHub%2FWoltLab%2FWCF.git

Improved gui in moderation
---

diff --git a/com.woltlab.wcf/templates/moderationActivation.tpl b/com.woltlab.wcf/templates/moderationActivation.tpl
index c177ae1b99..fe42acc87d 100644
--- a/com.woltlab.wcf/templates/moderationActivation.tpl
+++ b/com.woltlab.wcf/templates/moderationActivation.tpl
@@ -35,6 +35,7 @@
 			<nav class="contentHeaderNavigation">
 				<ul>
 					{content}
+						<li class="jsOnly"><a id="moderationAssignUser" class="button"><span class="icon icon16 fa-pencil"></span> <span>{lang}wcf.moderation.assignedUser.change{/lang}</span></a></li>
 						{if !$queue->isDone()}
 							{if $queueManager->canRemoveContent($queue->getDecoratedObject())}<li class="jsOnly"><a id="enableContent" class="button"><span class="icon icon16 fa-check"></span> <span>{lang}wcf.moderation.activation.enableContent{/lang}</span></a></li>{/if}
 							<li class="jsOnly"><a id="removeContent" class="button"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.moderation.activation.removeContent{/lang}</span></a></li>
@@ -82,7 +83,6 @@
 			'wcf.moderation.activation.enableContent.confirmMessage': '{lang}wcf.moderation.activation.enableContent.confirmMessage{/lang}',
 			'wcf.moderation.activation.removeContent.confirmMessage': '{lang}wcf.moderation.activation.removeContent.confirmMessage{/lang}',
 			'wcf.moderation.assignedUser': '{lang}wcf.moderation.assignedUser{/lang}',
-			'wcf.moderation.assignedUser.change': '{lang}wcf.moderation.assignedUser.change{/lang}',
 			'wcf.moderation.assignedUser.error.notAffected': '{lang}wcf.moderation.assignedUser.error.notAffected{/lang}',
 			'wcf.moderation.status.outstanding': '{lang}wcf.moderation.status.outstanding{/lang}',
 			'wcf.moderation.status.processing': '{lang}wcf.moderation.status.processing{/lang}',
diff --git a/com.woltlab.wcf/templates/moderationReport.tpl b/com.woltlab.wcf/templates/moderationReport.tpl
index bb7c5ae699..0c2b9be4b9 100644
--- a/com.woltlab.wcf/templates/moderationReport.tpl
+++ b/com.woltlab.wcf/templates/moderationReport.tpl
@@ -35,12 +35,14 @@
 			<nav class="contentHeaderNavigation">
 				<ul>
 					{content}
-					{if !$queue->isDone()}
-						{if $queueManager->canRemoveContent($queue->getDecoratedObject())}<li class="jsOnly"><a id="removeContent" class="button"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.moderation.report.removeContent{/lang}</span></a></li>{/if}
-						<li class="jsOnly"><a id="removeReport" class="button"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.moderation.report.removeReport{/lang}</span></a></li>
-					{/if}
-					{if $queue->getAffectedObject()}<li><a href="{$queue->getAffectedObject()->getLink()}" class="button"><span class="icon icon16 fa-arrow-right"></span> <span>{lang}wcf.moderation.jumpToContent{/lang}</span></a></li>{/if}
-					{event name='contentHeaderNavigation'}
+						<li class="jsOnly"><a id="moderationAssignUser" class="button"><span class="icon icon16 fa-pencil"></span> <span>{lang}wcf.moderation.assignedUser.change{/lang}</span></a></li>
+						{if !$queue->isDone()}
+							{if $queueManager->canRemoveContent($queue->getDecoratedObject())}<li class="jsOnly"><a id="removeContent" class="button"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.moderation.report.removeContent{/lang}</span></a></li>{/if}
+							<li class="jsOnly"><a id="removeReport" class="button"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.moderation.report.removeReport{/lang}</span></a></li>
+						{/if}
+						{if $queue->getAffectedObject()}<li><a href="{$queue->getAffectedObject()->getLink()}" class="button"><span class="icon icon16 fa-arrow-right"></span> <span>{lang}wcf.moderation.jumpToContent{/lang}</span></a></li>{/if}
+						
+						{event name='contentHeaderNavigation'}
 					{/content}
 				</ul>
 			</nav>
@@ -109,7 +111,6 @@
 	$(function() {
 		WCF.Language.addObject({
 			'wcf.moderation.assignedUser': '{lang}wcf.moderation.assignedUser{/lang}',
-			'wcf.moderation.assignedUser.change': '{lang}wcf.moderation.assignedUser.change{/lang}',
 			'wcf.moderation.assignedUser.error.notAffected': '{lang}wcf.moderation.assignedUser.error.notAffected{/lang}',
 			'wcf.moderation.report.removeContent.confirmMessage': '{lang}wcf.moderation.report.removeContent.confirmMessage{/lang}',
 			'wcf.moderation.report.removeContent.reason': '{lang}wcf.moderation.report.removeContent.reason{/lang}',
diff --git a/wcfsetup/install/files/js/WCF.Moderation.js b/wcfsetup/install/files/js/WCF.Moderation.js
index b72cfc7724..796dfca41a 100644
--- a/wcfsetup/install/files/js/WCF.Moderation.js
+++ b/wcfsetup/install/files/js/WCF.Moderation.js
@@ -93,7 +93,7 @@ WCF.Moderation.Management = Class.extend({
 		
 		$(this._buttonSelector).click($.proxy(this._click, this));
 		
-		$('<a>' + WCF.Language.get('wcf.moderation.assignedUser.change') + '</a>').click($.proxy(this._clickAssignedUser, this)).insertAfter($('#moderationAssignedUserContainer > dd > span'));
+		$('#moderationAssignUser').click($.proxy(this._clickAssignedUser, this));
 	},
 	
 	/**
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 0ee3dc2cc0..c70e887735 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -2551,7 +2551,7 @@ Fehler sind beispielsweise:
 	
 	<category name="wcf.moderation">
 		<item name="wcf.moderation.assignedUser"><![CDATA[Zugewiesener Benutzer]]></item>
-		<item name="wcf.moderation.assignedUser.change"><![CDATA[(Ändern)]]></item>
+		<item name="wcf.moderation.assignedUser.change"><![CDATA[Zugewiesenen Benutzer ändern]]></item>
 		<item name="wcf.moderation.assignedUser.error.notAffected"><![CDATA[Dieser Benutzer hat unzureichende Zugriffsrechte]]></item>
 		<item name="wcf.moderation.assignedUser.nobody"><![CDATA[Niemand]]></item>
 		<item name="wcf.moderation.filterByType"><![CDATA[Typ]]></item>
@@ -2679,7 +2679,7 @@ Fehler sind beispielsweise:
 		<item name="wcf.moderation.report.notification.commentResponse.title.stacked"><![CDATA[{#$timesTriggered} neue Antworten (Meldung)]]></item>
 		<item name="wcf.moderation.report.reason"><![CDATA[Grund der Meldung]]></item>
 		<item name="wcf.moderation.report.reason.description"><![CDATA[Diese Funktion ist ausschließlich zu verwenden bei: Spam, Werbung und anderen problematischen (rassistischen, gewaltverherrlichenden, aggressiven, beleidigenden oder sexistischen) Inhalten.]]></item>
-		<item name="wcf.moderation.report.removeContent"><![CDATA[Gemeldeten Inhalt löschen]]></item>
+		<item name="wcf.moderation.report.removeContent"><![CDATA[Inhalt löschen]]></item>
 		<item name="wcf.moderation.report.removeContent.confirmMessage"><![CDATA[Wollen Sie den gemeldeten Inhalt wirklich löschen?]]></item>
 		<item name="wcf.moderation.report.removeContent.reason"><![CDATA[Begründung (optional)]]></item>
 		<item name="wcf.moderation.report.removeReport"><![CDATA[Meldung löschen]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 95699e6942..f788eeafc0 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -2556,7 +2556,7 @@ Errors are:
 	
 	<category name="wcf.moderation">
 		<item name="wcf.moderation.assignedUser"><![CDATA[Assigned User]]></item>
-		<item name="wcf.moderation.assignedUser.change"><![CDATA[(Change)]]></item>
+		<item name="wcf.moderation.assignedUser.change"><![CDATA[Change Assigned User]]></item>
 		<item name="wcf.moderation.assignedUser.error.notAffected"><![CDATA[This user does not have sufficient privileges.]]></item>
 		<item name="wcf.moderation.assignedUser.nobody"><![CDATA[Nobody]]></item>
 		<item name="wcf.moderation.filterByType"><![CDATA[Type]]></item>
@@ -2684,7 +2684,7 @@ Errors are:
 		<item name="wcf.moderation.report.notification.commentResponse.title.stacked"><![CDATA[{#$timesTriggered} new replies (Report)]]></item>
 		<item name="wcf.moderation.report.reason"><![CDATA[Reason]]></item>
 		<item name="wcf.moderation.report.reason.description"><![CDATA[This function is reserved for: Spam, Advertisement and other questionable (racism, glorification of violence, offending, or sexist) content.]]></item>
-		<item name="wcf.moderation.report.removeContent"><![CDATA[Delete Reported Content]]></item>
+		<item name="wcf.moderation.report.removeContent"><![CDATA[Delete Content]]></item>
 		<item name="wcf.moderation.report.removeContent.confirmMessage"><![CDATA[Do you really want to delete the reported content?]]></item>
 		<item name="wcf.moderation.report.removeContent.reason"><![CDATA[Reason (optional)]]></item>
 		<item name="wcf.moderation.report.removeReport"><![CDATA[Delete Report]]></item>