Improved gui in moderation

diff --git a/com.woltlab.wcf/templates/moderationActivation.tpl b/com.woltlab.wcf/templates/moderationActivation.tpl
index c177ae1b99d5b9a40a20bca554f51c95a30720d8..fe42acc87dc114dec484da1f62a6d05d1693d10d 100644 (file)
--- 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 bb7c5ae6999aaf12d16c381b4e673cc6a40655c7..0c2b9be4b9ee25dc3b9ad6fef0d2bc5d75afe9f6 100644 (file)
--- 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 b72cfc7724d49b371d61616f74ba845bf8d29abd..796dfca41a297f813f29b45170b1574a588c5045 100644 (file)
--- 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 0ee3dc2cc0916ab2dde0740db1c12a81a1f7d007..c70e8877350edce342672bd1191e0329bd884ff6 100644 (file)
--- 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 95699e6942fc66ecd73c6213864498cb43475137..f788eeafc0648ce288503137750547b0a7b620a7 100644 (file)
--- 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>