Added standalone button for "mark as read"

diff --git a/com.woltlab.wcf/templates/moderationList.tpl b/com.woltlab.wcf/templates/moderationList.tpl
index db3b97fe2b34c9c1bd99548d331c0bd591b722b2..3840621c6cc0182b617bb6d55508983680c0c68a 100644 (file)
--- a/com.woltlab.wcf/templates/moderationList.tpl
+++ b/com.woltlab.wcf/templates/moderationList.tpl
@@ -10,8 +10,8 @@
        {pages print=true assign=pagesLinks controller='ModerationList' link="definitionID=$definitionID&assignedUserID=$assignedUserID&status=$status&pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
 {/capture}
 
-{capture assign='contentInteractionDropdownItems'}
-       <li class="jsOnly"><a href="#" class="markAllAsReadButton">{lang}wcf.moderation.markAllAsRead{/lang}</a></li>
+{capture assign='contentInteractionButtons'}
+       <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{lang}wcf.moderation.markAllAsRead{/lang}</a>
 {/capture}
 
 {include file='header'}

diff --git a/com.woltlab.wcf/templates/notificationList.tpl b/com.woltlab.wcf/templates/notificationList.tpl
index 744fc5eeff081478adb64835a976b8eeb43617f6..5feb4767c126d21422cd04074f42b99251480c1e 100644 (file)
--- a/com.woltlab.wcf/templates/notificationList.tpl
+++ b/com.woltlab.wcf/templates/notificationList.tpl
@@ -26,8 +26,13 @@
        {pages print=true assign=pagesLinks controller='NotificationList' link="pageNo=%d"}
 {/capture}
 
+{capture assign='contentInteractionButtons'}
+       {if $__wcf->getUserNotificationHandler()->getNotificationCount()}
+               <a href="#" class="jsMarkAllAsConfirmed contentInteractionButton button small jsOnly">{lang}wcf.user.notification.markAllAsConfirmed{/lang}</a>
+       {/if}
+{/capture}
+
 {capture assign='contentInteractionDropdownItems'}
-       {if $__wcf->getUserNotificationHandler()->getNotificationCount()}<li class="jsOnly"><a href="#" class="jsMarkAllAsConfirmed">{lang}wcf.user.notification.markAllAsConfirmed{/lang}</a></li>{/if}
        <li><a rel="alternate" href="{link controller='NotificationFeed'}at={@$__wcf->getUser()->userID}-{@$__wcf->getUser()->accessToken}{/link}">{lang}wcf.global.button.rss{/lang}</a></li>
 {/capture}
 

diff --git a/wcfsetup/install/files/js/WCF.User.js b/wcfsetup/install/files/js/WCF.User.js
index c55c0aad4b83859ecbdacbb874e6a321f4d2259e..234a89fb6479283a44a01415f5e111795a5c7cf2 100644 (file)
--- a/wcfsetup/install/files/js/WCF.User.js
+++ b/wcfsetup/install/files/js/WCF.User.js
@@ -1430,7 +1430,7 @@ if (COMPILER_TARGET_DEFAULT) {
                        });
                        
                        // handle 'mark all as confirmed' buttons
-                       $('.contentHeaderNavigation .jsMarkAllAsConfirmed').click(function () {
+                       $('.jsMarkAllAsConfirmed').click(function () {
                                WCF.System.Confirmation.show(WCF.Language.get('wcf.user.notification.markAllAsConfirmed.confirmMessage'), function (action) {
                                        if (action === 'confirm') {
                                                new WCF.Action.Proxy({