diff --git a/com.woltlab.wcf/clipboardAction.xml b/com.woltlab.wcf/clipboardAction.xml index 3333397a4f1..66c6f2ebf5e 100644 --- a/com.woltlab.wcf/clipboardAction.xml +++ b/com.woltlab.wcf/clipboardAction.xml @@ -121,41 +121,6 @@ - - wcf\system\clipboard\action\ModerationQueueClipboardAction - 1 - - wcf\page\ModerationListPage - - - - wcf\system\clipboard\action\ModerationQueueActivationClipboardAction - 2 - - wcf\page\ModerationListPage - - - - wcf\system\clipboard\action\ModerationQueueActivationClipboardAction - 3 - - wcf\page\ModerationListPage - - - - wcf\system\clipboard\action\ModerationQueueReportClipboardAction - 4 - - wcf\page\ModerationListPage - - - - wcf\system\clipboard\action\ModerationQueueReportClipboardAction - 5 - - wcf\page\ModerationListPage - - @@ -217,5 +182,40 @@ + + wcf\system\clipboard\action\ModerationQueueClipboardAction + 1 + + wcf\page\ModerationListPage + + + + wcf\system\clipboard\action\ModerationQueueActivationClipboardAction + 2 + + wcf\page\ModerationListPage + + + + wcf\system\clipboard\action\ModerationQueueActivationClipboardAction + 3 + + wcf\page\ModerationListPage + + + + wcf\system\clipboard\action\ModerationQueueReportClipboardAction + 4 + + wcf\page\ModerationListPage + + + + wcf\system\clipboard\action\ModerationQueueReportClipboardAction + 5 + + wcf\page\ModerationListPage + + diff --git a/com.woltlab.wcf/fileDelete.xml b/com.woltlab.wcf/fileDelete.xml index 941e7f90c5a..9fa536e9200 100644 --- a/com.woltlab.wcf/fileDelete.xml +++ b/com.woltlab.wcf/fileDelete.xml @@ -2723,6 +2723,9 @@ lib/system/clipboard/action/UserExtendedClipboardAction.class.php lib/system/clipboard/action/ArticleClipboardAction.class.php lib/system/clipboard/action/TagClipboardAction.class.php + lib/system/clipboard/action/ModerationQueueReportClipboardAction.class.php + lib/system/clipboard/action/ModerationQueueClipboardAction.class.php + lib/system/clipboard/action/ModerationQueueActivationClipboardAction.class.php lib/system/condition/INoticeCondition.class.php lib/system/condition/UserReputationCondition.class.php lib/system/cronjob/CleanUpCronjobLogCronjob.class.php diff --git a/com.woltlab.wcf/objectType.xml b/com.woltlab.wcf/objectType.xml index 27b9d4b2e37..d6f816dfe49 100644 --- a/com.woltlab.wcf/objectType.xml +++ b/com.woltlab.wcf/objectType.xml @@ -22,11 +22,6 @@ com.woltlab.wcf.clipboardItem wcf\data\article\ArticleList - - com.woltlab.wcf.moderation.queue - com.woltlab.wcf.clipboardItem - wcf\data\moderation\queue\ViewableModerationQueueList - @@ -1814,5 +1809,8 @@ com.woltlab.wcf.rebuildData + + com.woltlab.wcf.clipboardItem + diff --git a/com.woltlab.wcf/templates/moderationList.tpl b/com.woltlab.wcf/templates/moderationList.tpl index ab00eda10c2..cfbcd2f5ee9 100644 --- a/com.woltlab.wcf/templates/moderationList.tpl +++ b/com.woltlab.wcf/templates/moderationList.tpl @@ -1,15 +1,11 @@ -{capture assign='pageTitle'}{if $status == 2}{lang}wcf.moderation.doneItems{/lang}{else}{lang}wcf.moderation.outstandingItems{/lang}{/if}{if $pageNo > 1} - {lang}wcf.page.pageNo{/lang}{/if}{/capture} +{capture assign='pageTitle'}{lang}wcf.moderation.items{/lang}{if $gridView->getPageNo() > 1} - {lang pageNo=$gridView->getPageNo()}wcf.page.pageNo{/lang}{/if}{/capture} -{capture assign='contentTitle'}{if $status == 2}{lang}wcf.moderation.doneItems{/lang}{else}{lang}wcf.moderation.outstandingItems{/lang}{/if} {#$items}{/capture} +{capture assign='contentTitle'}{lang}wcf.moderation.items{/lang} {#$gridView->countRows()}{/capture} {capture assign='sidebarRight'} {event name='sidebarBoxes'} {/capture} -{capture assign='contentInteractionPagination'} - {pages print=true assign=pagesLinks controller='ModerationList' link="definitionID=$definitionID&assignedUserID=$assignedUserID&status=$status&pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"} -{/capture} - {capture assign='contentInteractionButtons'} {icon name='trash-can'} {lang}wcf.moderation.showDeletedContent{/lang} @@ -17,253 +13,11 @@ {include file='header'} -{if $objects|count} -
-
    -
  1. -
      -
      2. - -
    2. - -
      3. - {hascontent} -
    3. -
        - {content} - {if $definitionID} -
      • - {icon name='tag'} - {lang}wcf.moderation.type.{$availableDefinitions[$definitionID]}{/lang} -
        • - {/if} - - {if !$assignedUserID || $assignedUserID == $__wcf->getUser()->userID} -
      • - {icon name='user'} - {if !$assignedUserID} - {lang}wcf.moderation.filterByUser.nobody{/lang} - {else} - {lang}wcf.moderation.filterByUser.myself{/lang} - {/if} -
        • - {/if} - - {if $status == -1 || $status == 2} -
      • - {if $status == -1} - {icon name='circle'} - {lang}wcf.moderation.status.outstanding{/lang} - {else} - {icon name='circle-check'} - {lang}wcf.moderation.status.done{/lang} - {/if} -
        • - {/if} - {/content} -
      -
      4. - {/hascontent} -
    4. - -
      5. -
    -
    2. - - {foreach from=$objects item=entry} -
  2. -
      -
    1. - -
      2. -
    2. -
      - isNew()} title="{lang}wcf.moderation.markAsRead.doubleClick{/lang}"{/if}>{@$entry->getUserProfile()->getAvatar()->getImageTag(48)}

      - - {if $entry->assignedUserID} - {@$entry->getAssignedUserProfile()->getAvatar()->getImageTag(24)} - {/if} -
      -
      3. -
    3. -
        -
      • {$entry->getLabel()}
        • -
      - -

      - {$entry->getTitle()} - {if $entry->comments} - {@$entry->comments|shortUnit} - {/if} -

      - -
        -
      • {if $entry->getAffectedObject()->getUserID()}{user object=$entry->getUserProfile()}{else}{$entry->getAffectedObject()->getUsername()}{/if}
        • -
      • {@$entry->getAffectedObject()->getTime()|time}
        • -
      • {lang}wcf.moderation.type.{@$entry->getObjectTypeName()}{/lang}
        • - - {event name='messageGroupInfo'} -
      - -
        -
      • {$entry->getAffectedObject()->getUsername()}
        • -
      • {if $entry->lastChangeTime}{@$entry->lastChangeTime|time}{/if}
        • -
      - - {if $entry->assignedUserID} - - {lang}wcf.moderation.assignedUser{/lang}: {$entry->assignedUsername} - - {/if} - - {event name='moderationQueueEntryData'} -
      4. -
    4. -
      -
      {lang}wcf.global.comments{/lang}
      -
      {@$entry->comments|shortUnit}
      -
      - -
      {if $entry->comments}{icon name='comment'} {@$entry->comments|shortUnit}{/if}
      -
      5. -
    5. - {if $entry->lastChangeTime}{@$entry->lastChangeTime|time}{/if} -
      6. - - {event name='columns'} -
    -
    3. - {/foreach} -
-
- - -{else} - {lang}wcf.moderation.noEntries{/lang} -{/if} - -
-
-
-
-
-
- -
-
- -
-
-
- -
-
- -
-
-
- -
-
-
- -
- - {lang}wcf.global.button.reset{/lang} - - -
-
+
+ {unsafe:$gridView->render()}
- -