Added standalone button for "mark as read"

diff --git a/com.woltlab.wcf/templates/articleList.tpl b/com.woltlab.wcf/templates/articleList.tpl
index 4aeb58ce57f772f2bc91bd9013be32a2a6578185..6c25bf3722146fb3337a5f186116d992f6c224b5 100644 (file)
--- a/com.woltlab.wcf/templates/articleList.tpl
+++ b/com.woltlab.wcf/templates/articleList.tpl
@@ -71,13 +71,13 @@
                        {event name='sortOptions'}
                </ul>
        </div>
+       {if ARTICLE_ENABLE_VISIT_TRACKING}
+               <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{lang}wcf.global.button.markAsRead{/lang}</a>
+       {/if}
 {/capture}
 
 {capture assign='contentInteractionDropdownItems'}
        <li><a rel="alternate" href="{if $__wcf->getUser()->userID}{link controller='ArticleFeed'}at={@$__wcf->getUser()->userID}-{@$__wcf->getUser()->accessToken}{/link}{else}{link controller='ArticleFeed'}{/link}{/if}" class="rssFeed">{lang}wcf.global.button.rss{/lang}</a></li>
-       {if ARTICLE_ENABLE_VISIT_TRACKING}
-               <li class="jsOnly"><a href="#" class="markAllAsReadButton">{lang}wcf.article.markAllAsRead{/lang}</a></li>
-       {/if}
 {/capture}
 
 {include file='header'}

diff --git a/com.woltlab.wcf/templates/categoryArticleList.tpl b/com.woltlab.wcf/templates/categoryArticleList.tpl
index 789ecc28278d1958cac42a356148f35fac5e4d98..4a99e1cb4871e8160e9f80871cdecb8827e0d96b 100644 (file)
--- a/com.woltlab.wcf/templates/categoryArticleList.tpl
+++ b/com.woltlab.wcf/templates/categoryArticleList.tpl
@@ -66,13 +66,13 @@
        {if $__wcf->user->userID}
                <a href="#" class="contentInteractionButton jsSubscribeButton jsOnly button small{if $category->isSubscribed()} active{/if}" data-object-type="com.woltlab.wcf.article.category" data-object-id="{@$category->categoryID}">{lang}wcf.user.objectWatch.button.subscribe{/lang}</a>
        {/if}
+       {if ARTICLE_ENABLE_VISIT_TRACKING}
+               <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{lang}wcf.global.button.markAsRead{/lang}</a>
+       {/if}
 {/capture}
 
 {capture assign='contentInteractionDropdownItems'}
        <li><a rel="alternate" href="{if $__wcf->getUser()->userID}{link controller='ArticleFeed' id=$categoryID}at={@$__wcf->getUser()->userID}-{@$__wcf->getUser()->accessToken}{/link}{else}{link controller='ArticleFeed' id=$categoryID}{/link}{/if}" class="rssFeed">{lang}wcf.global.button.rss{/lang}</a></li>
-       {if ARTICLE_ENABLE_VISIT_TRACKING}
-               <li class="jsOnly"><a href="#" class="markAllAsReadButton">{lang}wcf.article.markAllAsRead{/lang}</a></li>
-       {/if}
 {/capture}
 
 {include file='header'}

diff --git a/com.woltlab.wcf/templates/unreadArticleList.tpl b/com.woltlab.wcf/templates/unreadArticleList.tpl
index ad138203eea85544ab9155bb57dc349bb7c586fb..0b98b3ee187e6383879ce83942cd99d3c04973b6 100644 (file)
--- a/com.woltlab.wcf/templates/unreadArticleList.tpl
+++ b/com.woltlab.wcf/templates/unreadArticleList.tpl
@@ -43,9 +43,9 @@
        {pages print=true assign='pagesLinks' controller='UnreadArticleList' link="pageNo=%d"}
 {/capture}
 
-{capture assign='contentInteractionDropdownItems'}
+{capture assign='contentInteractionButtons'}
        {if ARTICLE_ENABLE_VISIT_TRACKING}
-               <li class="jsOnly"><a href="#" class="markAllAsReadButton">{lang}wcf.article.markAllAsRead{/lang}</a></li>
+               <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{lang}wcf.global.button.markAsRead{/lang}</a>
        {/if}
 {/capture}
 

