Merge branch '5.4'

diff --cc com.woltlab.wcf/templates/article.tpl
Simple merge

diff --cc com.woltlab.wcf/templates/cms.tpl
index f74d49af45fea99be6487057d89da3fcc5a145a1,cd6934864a6c6eb8c24493537c1a333eaf621dd6..50b83cbcee330bc0373d9dfc1bf77cc7c9d766e3
--- 1/com.woltlab.wcf/templates/cms.tpl
--- 2/com.woltlab.wcf/templates/cms.tpl
+++ b/com.woltlab.wcf/templates/cms.tpl
@@@ -12,17 -12,17 +12,17 @@@
  {/capture}
  
  {capture assign='contentHeaderNavigation'}
 +      {if $__wcf->getSession()->getPermission('admin.content.cms.canManagePage')}<li><a href="{link controller='PageEdit' id=$page->pageID isACP=true}{/link}" class="button buttonPrimary"><span class="icon icon16 fa-pencil"></span> <span>{lang}wcf.acp.page.edit{/lang}</span></a></li>{/if}
 +{/capture}
 +
 +{capture assign='contentInteractionButtons'}
        {if $page->showShareButtons()}
-               <a href="{$content->getLink()}" class="contentInteractionButton button small shareButton jsOnly" data-link-title="{$content->getTitle()}">{lang}wcf.message.share{/lang}</a>
 -              <li>
 -                      <a href="{$content->getLink()}" class="button wsShareButton jsOnly" data-link-title="{$content->getTitle()}">
 -                              <span class="icon icon16 fa-share-alt"></span> <span>{lang}wcf.message.share{/lang}</span>
 -                      </a>
 -              </li>
++              <a href="{$content->getLink()}" class="contentInteractionButton button small wsShareButton jsOnly" data-link-title="{$content->getTitle()}">{lang}wcf.message.share{/lang}</a>
        {/if}
 -      
 +
        {if $page->isMultilingual && $__wcf->user->userID && $page->getPageLanguages()|count > 1}
 -              <li class="dropdown">
 -                      <a class="dropdownToggle boxFlag box24 button">
 +              <div class="contentInteractionButton dropdown jsOnly">
 +                      <a class="button small  dropdownToggle boxFlag box24">
                                <span><img src="{$activePageLanguage->getIconPath()}" alt="" class="iconFlag"></span>
                                <span>{$activePageLanguage->languageName}</span>
                        </a>

diff --cc ts/WoltLabSuite/Core/Ui/Message/Share/Dialog.ts
Simple merge

diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Message/Share/Dialog.js
Simple merge

diff --cc wcfsetup/install/files/lib/system/form/builder/field/label/LabelFormField.class.php
Simple merge