From: Marcel Werk Date: Wed, 19 Apr 2023 14:43:37 +0000 (+0200) Subject: Add generic position for share button in the content interaction section X-Git-Tag: 6.0.0_Alpha_1~232^2~1 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2e451c2a860ca8a859975ace3cc95df8c1cbedc1;p=GitHub%2FWoltLab%2FWCF.git Add generic position for share button in the content interaction section --- diff --git a/com.woltlab.wcf/templates/contentInteraction.tpl b/com.woltlab.wcf/templates/contentInteraction.tpl index 851a2ff127..c851535757 100644 --- a/com.woltlab.wcf/templates/contentInteraction.tpl +++ b/com.woltlab.wcf/templates/contentInteraction.tpl @@ -1,52 +1,63 @@ {if !$beforeContentInteraction|empty} - {@$beforeContentInteraction} + {@$beforeContentInteraction} {/if} {capture assign='__contentInteractionPagination'} - {if $contentInteractionPagination|isset}{@$contentInteractionPagination}{/if} + {if $contentInteractionPagination|isset}{@$contentInteractionPagination}{/if} {/capture} {assign var='__contentInteractionPagination' value=$__contentInteractionPagination|trim} {capture assign='__contentInteractionButtons'} - {event name='beforeButtons'} - {if $contentInteractionButtons|isset}{@$contentInteractionButtons}{/if} - {event name='afterButtons'} + {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'} + {event name='beforeDropdownItems'} + {if $contentInteractionDropdownItems|isset}{@$contentInteractionDropdownItems}{/if} + {event name='afterDropdownItems'} {/capture} {assign var='__contentInteractionDropdownItems' value=$__contentInteractionDropdownItems|trim} -{if $__contentInteractionPagination || $__contentInteractionButtons || $__contentInteractionDropdownItems} -
- {if $__contentInteractionPagination} -
- {@$__contentInteractionPagination} -
- {/if} - - {if $__contentInteractionButtons || $__contentInteractionDropdownItems} -
- {if $__contentInteractionButtons} -
- {@$__contentInteractionButtons} -
- {/if} - - {if $__contentInteractionDropdownItems} - - {/if} -
- {/if} -
+{capture assign='__contentInteractionShareButton'} + {if $contentInteractionShareButton|isset}{@$contentInteractionShareButton}{/if} +{/capture} +{assign var='__contentInteractionShareButton' value=$__contentInteractionShareButton|trim} + +{if $__contentInteractionPagination || $__contentInteractionButtons || $__contentInteractionDropdownItems || $__contentInteractionShareButton} +
+ {if $__contentInteractionPagination} +
+ {@$__contentInteractionPagination} +
+ {/if} + + {if $__contentInteractionButtons || $__contentInteractionDropdownItems || $__contentInteractionShareButton} +
+ {if $__contentInteractionButtons} +
+ {@$__contentInteractionButtons} +
+ {/if} + + {if $__contentInteractionShareButton} +
+ {@$__contentInteractionShareButton} +
+ {/if} + + {if $__contentInteractionDropdownItems} + + {/if} +
+ {/if} +
{/if} diff --git a/wcfsetup/install/files/style/layout/content.scss b/wcfsetup/install/files/style/layout/content.scss index f7abca6864..46a57abfaf 100644 --- a/wcfsetup/install/files/style/layout/content.scss +++ b/wcfsetup/install/files/style/layout/content.scss @@ -486,6 +486,12 @@ fieldset { margin-left: 1px; } +.contentInteractionShareButton { + display: flex; + flex: 1 auto; + margin-left: 5px; +} + .contentInteractionDropdown { display: flex; flex: 1 auto;