From a7a82f72004e00d0a1813c1af7587cd3160a9bf1 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 21 Jan 2016 10:55:39 +0000
Subject: [PATCH] Mobile theme W.I.P.: - Re-arrange attachments in display
 dialog

---
 mail/templates/mobile/display.xet             | 99 ++++++++++---------
 mail/templates/pixelegg/app.css               |  8 ++
 mail/templates/pixelegg/app.less              |  8 ++
 pixelegg/inc/class.pixelegg_framework.inc.php |  3 +-
 4 files changed, 71 insertions(+), 47 deletions(-)

diff --git a/mail/templates/mobile/display.xet b/mail/templates/mobile/display.xet
index b681b63293..03eadbb7f3 100644
--- a/mail/templates/mobile/display.xet
+++ b/mail/templates/mobile/display.xet
@@ -28,57 +28,64 @@
 				</hbox>
 				<buttononly class="et2_button ui-button" label="Show all Addresses" image="foldertree_nolines_plus" onclick="app.mail.showAllHeader"/>
 			</hbox>
-			<details title="show details" toggle_align="left">
-				<hbox class="mail-d-h2" id="mailDisplayHeadersSender" disabled="!@SENDER" width="100%">
-					<description value="on behalf of"/>
-					<url-email id="SENDER" readonly="true"/>
-				</hbox>
-				<hbox class="mail-d-h2" id="mailDisplayHeadersCc" disabled="!@CC"  width="100%">
-					<description value="Cc"/>
-					<hbox id="CC" class="mail_extraEmails">
+			<hbox>
+				<details title="show details" toggle_align="left">
+					<hbox class="mail-d-h2" id="mailDisplayHeadersSender" disabled="!@SENDER" width="100%">
+						<description value="on behalf of"/>
+						<url-email id="SENDER" readonly="true"/>
 					</hbox>
-					<buttononly class="et2_button ui-button" label="Show all Addresses" image="foldertree_nolines_plus" onclick="app.mail.showAllHeader"/>
-				</hbox>
-				<hbox class="mail-d-h2" id="mailDisplayHeadersBcc" disabled="!@BCC" width="100%">
-					<description value="Bcc"/>
-					<hbox id="BCC" class="mail_extraEmails">
+					<hbox class="mail-d-h2" id="mailDisplayHeadersCc" disabled="!@CC"  width="100%">
+						<description value="Cc"/>
+						<hbox id="CC" class="mail_extraEmails">
+						</hbox>
+						<buttononly class="et2_button ui-button" label="Show all Addresses" image="foldertree_nolines_plus" onclick="app.mail.showAllHeader"/>
 					</hbox>
-					<buttononly class="et2_button ui-button" label="Show all Addresses" image="foldertree_nolines_plus" onclick="app.mail.showAllHeader"/>
-				</hbox>
-			</details>
+					<hbox class="mail-d-h2" id="mailDisplayHeadersBcc" disabled="!@BCC" width="100%">
+						<description value="Bcc"/>
+						<hbox id="BCC" class="mail_extraEmails">
+						</hbox>
+						<buttononly class="et2_button ui-button" label="Show all Addresses" image="foldertree_nolines_plus" onclick="app.mail.showAllHeader"/>
+					</hbox>
+				</details>
+				<details title="show attachments" toggle_align="left" class="attachments">
+					<box class="$cont[mailDisplayAttachmentsClass]">
+						<grid disabled="@no_griddata" id="mail_displayattachments" class="egwGridView_grid" width="100%">
+							<columns>
+								<column disabled="!@showtempname"/>
+								<column disabled="!@showtempname"/>
+								<column disabled="!@showtempname"/>
+								<column disabled="!@showtempname"/>
+								<column width="70%" />
+								<column width="11%" />
+								<column width="3%"/>
+								<column width="3%"/>
+								<column width="3%"/>
+								<column />
+							</columns>
+							<rows>
+								<row class="row attachmentRow" >
+									<description id="${row}[attachment_number]" />
+									<description id="${row}[partID]" />
+									<description id="${row}[type]" />
+									<description id="${row}[winmailFlag]" />
+									<description class="useEllipsis et2_link" id="${row}[filename]" expose_view="true" mime="$row_cont[type]" no_lang="1" mime_data="$row_cont[mime_data]" href="$row_cont[mime_url]"/>
+									<description align="right" id="${row}[size]" />
+									<buttononly id="${row}[save]" value="save" image="fileexport" onclick="app.mail.saveAttachment"/>
+									<buttononly id="${row}[saveAsVFS]" value="save" image="filemanager/navbar" onclick="app.mail.saveAttachmentToVFS"/>
+									<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_all]" value="save_all" image="mail/save_all" onclick="app.mail.saveAllAttachmentsToVFS"/>
+									<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_zip]" value="save_zip" image="mail/save_zip" onclick="app.mail.saveAllAttachmentsToZip" label="Save as Zip"/>
+								</row>
+							</rows>
+						</grid>
+					</box>
+				</details>
+			</hbox>
+			
+			
 		</vbox>
 		<vbox class="mailDisplay">
 			<iframe frameborder="1" class="mail_displaybody" id="mailDisplayBodySrc" name="mailDisplayBodySrc" scrolling="auto" width="100%"/>
