Use UserTemplatePlugin

See WoltLab/WCF#3321

diff --git a/language/de.xml b/language/de.xml
index 4b39dfc20c819c975d2b2db5c3f442c133d4f414..882b29fc3d7962ec274b57f20f6301f8c843fa2e 100644 (file)
--- a/language/de.xml
+++ b/language/de.xml
@@ -168,8 +168,8 @@
                <item name="wcf.conversation.log.conversation.open"><![CDATA[Hat die Konversation wieder geöffnet.]]></item>
                <item name="wcf.conversation.log.conversation.close"><![CDATA[Hat die Konversation für neue Nachrichten geschlossen.]]></item>
                <item name="wcf.conversation.log.conversation.leave"><![CDATA[Hat die Konversation verlassen.]]></item>
-               <item name="wcf.conversation.log.conversation.addParticipants"><![CDATA[Hat folgende Teilnehmer hinzugefügt: {implode from=$additionalData[participants] item=participant}<a href="{link controller='User' id=$participant[userID] title=$participant[username]}{/link}" class="userLink" data-user-id="{@$participant[userID]}">{$participant[username]}</a>{/implode}]]></item>
-               <item name="wcf.conversation.log.conversation.removeParticipant"><![CDATA[Hat folgenden Teilnehmer entfernt: <a href="{link controller='User' id=$additionalData[userID] title=$additionalData[username]}{/link}" class="userLink" data-user-id="{@$additionalData[userID]}">{$additionalData[username]}</a>]]></item>
+               <item name="wcf.conversation.log.conversation.addParticipants"><![CDATA[Hat folgende Teilnehmer hinzugefügt: {implode from=$additionalData[participants] item=participant}<a href="{link controller='User' id=$participant[userID] title=$participant[username]}{/link}" class="userLink" data-object-id="{@$participant[userID]}">{$participant[username]}</a>{/implode}]]></item>
+               <item name="wcf.conversation.log.conversation.removeParticipant"><![CDATA[Hat folgenden Teilnehmer entfernt: <a href="{link controller='User' id=$additionalData[userID] title=$additionalData[username]}{/link}" class="userLink" data-object-id="{@$additionalData[userID]}">{$additionalData[username]}</a>]]></item>
        </category>
        <category name="wcf.acp.dataImport">
                <item name="wcf.acp.dataImport.data.com.woltlab.wcf.conversation"><![CDATA[Konversationen]]></item>

diff --git a/language/en.xml b/language/en.xml
index a244a4086ae6734bee8236444309ee9c90397e9a..ee2ebb1dda7c3049ceaef296bdbbb7ccdc1b6a05 100644 (file)
--- a/language/en.xml
+++ b/language/en.xml
@@ -168,8 +168,8 @@
                <item name="wcf.conversation.log.conversation.open"><![CDATA[Opened the conversation again.]]></item>
                <item name="wcf.conversation.log.conversation.close"><![CDATA[Closed the conversation.]]></item>
                <item name="wcf.conversation.log.conversation.leave"><![CDATA[Left the conversation.]]></item>
-               <item name="wcf.conversation.log.conversation.addParticipants"><![CDATA[Added the following participants: {implode from=$additionalData[participants] item=participant}<a href="{link controller='User' id=$participant[userID] title=$participant[username]}{/link}" class="userLink" data-user-id="{@$participant[userID]}">{$participant[username]}</a>{/implode}.]]></item>
-               <item name="wcf.conversation.log.conversation.removeParticipant"><![CDATA[Removed a participant: <a href="{link controller='User' id=$additionalData[userID] title=$additionalData[username]}{/link}" class="userLink" data-user-id="{@$additionalData[userID]}">{$additionalData[username]}</a>.]]></item>
+               <item name="wcf.conversation.log.conversation.addParticipants"><![CDATA[Added the following participants: {implode from=$additionalData[participants] item=participant}<a href="{link controller='User' id=$participant[userID] title=$participant[username]}{/link}" class="userLink" data-object-id="{@$participant[userID]}">{$participant[username]}</a>{/implode}.]]></item>
+               <item name="wcf.conversation.log.conversation.removeParticipant"><![CDATA[Removed a participant: <a href="{link controller='User' id=$additionalData[userID] title=$additionalData[username]}{/link}" class="userLink" data-object-id="{@$additionalData[userID]}">{$additionalData[username]}</a>.]]></item>
        </category>
        <category name="wcf.acp.dataImport">
                <item name="wcf.acp.dataImport.data.com.woltlab.wcf.conversation"><![CDATA[Conversations]]></item>

