From d8c3f673f6ee73d9801bc796d262cfec5a540c93 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 4 Sep 2014 15:03:31 +0000
Subject: [PATCH] * Mail: Improvement of attachment area UI in compose,display
 and preview dialogs

---
 mail/templates/default/app.css     |  1 +
 mail/templates/default/display.xet |  2 +-
 mail/templates/default/index.xet   |  6 +++---
 mail/templates/pixelegg/app.css    |  6 +++++-
 mail/templates/pixelegg/app.less   | 15 +++++++++------
 5 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index 5932d9a6ab..43f1605f8d 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -288,6 +288,7 @@ pre {
 	white-space: nowrap;
 	overflow: hidden;
 	word-wrap: break-word;
+	max-width: 0px;
 }
 #mail-index {
 	position: relative
diff --git a/mail/templates/default/display.xet b/mail/templates/default/display.xet
index 267733f256..41ba9001f3 100644
--- a/mail/templates/default/display.xet
+++ b/mail/templates/default/display.xet
@@ -80,7 +80,7 @@
 							</row>
 						</rows>
 					</grid>
-			</groupbox>
+			</box>
 		</vbox>
 	</template>
 </overlay>
diff --git a/mail/templates/default/index.xet b/mail/templates/default/index.xet
index 8a336d1e6b..fa38fb9e4f 100644
--- a/mail/templates/default/index.xet
+++ b/mail/templates/default/index.xet
@@ -78,7 +78,7 @@
 				</hbox>
 				<hbox id="mailPreviewHeadersAttachments" class="mailPreviewHeaders">
 					<description value="Attachments"/>
-					<grid disabled="@no_griddata" id="previewAttachmentArea" class="previewAttachmentArea">
+					<grid disabled="@no_griddata" id="previewAttachmentArea" class="previewAttachmentArea egwGridView_grid">
 						<columns>
 							<column disabled="!@showtempname"/>
 							<column disabled="!@showtempname"/>
@@ -92,12 +92,12 @@
 							<column />
 						</columns>
 						<rows>
-							<row >
+							<row class="row attachmentRow">
 								<description id="${row}[attachment_number]" />
 								<description id="${row}[partID]" />
 								<description id="${row}[type]" />
 								<description id="${row}[winmailFlag]" />
-								<description class="et2_link" id="${row}[filename]" no_lang="1" onclick="app.mail.displayAttachment"/>
+								<description class="et2_link useEllipsis" id="${row}[filename]" no_lang="1" onclick="app.mail.displayAttachment"/>
 								<description align="right" id="${row}[size]" />
 								<buttononly id="${row}[save]" image="fileexport" onclick="app.mail.saveAttachment"/>
 								<buttononly id="${row}[saveAsVFS]" image="filemanager/navbar" onclick="app.mail.saveAttachmentToVFS"/>
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index b7dcb50b0a..1e4ec00531 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -284,6 +284,7 @@ pre {
   white-space: nowrap;
   overflow: hidden;
   word-wrap: break-word;
+  max-width: 0px;
 }
 #mail-index {
   position: relative;
@@ -1082,7 +1083,7 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
   padding-left: 20px;
   width: 71px;
   float: left;
-  background-image: url(images/mail_send.png) !important;
+  background-image: url(images/mail_send.png);
   background-position: left;
   background-repeat: no-repeat;
   background-size: 16px 16px;
@@ -1095,6 +1096,9 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
   box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
   background-color: #189800;
 }
+#mail-compose .mail-compose_toolbar .mail-compose_button:disabled {
+  background-color: rgba(12, 93, 165, 0.2) !important;
+}
 #mail-compose .mail-compose_toolbar img[id="mail-compose_button[saveAsDraftAndPrint]"],
 #mail-compose .mail-compose_toolbar img[id="mail-compose_button[saveAsDraft]"] {
   vertical-align: middle;
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index 755816d4ca..84b0ecb571 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -362,13 +362,14 @@ div#mail-index{
         background: transparent;
 
 
+        // Senden Button
         button[id="mail-compose_button[sent]"],
         button.et2_button{
-/*            background-color: @gray_30;*/
+                /*            background-color: @gray_30;*/
 
-            /*height: 33px;*/
-            /*margin: 0px 3px 0 !important;*/
-        }
+                            /*height: 33px;*/
+                            /*margin: 0px 3px 0 !important;*/
+                        }
 
 
         span.email-button-group {
@@ -433,6 +434,7 @@ div#mail-index{
         button.et2_button { }
 
 
+        // Senden Button
         .mail-compose_button{
             height: 27px;
             /*margin-right: 3px !important;*/
@@ -443,13 +445,14 @@ div#mail-index{
             padding-left: 20px;
             width: 71px;
             float: left;
-            background-image: url(images/mail_send.png) !important;
+            background-image: url(images/mail_send.png);
             background-position: left;
             background-repeat: no-repeat;
             background-size: 16px 16px;
             background-color: @egw_color_2_a;
             color: @gray_0;
             &:hover {.box_shadow_standard_light_hover; background-color:@color_positive_action;}
+            &:disabled {background-color: @color_disabled !important;}
 
         }
         /*######################################*/
@@ -878,7 +881,7 @@ div#popupMainDiv{
         max-height: 12%;
         position: fixed;
         border: 0px solid @egw_color_3_a;
-		
+
         border-bottom: 0px;
         opacity: 1;
         -moz-opacity:1;