From 7009ba1de007fd29f1712966cd830be7111f247a Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 7 Jan 2015 17:08:21 +0000
Subject: [PATCH] Fix mail compose issues: -Set default toolbar actions -Set
 toolbar actions view range to 6 -Fix compose window not being resized
 correctly in FF -Fix displaying toolbar's selectbox -Fix styling of toggle
 button

---
 etemplate/js/et2_widget_toolbar.js         | 10 ++++++++++
 etemplate/templates/default/etemplate2.css |  2 +-
 mail/inc/class.mail_compose.inc.php        |  9 ++++++---
 mail/templates/default/compose.xet         |  2 +-
 mail/templates/pixelegg/app.css            |  7 ++++++-
 mail/templates/pixelegg/app.less           |  5 ++++-
 6 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/etemplate/js/et2_widget_toolbar.js b/etemplate/js/et2_widget_toolbar.js
index 6a19a0207a..aeb6e1cd63 100644
--- a/etemplate/js/et2_widget_toolbar.js
+++ b/etemplate/js/et2_widget_toolbar.js
@@ -485,6 +485,16 @@ var et2_toolbar = et2_DOMWidget.extend([et2_IInput],
 	isValid: function(messages)
 	{
 		return true;
+	},
+	
+	/**
+	 * Attach the container node of the widget to DOM-Tree
+	 * @returns {Boolean}
+	 */
+	doLoadingFinished: function ()
+	{
+		this._super.apply(this, arguments);
+		return false;
 	}
 });
 et2_register_widget(et2_toolbar, ["toolbar"]);
diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css
index 8a29c59f93..9baa9bfb7a 100644
--- a/etemplate/templates/default/etemplate2.css
+++ b/etemplate/templates/default/etemplate2.css
@@ -1415,7 +1415,7 @@ div.ms-sel-ctn {
 }
 .et2_toolbar button.toolbar_toggled {
 	background-color: white;
-	box-shadow: inset 1px 1px 1px 1px gray;
+	box-shadow: inset 1px 1px 1px 1px gray !important;
 }
 .et2_toolbar-dropdown{
 	margin: 1px;
diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index 1ccb72e78a..08960714ee 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -115,7 +115,8 @@ class mail_compose
 				'icon'	=> 'mail_send',
 				'group' => ++$group,
 				'onExecute' => 'javaScript:app.mail.compose_submitAction',
-				'hint' => 'Send'
+				'hint' => 'Send',
+				'toolbarDefault' => true
 			),
 			'button[saveAsDraft]' => array(
 				'caption' => 'Save',
@@ -136,14 +137,16 @@ class mail_compose
 				'icon' => 'filemanager',
 				'group' => ++$group,
 				'onExecute' => 'javaScript:app.mail.compose_triggerWidget',
-				'hint' => 'Select file(s) from VFS'
+				'hint' => 'Select file(s) from VFS',
+				'toolbarDefault' => true
 			),
 			'uploadForCompose' => array(
 				'caption' => 'Upload files...',
 				'icon' => 'attach',
 				'group' => ++$group,
 				'onExecute' => 'javaScript:app.mail.compose_triggerWidget',
-				'hint' => 'Select files to upload'
+				'hint' => 'Select files to upload',
+				'toolbarDefault' => true
 			),
 			'to_infolog' => array(
 				'caption' => 'Infolog',
diff --git a/mail/templates/default/compose.xet b/mail/templates/default/compose.xet
index 7f453932b4..ae2153f749 100644
--- a/mail/templates/default/compose.xet
+++ b/mail/templates/default/compose.xet
@@ -3,7 +3,7 @@
 <overlay>
 	<template id="mail.compose" template="" lang="" group="0" version="1.9.001">
 		<vbox class="mailCompose mailComposeHeaderSection" width="100%">
-			<toolbar id="toolbar" width="et2_fullWidth" view_range="8" flat_list="false"/>
+			<toolbar id="toolbar" width="et2_fullWidth" view_range="6" flat_list="false"/>
 			<hbox class="mail-compose_toolbar_assist" width="100%">
 				<vfs-select class="$cont[vfsNotAvailable] compose_egw_icons" id="selectFromVFSForCompose" onchange="app.mail.vfsUploadForCompose" button_caption=""/>
 				<file class="mail-compose_fileselector" statustext="Select file to attach to message" multiple='true' progress='attachments' onFinish="app.mail.uploadForCompose" onStart="app.mail.composeUploadStart" id="uploadForCompose" drop_target ="mail-compose"/>
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index b279d3020b..89c755496b 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -1078,7 +1078,7 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
 #mail-compose {
   width: 870px;
   padding: 5px;
-  max-height: 700px;
+  max-height: 99%;
   /*// ###############################################################################*/
   /*// Mail Header*/
 }
@@ -1112,6 +1112,11 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
 #mail-compose #mail-compose_toolbar button#toolbar-send:disabled {
   background-color: rgba(12, 93, 165, 0.2) !important;
 }
+#mail-compose #mail-compose_toolbar button#toolbar-to_infolog:hover,
+#mail-compose #mail-compose_toolbar button#toolbar-to_tracker:hover,
+#mail-compose #mail-compose_toolbar button#toolbar-disposition:hover {
+  background: none;
+}
 #mail-compose table.et2_grid {
   display: inline-block;
 }
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index 4864b1958f..a0db36f503 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -333,7 +333,7 @@ div#mail-index{
     //	gesamtbreite
     width: 870px;
     padding: 5px;
-	max-height: 700px;
+	max-height: 99%;
 
 
 
@@ -373,6 +373,9 @@ div#mail-index{
             &:disabled {background-color: @color_disabled !important;}
 
         }
+		button#toolbar-to_infolog:hover, button#toolbar-to_tracker:hover, button#toolbar-disposition:hover {
+			background: none;
+		}
     } // Toolbar Ende
 
 	table.et2_grid  {display: inline-block;}