diff --git a/templates/conversation.tpl b/templates/conversation.tpl
index 30951db68d50ec1a2b868667721b060c6d01a6e0..692df775a704a8d3e2dfb060555490ad9eb53410 100644 (file)
--- a/templates/conversation.tpl
+++ b/templates/conversation.tpl
@@ -28,7 +28,7 @@
                                <li>
                                        <span class="icon icon16 fa-user"></span>
                                        {if $conversation->userID}
-                                               <a href="{link controller='User' object=$conversation->getUserProfile()->getDecoratedObject()}{/link}" class="userLink" data-user-id="{@$conversation->userID}">{$conversation->username}</a>
+                                               {user object=$conversation->getUserProfile()}
                                        {else}
                                                {$conversation->username}
                                        {/if}
@@ -68,10 +68,18 @@
                        {foreach from=$participants item=participant}
                                <li class="jsParticipant{if !$participant->userID || $participant->hideConversation == 2 || $participant->leftAt > 0} conversationLeft{/if}">
                                        <div class="box24">
-                                               {if $participant->userID}<a href="{link controller='User' object=$participant}{/link}">{@$participant->getAvatar()->getImageTag(24)}</a>{else}<span>{@$participant->getAvatar()->getImageTag(24)}</span>{/if}
+                                               {if $participant->userID}
+                                                       {user object=$participant type='avatar24'}
+                                               {else}
+                                                       <span>{@$participant->getAvatar()->getImageTag(24)}</span>
+                                               {/if}
                                                <div>
                                                        <p>
-                                                               {if $participant->userID}<a href="{link controller='User' object=$participant}{/link}" class="userLink" data-user-id="{@$participant->userID}">{$participant->username}</a>{else}<span>{$participant->username}</span>{/if}
+                                                               {if $participant->userID}
+                                                                       {user object=$participant}
+                                                               {else}
+                                                                       <span>{$participant->username}</span>
+                                                               {/if}
                                                                {if $participant->isInvisible}<small>({lang}wcf.conversation.invisible{/lang})</small>{/if}
                                                                {if $participant->userID && ($conversation->userID == $__wcf->getUser()->userID) && ($participant->userID != $__wcf->getUser()->userID) && $participant->hideConversation != 2 && $participant->leftAt == 0}
                                                                        <a href="#" class="jsDeleteButton jsTooltip jsOnly" title="{lang}wcf.conversation.participants.removeParticipant{/lang}" data-confirm-message-html="{lang __encode=true}wcf.conversation.participants.removeParticipant.confirmMessage{/lang}" data-object-id="{@$participant->userID}"><span class="icon icon16 fa-times"></span></a>

diff --git a/templates/conversationList.tpl b/templates/conversationList.tpl
index f63aef273a40f65d35645cab2f45053a6cfff0e5..c174e9188b9517af9f35c37ab68c8f159f6551d9 100644 (file)
--- a/templates/conversationList.tpl
+++ b/templates/conversationList.tpl
@@ -215,7 +215,13 @@
                                                        </aside>
                                                        
                                                        <ul class="inlineList dotSeparated small messageGroupInfo">
-                                                               <li class="messageGroupAuthor">{if $conversation->userID}<a href="{link controller='User' object=$conversation->getUserProfile()->getDecoratedObject()}{/link}" class="userLink" data-user-id="{@$conversation->userID}">{$conversation->username}</a>{else}{$conversation->username}{/if}</li>
+                                                               <li class="messageGroupAuthor">
+                                                                       {if $conversation->userID}
+                                                                               {user object=$conversation->getUserProfile()}
+                                                                       {else}
+                                                                               {$conversation->username}
+                                                                       {/if}
+                                                               </li>
                                                                <li class="messageGroupTime">{@$conversation->time|time}</li>
                                                                <li class="messageGroupEditLink jsOnly"><a class="jsConversationInlineEditor">{lang}wcf.global.button.edit{/lang}</a></li>
                                                                {event name='messageGroupInfo'}
@@ -229,7 +235,7 @@
                                                        {if $conversation->getParticipantSummary()|count}
                                                                <small class="conversationParticipantSummary">
                                                                        {assign var='participantSummaryCount' value=$conversation->getParticipantSummary()|count}
