Added standalone button for "mark as read"

diff --git a/language/de.xml b/language/de.xml
index d0950db39dfccf81f8670737cfa7678273e9e222..2a9bb6808a201a7150ac41107ffc93975c440dbd 100644 (file)
--- a/language/de.xml
+++ b/language/de.xml
@@ -129,7 +129,6 @@
                <item name="wcf.conversation.participants.other"><![CDATA[und {if $conversation->participants - $participantSummaryCount == 1}ein weiterer{else}{#$conversation->participants-$participantSummaryCount} weitere{/if}]]></item>
                <item name="wcf.conversation.attachments"><![CDATA[Diese Konversation enthält {if $conversation->attachments == 1}einen Dateianhang{else}{#$conversation->attachments} Dateianhänge{/if}.]]></item>
                <item name="wcf.conversation.error.mailboxIsFull"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du hast{else}Sie haben{/if} das zulässige Limit für Konversationen bereits erreicht und {if LANGUAGE_USE_INFORMAL_VARIANT}kannst{else}können{/if} keine neuen Konversationen starten.]]></item>
-               <item name="wcf.conversation.markAllAsRead"><![CDATA[Alle Konversationen als gelesen markieren]]></item>
                <item name="wcf.conversation.message.editNote"><![CDATA[{$message->username} hat diese Nachricht {#$message->editCount} Mal editiert, zuletzt: {@$message->lastEditTime|time}.]]></item>
                <item name="wcf.conversation.noParticipantsWarning"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du bist{else}Sie sind{/if} dabei, auf eine Konversation ohne weitere Teilnehmer zu antworten. Alle anderen Teilnehmer haben diese Konversation verlassen. Niemand wird {if LANGUAGE_USE_INFORMAL_VARIANT}deine{else}Ihre{/if} Nachricht lesen!]]></item>
                <item name="wcf.conversation.message.permalink"><![CDATA[Permalink zur {#$startIndex}. Nachricht]]></item>
@@ -220,4 +219,7 @@
                <item name="wcf.user.option.canSendConversation"><![CDATA[Kann Konversationen schreiben]]></item>
        </category>
 </import>
+<delete>
+       <item name="wcf.conversation.markAllAsRead" />
+</delete>
 </language>

diff --git a/language/en.xml b/language/en.xml
index 2b28180affcd9b1dedf49a80028383ede6ee56a5..e5627400844d6581f2ea6432533a1c432f63735f 100644 (file)
--- a/language/en.xml
+++ b/language/en.xml
@@ -129,7 +129,6 @@
                <item name="wcf.conversation.participants.other"><![CDATA[and {if $conversation->participants - $participantSummaryCount == 1}one other{else}{#$conversation->participants-$participantSummaryCount} others{/if}]]></item>
                <item name="wcf.conversation.attachments"><![CDATA[Conversation contains {#$conversation->attachments} attachment{if $conversation->attachments != 1}s{/if}]]></item>
                <item name="wcf.conversation.error.mailboxIsFull"><![CDATA[You have reached your maximum conversations limit and cannot create new conversations.]]></item>
-               <item name="wcf.conversation.markAllAsRead"><![CDATA[Mark All Conversations Read]]></item>
                <item name="wcf.conversation.message.editNote"><![CDATA[{$message->username} edited this message {#$message->editCount} times, last: {@$message->lastEditTime|time}.]]></item>
                <item name="wcf.conversation.noParticipantsWarning"><![CDATA[You are about to reply to a conversation without other participants, nobody is going to read your message!]]></item>
                <item name="wcf.conversation.message.permalink"><![CDATA[Permalink to {#$startIndex}. message]]></item>
@@ -220,4 +219,7 @@
                <item name="wcf.user.option.canSendConversation"><![CDATA[Can Add Me to Conversations]]></item>
        </category>
 </import>
+<delete>
+       <item name="wcf.conversation.markAllAsRead" />
+</delete>
 </language>

diff --git a/templates/conversationList.tpl b/templates/conversationList.tpl
index bba37544b8ff296fb92d1bc25548f175ed6c4aa2..f58c6a189c0451205e0ddf30957d2de197331583 100644 (file)
--- a/templates/conversationList.tpl
+++ b/templates/conversationList.tpl
@@ -127,9 +127,12 @@
        {pages print=true assign=pagesLinks controller='ConversationList' link="filter=$filter$participantsParameter&pageNo=%d&sortField=$sortField&sortOrder=$sortOrder$labelIDParameter"}
 {/capture}
 
+{capture assign='contentInteractionButtons'}
+       <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{lang}wcf.global.button.markAllAsRead{/lang}</a>
+{/capture}
+
 {capture assign='contentInteractionDropdownItems'}
        <li><a rel="alternate" href="{link controller='ConversationFeed'}at={@$__wcf->getUser()->userID}-{@$__wcf->getUser()->accessToken}{/link}" class="rssFeed">{lang}wcf.global.button.rss{/lang}</a></li>
-       <li class="jsOnly"><a href="#" class="markAllAsReadButton">{lang}wcf.conversation.markAllAsRead{/lang}</a></li>
 {/capture}
 
 {include file='header'}