-			<box class="$cont[mailDisplayAttachmentsClass]">
-				<grid disabled="@no_griddata" id="mail_displayattachments" class="egwGridView_grid" width="100%">
-						<columns>
-							<column disabled="!@showtempname"/>
-							<column disabled="!@showtempname"/>
-							<column disabled="!@showtempname"/>
-							<column disabled="!@showtempname"/>
-							<column width="70%" />
-							<column width="11%" />
-							<column width="3%"/>
-							<column width="3%"/>
-							<column width="3%"/>
-							<column />
-						</columns>
-						<rows>
-							<row class="row attachmentRow" >
-								<description id="${row}[attachment_number]" />
-								<description id="${row}[partID]" />
-								<description id="${row}[type]" />
-								<description id="${row}[winmailFlag]" />
-								<description class="useEllipsis et2_link" id="${row}[filename]" expose_view="true" mime="$row_cont[type]" no_lang="1" mime_data="$row_cont[mime_data]" href="$row_cont[mime_url]"/>
-								<description align="right" id="${row}[size]" />
-								<buttononly id="${row}[save]" value="save" image="fileexport" onclick="app.mail.saveAttachment"/>
-								<buttononly id="${row}[saveAsVFS]" value="save" image="filemanager/navbar" onclick="app.mail.saveAttachmentToVFS"/>
-								<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_all]" value="save_all" image="mail/save_all" onclick="app.mail.saveAllAttachmentsToVFS"/>
-								<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_zip]" value="save_zip" image="mail/save_zip" onclick="app.mail.saveAllAttachmentsToZip" label="Save as Zip"/>
-							</row>
-						</rows>
-					</grid>
-			</box>
+			
 		</vbox>
 	</template>
 </overlay>
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index b155da76fa..99f087961d 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -2629,6 +2629,14 @@ div.mailComposeHeaderSection > table {
     padding-top: 15px;
     font-size: 9.5;
   }
+  body #popupMainDiv #mail-display .et2_details {
+    width: 50%;
+    display: inline-block;
+  }
+  body #popupMainDiv #mail-display .et2_details.et2_details_expanded {
+    width: 100%;
+    display: block;
+  }
   body #popupMainDiv #mail-display span.et2_details_title {
     color: #26537c;
     font-size: 10pt;
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index c8551c8ee3..09177bc635 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -1778,6 +1778,14 @@ div.mailComposeHeaderSection > table {
 					}
 					
 				}
+				.et2_details {
+					width: 50%;
+					display: inline-block;
+				}
+				.et2_details.et2_details_expanded {
+					width: 100%;
+					display: block;
+				}
 				span.et2_details_title {
 						color:#26537c;
 						.mob-fontsize-n;
diff --git a/pixelegg/inc/class.pixelegg_framework.inc.php b/pixelegg/inc/class.pixelegg_framework.inc.php
index b3f771e624..1e06d8b56c 100755
--- a/pixelegg/inc/class.pixelegg_framework.inc.php
+++ b/pixelegg/inc/class.pixelegg_framework.inc.php
@@ -165,7 +165,8 @@ body div.et2_nextmatch .search button,
 body button.plus_button,
 body div.et2_nextmatch .search .nm_action_header,
 body div.et2_nextmatch .search .nm_toggle_header,
-body div.et2_nextmatch .search .nm_favorites_button {
+body div.et2_nextmatch .search .nm_favorites_button ,
+body div.dialogHeadbar{
 	background-color: $color;
 }";
 		}