From dca1f95b844a218f878fae7fc09d6bf0adac9b44 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 10 Jul 2014 16:35:05 +0200
Subject: [PATCH] Improved visuals and message tab menu behavior

---
 .../templates/messageFormSettingsInline.tpl   |  4 ++++
 com.woltlab.wcf/templates/messageFormTabs.tpl |  2 +-
 .../templates/messageFormTabsInline.tpl       |  2 +-
 wcfsetup/install/files/style/redactor.less    | 19 ++++++++++++++++++-
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/com.woltlab.wcf/templates/messageFormSettingsInline.tpl b/com.woltlab.wcf/templates/messageFormSettingsInline.tpl
index 64e7219cec..8cb52cda61 100644
--- 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 0adf6d72c9..55c915680d 100644
--- 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 db551aee5d..b426f8e971 100644
--- 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 55113c0fe4..d9e5a607ba 100644
--- 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;
-- 
2.20.1