-                                                                       {lang}wcf.conversation.participants{/lang}: {implode from=$conversation->getParticipantSummary() item=participant}<a href="{link controller='User' object=$participant}{/link}" class="userLink{if $participant->hideConversation == 2} conversationLeft{/if}" data-user-id="{@$participant->userID}">{$participant->username}</a>{/implode}
+                                                                       {lang}wcf.conversation.participants{/lang}: {implode from=$conversation->getParticipantSummary() item=participant}<a href="{$participant->getLink()}" class="userLink{if $participant->hideConversation == 2} conversationLeft{/if}" data-object-id="{@$participant->userID}">{$participant->username}</a>{/implode}
                                                                        {if $participantSummaryCount < $conversation->participants}{lang}wcf.conversation.participants.other{/lang}{/if}
                                                                </small>
                                                        {/if}
@@ -256,7 +262,7 @@
                                                                        <div>
                                                                                <p>
                                                                                        {if $conversation->lastPosterID}
-                                                                                               <a href="{link controller='User' object=$conversation->getLastPosterProfile()->getDecoratedObject()}{/link}" class="userLink" data-user-id="{@$conversation->getLastPosterProfile()->userID}">{$conversation->lastPoster}</a>
+                                                                                               {user object=$conversation->getLastPosterProfile()}
                                                                                        {else}
                                                                                                {$conversation->lastPoster}
                                                                                        {/if}

diff --git a/templates/conversationListUserPanel.tpl b/templates/conversationListUserPanel.tpl
index 3ca7221c1d87cfbd7fe04f0235ca923675a7e970..6e154facc3eb85556ad3c48d0adfa57d0d7057ca 100644 (file)
--- a/templates/conversationListUserPanel.tpl
+++ b/templates/conversationListUserPanel.tpl
@@ -19,13 +19,21 @@
                                                {if $conversation->userID == $__wcf->user->userID}
                                                        {if $conversation->participants > 1}
                                                                {assign var='participantSummaryCount' value=$conversation->getParticipantSummary()|count}
-                                                               {implode from=$conversation->getParticipantSummary() item=participant}<a href="{link controller='User' object=$participant}{/link}" class="userLink{if $participant->hideConversation == 2} conversationLeft{/if}" data-user-id="{@$participant->userID}">{$participant->username}</a>{/implode}
+                                                               {implode from=$conversation->getParticipantSummary() item=participant}<a href="{$participant->getLink()}" class="userLink{if $participant->hideConversation == 2} conversationLeft{/if}" data-object-id="{@$participant->userID}">{$participant->username}</a>{/implode}
                                                                {if $participantSummaryCount < $conversation->participants}{lang}wcf.conversation.participants.other{/lang}{/if}
                                                        {else}
-                                                               {if $conversation->getOtherParticipantProfile()->userID}<a href="{link controller='User' id=$conversation->getOtherParticipantProfile()->userID title=$conversation->getOtherParticipantProfile()->username}{/link}" class="userLink" data-user-id="{@$conversation->getOtherParticipantProfile()->userID}">{$conversation->getOtherParticipantProfile()->username}</a>{else}{$conversation->getOtherParticipantProfile()->username}{/if}
+                                                               {if $conversation->getOtherParticipantProfile()->userID}
+                                                                       {user object=$conversation->getOtherParticipantProfile()}
+                                                               {else}
+                                                                       {$conversation->getOtherParticipantProfile()->username}
+                                                               {/if}
                                                        {/if}
                                                {else}
-                                                       {if $conversation->userID}<a href="{link controller='User' id=$conversation->userID title=$conversation->username}{/link}" class="userLink" data-user-id="{@$conversation->userID}">{$conversation->username}</a>{else}{$conversation->username}{/if}
+                                                       {if $conversation->userID}
+                                                               {user object=$conversation->getUserProfile()}
+                                                       {else}
+                                                               {$conversation->username}
+                                                       {/if}
                                                {/if}
                                        </span>
                                        

diff --git a/templates/conversationMessageListLog.tpl b/templates/conversationMessageListLog.tpl
index 3574d4cedc7e3f06cb250fd1dbff3a4eee50a56a..80d066b1ec3439a2325193f474101bd96bb054d0 100644 (file)
--- a/templates/conversationMessageListLog.tpl
+++ b/templates/conversationMessageListLog.tpl
@@ -6,11 +6,11 @@
                                <div class="messageContent">
                                        <div class="messageHeader">
                                                <div class="box32 messageHeaderWrapper">