diff --git a/com.woltlab.wcf/templates/watchedArticleList.tpl b/com.woltlab.wcf/templates/watchedArticleList.tpl
index 071b65c4a2e70bbfe18b6a57f8bfef54febe3ff9..8da362a589d091f24ba35ab5c3910b8d1dfc0801 100644 (file)
--- a/com.woltlab.wcf/templates/watchedArticleList.tpl
+++ b/com.woltlab.wcf/templates/watchedArticleList.tpl
@@ -41,9 +41,9 @@
        {pages print=true assign='pagesLinks' controller='WatchedArticleList' link="pageNo=%d"}
 {/capture}
 
-{capture assign='contentInteractionDropdownItems'}
+{capture assign='contentInteractionButtons'}
        {if ARTICLE_ENABLE_VISIT_TRACKING}
-               <li class="jsOnly"><a href="#" class="markAllAsReadButton">{lang}wcf.article.markAllAsRead{/lang}</a></li>
+               <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{lang}wcf.global.button.markAsRead{/lang}</a>
        {/if}
 {/capture}
 

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 7b7edf4d12ba9839f06e3e7a332c537313b3aeea..e9ca50ce9328f6d24c72345d8ea9a2a6efcff5b9 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -3324,7 +3324,6 @@ freigeschaltet. {if LANGUAGE_USE_INFORMAL_VARIANT}Du kannst{else}Sie können{/if
                <item name="wcf.article.sortField.random"><![CDATA[Zufällig]]></item>
                <item name="wcf.article.sortField.time"><![CDATA[Datum]]></item>
                <item name="wcf.article.sortField.views"><![CDATA[Zugriffe]]></item>
-               <item name="wcf.article.markAllAsRead"><![CDATA[Alle Artikel als gelesen markieren]]></item>
                <item name="wcf.article.showArticlesWritten"><![CDATA[Artikel von {$user->username}]]></item>
                <item name="wcf.article.recentActivity"><![CDATA[Hat den Artikel {if $article->hasLabels()}<ul class="labelList">{foreach from=$article->getLabels() item=label}<li>{@$label->render()}</li>{/foreach}</ul> {/if}<a href="{$article->getLink()}">{$article->getTitle()}</a> verfasst.]]></item>
                <item name="wcf.article.button.sort"><![CDATA[Sortieren]]></item>
@@ -5606,5 +5605,6 @@ Benachrichtigungen auf <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phra
        <item name="wcf.search.error.user.noMatches" />
        <item name="wcf.user.logout.sure"/>
        <item name="wcf.acp.dataImport.existingMapping.confirmMessage"/>
+       <item name="wcf.article.markAllAsRead" />
 </delete>
 </language>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 1614d422ac4733c902dce63f4d2bfa7aa1ab3b8b..9367d35d83a716f6e642bd8014c525c9b6b524b4 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -3251,7 +3251,6 @@ Your account on the website: {@PAGE_TITLE|phrase} [URL:{link isEmail=true}{/link
                <item name="wcf.article.sortField.random"><![CDATA[Random]]></item>
                <item name="wcf.article.sortField.time"><![CDATA[Date]]></item>
                <item name="wcf.article.sortField.views"><![CDATA[Views]]></item>
-               <item name="wcf.article.markAllAsRead"><![CDATA[Mark All Articles as Read]]></item>
                <item name="wcf.article.showArticlesWritten"><![CDATA[Articles by {$user->username}]]></item>
                <item name="wcf.article.recentActivity"><![CDATA[Wrote the article {if $article->hasLabels()}<ul class="labelList">{foreach from=$article->getLabels() item=label}<li>{@$label->render()}</li>{/foreach}</ul> {/if}<a href="{$article->getLink()}">{$article->getTitle()}</a>.]]></item>
                <item name="wcf.article.button.sort"><![CDATA[Sort]]></item>
@@ -5608,5 +5607,6 @@ your notifications on <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phras
        <item name="wcf.search.error.user.noMatches" />
        <item name="wcf.user.logout.sure"/>
        <item name="wcf.acp.dataImport.existingMapping.confirmMessage"/>
+       <item name="wcf.article.markAllAsRead" />
 </delete>
 </language>