Improved visuals and message tab menu behavior

diff --git a/com.woltlab.wcf/templates/messageFormSettingsInline.tpl b/com.woltlab.wcf/templates/messageFormSettingsInline.tpl
index 64e7219cec58e892163ec67f3f86eb29d7d660ed..8cb52cda61a5247998b54bef1907c6458fb15d44 100644 (file)
--- a/com.woltlab.wcf/templates/messageFormSettingsInline.tpl
+++ b/com.woltlab.wcf/templates/messageFormSettingsInline.tpl
@@ -1,4 +1,6 @@
 <fieldset id="settings_{if $wysiwygSelector|isset}{$wysiwygSelector}{else}text{/if}" class="container containerPadding">
+       {event name='beforeSettings'}
+       
        <dl class="wide">
                {if $__wcf->getSession()->getPermission('user.message.canUseBBCodes')}
                        <dt></dt>
@@ -24,6 +26,8 @@
                
                {event name='settings'}
        </dl>
+       
+       {event name='afterSettings'}
 </fieldset>
 <script data-relocate="true">
        $(function() {

diff --git a/com.woltlab.wcf/templates/messageFormTabs.tpl b/com.woltlab.wcf/templates/messageFormTabs.tpl
index 0adf6d72c954bb9d66f9398f716e3b5156899b6b..55c915680d17309fa984c819a094b6edc8e7064d 100644 (file)
--- a/com.woltlab.wcf/templates/messageFormTabs.tpl
+++ b/com.woltlab.wcf/templates/messageFormTabs.tpl
@@ -1,4 +1,4 @@
-<div class="messageTabMenu">
+<div class="messageTabMenu" data-preselect="{if $preselectTabMenu|isset}{$preselectTabMenu}{else}true{/if}">
        <nav class="messageTabMenuNavigation jsOnly">
                <ul>
                        {if MODULE_SMILEY && $__wcf->getSession()->getPermission($permissionCanUseSmilies) && $smileyCategories|count}<li data-name="smilies"><a>{lang}wcf.message.smilies{/lang}</a></li>{/if}

diff --git a/com.woltlab.wcf/templates/messageFormTabsInline.tpl b/com.woltlab.wcf/templates/messageFormTabsInline.tpl
index db551aee5dbd6325688d35126ddc17b271342488..b426f8e971c8b34a63eb47759b5b573a766f0ed0 100644 (file)
--- a/com.woltlab.wcf/templates/messageFormTabsInline.tpl
+++ b/com.woltlab.wcf/templates/messageFormTabsInline.tpl
@@ -1,7 +1,7 @@
 {assign var=smileyCategories value=$__wcf->getSmileyCache()->getCategories()}
 {if !$permissionCanUseSmilies|isset}{assign var=permissionCanUseSmilies value='user.message.canUseSmilies'}{/if}
 {if !$wysiwygContainerID|isset}{assign var=wysiwygContainerID value='text'}{/if}
-<div class="messageTabMenu">
+<div class="messageTabMenu"{if $preselectTabMenu|isset} data-preselect="{$preselectTabMenu}"{/if}>
        <nav class="messageTabMenuNavigation jsOnly">
                <ul>
                        {if MODULE_SMILEY && $__wcf->getSession()->getPermission($permissionCanUseSmilies) && $smileyCategories|count}<li data-name="smilies"><a>{lang}wcf.message.smilies{/lang}</a></li>{/if}

diff --git a/wcfsetup/install/files/style/redactor.less b/wcfsetup/install/files/style/redactor.less
index 55113c0fe479cd70e273beb8ef33d428e81c1ebb..d9e5a607bac2dfd6841ed7718b4598bb44f3fb49 100644 (file)
--- a/wcfsetup/install/files/style/redactor.less
+++ b/wcfsetup/install/files/style/redactor.less
@@ -220,7 +220,7 @@
                border-radius: 0;
                border-top: 1px solid @wcfContainerBorderColor;
                display: none;
-               padding: 14px 7px;
+               //padding: 14px 7px;
                position: static;
                
                &.active {
@@ -228,6 +228,23 @@
                }
        }
        
+       dl.condensed {
+               > dt {
+                       float: none;
+                       margin-bottom: 4px;
+                       text-align: left;
+                       width: auto !important;
+                       
+                       &:empty {
+                               margin-bottom: 0;
+                       }
+               }
+               
+               > dd {
+                       margin-left: 0 !important;
+               }
+       }
+       
        > div {
                > nav {
                        background-color: @wcfContainerBackgroundColor;