Make reputation in the message sidebar fit the style

See #2508

diff --git a/com.woltlab.wcf/templates/messageSidebar.tpl b/com.woltlab.wcf/templates/messageSidebar.tpl
index 8fca5c5b3e89982ff590ede01abd9f367ddd9f50..c1034d8a1bb9c18a392b9ae2c72808ff3f75b8bf 100644 (file)
--- a/com.woltlab.wcf/templates/messageSidebar.tpl
+++ b/com.woltlab.wcf/templates/messageSidebar.tpl
@@ -44,22 +44,6 @@
                                        <div class="userRank">{@$userProfile->getRank()->getImage()}</div>
                                {/if}
                        {/if}
-                       
-                       {if MODULE_LIKE && MESSAGE_SIDEBAR_ENABLE_LIKES_RECEIVED && !$isReply}
-                               <div class="reactionStatusContainer">
-                                       {assign var=overallReactionCount value=$userProfile->positiveReactionsReceived - $userProfile->negativeReactionsReceived}
-                                       <a href="{link controller='User' object=$userProfile}{/link}#likes" class="jsTooltip" title="{lang user=$userProfile}wcf.like.showLikesReceived{/lang}">
-                                               {if $overallReactionCount > 0}
-                                                       <span class="positiveReactionCount"><span class="fa fa-plus-circle icon16"></span> {$overallReactionCount|shortUnit}</span>
-                                               {elseif $overallReactionCount < 0}
-                                                       {assign var=overallReactionCount value=$overallReactionCount*-1}
-                                                       <span class="negativeReactionCount"><span class="fa fa-minus-circle icon16"></span> {$overallReactionCount|shortUnit}</span>
-                                               {else}
-                                                       <span class="neutralReactionCount"><span class="fa fa-plus-circle icon16"></span> {$overallReactionCount|shortUnit}</span>
-                                               {/if}
-                                       </a>
-                               </div>
-                       {/if}
 
                        {if !$isReply && MODULE_TROPHY && $__wcf->session->getPermission('user.profile.trophy.canSeeTrophies') && ($userProfile->isAccessible('canViewTrophies') || $userProfile->userID == $__wcf->session->userID) && $userProfile->getSpecialTrophies()|count}
                                <div class="specialTrophyContainer">
@@ -97,6 +81,12 @@
                                <div class="userCredits">
                                        <dl class="plain dataList">
                                                {content}
+                                                       {if MODULE_LIKE && MESSAGE_SIDEBAR_ENABLE_LIKES_RECEIVED && !$isReply}
+                                                               {assign var=overallReactionCount value=$userProfile->positiveReactionsReceived - $userProfile->negativeReactionsReceived}
+                                                               <dt><a href="{link controller='User' object=$userProfile}{/link}#likes" class="jsTooltip" title="{lang user=$userProfile}wcf.like.showLikesReceived{/lang}">{lang}wcf.like.likesReceived{/lang}</a></dt>
+                                                               <dd>{#$overallReactionCount}</dd>
+                                                       {/if}
+                                                       
                                                        {if MESSAGE_SIDEBAR_ENABLE_ACTIVITY_POINTS && $userProfile->activityPoints}
                                                                <dt><a href="#" class="activityPointsDisplay jsTooltip" title="{lang user=$userProfile}wcf.user.activityPoint.showActivityPoints{/lang}" data-user-id="{@$userProfile->userID}">{lang}wcf.user.activityPoint{/lang}</a></dt>
                                                                <dd>{#$userProfile->activityPoints}</dd>

diff --git a/wcfsetup/install/files/style/ui/reactions.scss b/wcfsetup/install/files/style/ui/reactions.scss
index 27a74dcc7a75de52a9dbaf9aa301841710aab256..f56b5ec8a815b8b67bfece5d222c83a34f37c0fc 100644 (file)
--- a/wcfsetup/install/files/style/ui/reactions.scss
+++ b/wcfsetup/install/files/style/ui/reactions.scss
@@ -140,34 +140,6 @@ li.reactCountButton:hover {
        }
 }
 
-.reactionStatusContainer {
-       margin-top: 10px;
-       
-       .positiveReactionCount {
-               color: $wcfStatusSuccessText;
-               
-               .fa {
-                       color: $wcfStatusSuccessText;
-               }
-       }
-       
-       .negativeReactionCount {
-               color: $wcfStatusErrorText;
-               
-               .fa {
-                       color: $wcfStatusErrorText;
-               }
-       }
-       
-       .neutralReactionCount {
-               color: $wcfStatusSuccessText;
-               
-               .fa {
-                       color: $wcfStatusSuccessText;
-               }
-       }
-}
-
 .box.reactionReputationBox {
        &.positiveReactionReputationBox {
                background-color: $wcfStatusSuccessBackground;

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 864924ea3db095ac2de3de1d821d99c77e8e0333..069d7c683307bc0ccc2b75ce098f5ca1d6ca5710 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -3135,7 +3135,7 @@ E-Mail-Adresse: {@$emailAddress} {* this line ends with a space *}
                <item name="wcf.like.jsTooltip"><![CDATA[{literal}{if $likes}{#$likes} Like{if $likes != 1}s{/if}{if $dislikes}, {/if}{/if}{if $dislikes}{#$dislikes} Dislike{if $dislikes != 1}s{/if}{/if}{/literal}]]></item>
                <item name="wcf.like.button.like"><![CDATA[Gefällt mir]]></item>
                <item name="wcf.like.button.dislike"><![CDATA[Gefällt mir nicht]]></item>
-               <item name="wcf.like.likesReceived"><![CDATA[Erhaltene Reaktionen]]></item>
+               <item name="wcf.like.likesReceived"><![CDATA[Reputation]]></item>
                <item name="wcf.like.showLikesReceived"><![CDATA[Erhaltene Reaktionen von {$user->username}]]></item>
                <item name="wcf.like.likesGiven"><![CDATA[Vergebene Likes]]></item>
                <item name="wcf.like.dislikesReceived"><![CDATA[Erhaltene Dislikes]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 8c2d28da68dceef786280515b23ee8483c1d0837..04f2c51c7633cdfef3d27e83ff44a5e8e038abb4 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -3082,7 +3082,7 @@ Email: {@$emailAddress} {* this line ends with a space *}
                <item name="wcf.like.jsTooltip"><![CDATA[{literal}{if $likes}{#$likes} Like{if $likes != 1}s{/if}{if $dislikes}, {/if}{/if}{if $dislikes}{#$dislikes} Dislike{if $dislikes != 1}s{/if}{/if}{/literal}]]></item>
                <item name="wcf.like.button.like"><![CDATA[Like]]></item>
                <item name="wcf.like.button.dislike"><![CDATA[Dislike]]></item>
-               <item name="wcf.like.likesReceived"><![CDATA[Likes Received]]></item>
+               <item name="wcf.like.likesReceived"><![CDATA[Reputation]]></item>
                <item name="wcf.like.showLikesReceived"><![CDATA[Reactions Received by {$user->username}]]></item>
                <item name="wcf.like.likesGiven"><![CDATA[Likes Given]]></item>
                <item name="wcf.like.dislikesReceived"><![CDATA[Dislikes Received]]></item>