From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 27 Apr 2022 13:19:06 +0000 (+0200)
Subject: Avoid empty content interaction elements to avoid obsolete margin
X-Git-Tag: 5.5.0_Alpha_5~13^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fe750dce63749f1653595e82d32b45291d04b9a8;p=GitHub%2FWoltLab%2FWCF.git

Avoid empty content interaction elements to avoid obsolete margin
---

diff --git a/com.woltlab.wcf/templates/contentInteraction.tpl b/com.woltlab.wcf/templates/contentInteraction.tpl
index 0777c18cae..17070b97e5 100644
--- a/com.woltlab.wcf/templates/contentInteraction.tpl
+++ b/com.woltlab.wcf/templates/contentInteraction.tpl
@@ -2,36 +2,51 @@
     {@$beforeContentInteraction}
 {/if}
 
-<div class="contentInteraction">
-    {hascontent}
-		<div class="contentInteractionPagination paginationTop">
-			{content}{if $contentInteractionPagination|isset}{@$contentInteractionPagination}{/if}{/content}
-		</div>
-	{/hascontent}
+{capture assign='__contentInteractionPagination'}
+    {if $contentInteractionPagination|isset}{@$contentInteractionPagination}{/if}
+{/capture}
+{assign var='__contentInteractionPagination' value=$__contentInteractionPagination|trim}
 
-    <div class="contentInteractionButtonContainer">
-        {hascontent}
-            <div class="contentInteractionButtons">
-                {content}
-                    {event name='beforeButtons'}
-                    {if $contentInteractionButtons|isset}{@$contentInteractionButtons}{/if}
-                    {event name='afterButtons'}
-                {/content}
-            </div>
-        {/hascontent}
+{capture assign='__contentInteractionButtons'}
+    {event name='beforeButtons'}
+    {if $contentInteractionButtons|isset}{@$contentInteractionButtons}{/if}
+    {event name='afterButtons'}
+{/capture}
+{assign var='__contentInteractionButtons' value=$__contentInteractionButtons|trim}
+
+{capture assign='__contentInteractionDropdownItems'}
+    {event name='beforeDropdownItems'}
+    {if $contentInteractionDropdownItems|isset}{@$contentInteractionDropdownItems}{/if}
+    {event name='afterDropdownItems'}
+{/capture}
+{assign var='__contentInteractionDropdownItems' value=$__contentInteractionDropdownItems|trim}
+
+{if $__contentInteractionPagination || $__contentInteractionButtons || $__contentInteractionDropdownItems}
+    <div class="contentInteraction">
+        {if $__contentInteractionPagination}
+    		<div class="contentInteractionPagination paginationTop">
+    			{@$__contentInteractionPagination}
+    		</div>
+    	{/if}
 
-        {hascontent}
-            <div class="contentInteractionDropdown dropdown jsOnly">
-                <a href="#" class="button small dropdownToggle" aria-label="{lang}wcf.global.button.more{/lang}"><span class="icon icon16 fa-ellipsis-v"></span></a>
+        {if $__contentInteractionButtons || $__contentInteractionDropdownItems}
+            <div class="contentInteractionButtonContainer">
+                {if $__contentInteractionButtons}
+                    <div class="contentInteractionButtons">
+                        {@$__contentInteractionButtons}
+                    </div>
+                {/if}
 
-                <ul class="contentInteractionDropdownItems dropdownMenu">
-                    {content}
-                        {event name='beforeDropdownItems'}
-                        {if $contentInteractionDropdownItems|isset}{@$contentInteractionDropdownItems}{/if}
-                        {event name='afterDropdownItems'}
-                    {/content}
-                </ul>
+                {if $__contentInteractionDropdownItems}
+                    <div class="contentInteractionDropdown dropdown jsOnly">
+                        <a href="#" class="button small dropdownToggle" aria-label="{lang}wcf.global.button.more{/lang}"><span class="icon icon16 fa-ellipsis-v"></span></a>
+
+                        <ul class="contentInteractionDropdownItems dropdownMenu">
+                            {@$__contentInteractionDropdownItems}
+                        </ul>
+                    </div>
+                {/if}
             </div>
-        {/hascontent}
+        {/if}
     </div>
-</div>
+{/if}