-                                                       <a href="{link controller='User' object=$modificationLogEntry->getUserProfile()}{/link}" aria-hidden="true">{@$modificationLogEntry->getUserProfile()->getAvatar()->getImageTag(32)}</a>
+                                                       {user object=$modificationLogEntry->getUserProfile() type='avatar32' ariaHidden='true'}
                                                        
                                                        <div class="messageHeaderBox">
                                                                <h2 class="messageTitle">
-                                                                       <a href="{link controller='User' object=$modificationLogEntry->getUserProfile()}{/link}" class="userLink username" data-user-id="{@$modificationLogEntry->userID}">{$modificationLogEntry->username}</a>
+                                                                       {user object=$modificationLogEntry->getUserProfile() class='username'}
                                                                        <small class="separatorLeft">{@$modificationLogEntry->time|time}</small>
                                                                </h2>
                                                                <div>{@$modificationLogEntry}</div>

diff --git a/templates/conversationMessagePreview.tpl b/templates/conversationMessagePreview.tpl
index e159aea59288691a97c97f00b204245f45d280c5..2a86033a7e2fa83e31a81bad85fc766a8b3315bf 100644 (file)
--- a/templates/conversationMessagePreview.tpl
+++ b/templates/conversationMessagePreview.tpl
@@ -1,11 +1,11 @@
 <div class="box48">
        {if $message->getUserProfile()->getAvatar()}
-               <a href="{link controller='User' object=$message->getUserProfile()->getDecoratedObject()}{/link}" aria-hidden="true">{@$message->getUserProfile()->getAvatar()->getImageTag(48)}</a>
+               {user object=$message->getUserProfile() type='avatar48' ariaHidden='true'}
        {/if}
-
+       
        <div>
                <div class="containerHeadline">
-                       <h3><a href="{link controller='User' object=$message->getUserProfile()->getDecoratedObject()}{/link}">{$message->username}</a> <small class="separatorLeft">{@$message->time|time}</small></h3>
+                       <h3>{user object=$message->getUserProfile()} <small class="separatorLeft">{@$message->time|time}</small></h3>
                </div>
                
                <div>{@$message->getExcerpt()}</div>

diff --git a/templates/moderationConversationMessage.tpl b/templates/moderationConversationMessage.tpl
index ca88a212a0a2d596df63fffe0a019baae4053120..faec6f14b08b61ab3eaed53840bf94146af1e5a2 100644 (file)
--- a/templates/moderationConversationMessage.tpl
+++ b/templates/moderationConversationMessage.tpl
@@ -3,7 +3,7 @@
                <header class="messageHeader">
                        <div class="box32 messageHeaderWrapper">
                                {if $message->userID}
-                                       <a href="{link controller='User' object=$message->getUserProfile()->getDecoratedObject()}{/link}" aria-hidden="true">{@$message->getUserProfile()->getAvatar()->getImageTag(32)}</a>
+                                       {user object=$message->getUserProfile() type='avatar32' ariaHidden='true'}
                                {else}
                                        <span>{@$message->getUserProfile()->getAvatar()->getImageTag(32)}</span>
                                {/if}
@@ -12,7 +12,13 @@
                                        <h2 class="messageTitle">{if $message->getConversation()->canRead()}<a href="{@$message->getLink()}">{$message->getTitle()}</a>{else}{$message->getTitle()}{/if}</h2>
                                        
                                        <ul class="messageHeaderMetaData">
-                                               <li>{if $message->userID}<a href="{link controller='User' object=$message->getUserProfile()->getDecoratedObject()}{/link}" class="username">{$message->getUsername()}</a>{else}<span class="username">{$message->getUsername()}</span>{/if}</li>
+                                               <li>
+                                                       {if $message->userID}
+                                                               {user object=$message->getUserProfile() class='username'}
+                                                       {else}
+                                                               <span class="username">{$message->getUsername()}</span>
+                                                       {/if}
+                                               </li>
                                                <li><span class="messagePublicationTime">{@$message->getTime()|time}</span></li>
                                                
                                                {event name='messageHeaderMetaData'}