From 584bdcb5c2a9c9758b2dc6b60df96f85502c8efa Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Thu, 9 Feb 2023 11:27:27 +0100
Subject: [PATCH] Rearrange attachments container in mail preview

---
 mail/templates/default/app.css   |  8 +--
 mail/templates/default/index.xet | 97 ++++++++++++++++----------------
 2 files changed, 51 insertions(+), 54 deletions(-)

diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index e39558cc9f..abf22be0af 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -498,10 +498,6 @@ div.mail-compose_fileselector {
 	margin-bottom: 0.5em;
 	font-size: 1.2em;
 }
-et2-details.details::part(summary),
-et2-details.attachments::part(summary){
-	padding-left: 1em;
-}
 et2-details.details {width: 100%}
 
 .mailDisplay et2-details::part(base),
@@ -1069,9 +1065,9 @@ div#mail-index_nm.splitter-pane {min-height: 100px;}
 #mail-index_nm tbody tr et2-lavatar {max-width: 3.7em; min-width:3.7em !important;}
 
 .previewWrapper .firstColumnTitle {
-	max-width: 4em;
+	max-width: 6em;
 	text-align: end;
-	min-width: 4em;
+	min-width: 6em;
 	color: darkgrey;
 }
 .mailPreviewHeaders et2-select-email::part(control) {
diff --git a/mail/templates/default/index.xet b/mail/templates/default/index.xet
index a59c144b67..16d0988cb2 100644
--- a/mail/templates/default/index.xet
+++ b/mail/templates/default/index.xet
@@ -51,57 +51,58 @@
                                                           rows="1" maxTagsVisible="1"
                                                           onTagClick="app.mail.onclickCompose"></et2-select-email>
                                     </et2-hbox>
+                                    <et2-hbox width="100%" disabled="!@attachmentsBlock">
+                                        <et2-description value="Attachments" class="firstColumnTitle"></et2-description>
+                                        <et2-details overlaySummaryOnOpen="true" toggleAlign="right" toggleOnHover="true" hoist="true" class="attachments" >
+                                            <et2-hbox  slot="summary">
+                                                <grid class="previewAttachmentArea egwGridView_grid" >
+                                                    <columns>
+                                                        <column disabled="!@showtempname"/>
+                                                        <column disabled="!@showtempname"/>
+                                                        <column disabled="!@showtempname"/>
+                                                        <column disabled="!@showtempname"/>
+                                                        <column width="70%" />
+                                                        <column width="20%" />
+                                                    </columns>
+                                                    <rows>
+                                                        <row class="row attachmentRow">
+                                                            <et2-description  id="attachmentsBlock[0][attachment_number]"></et2-description>
+                                                            <et2-description  id="attachmentsBlock[0][partID]"></et2-description>
+                                                            <et2-description  id="attachmentsBlock[0][type]"></et2-description>
+                                                            <et2-description  id="attachmentsBlock[0][winmailFlag]"></et2-description>
+                                                            <et2-description-expose  class="et2_link useEllipsis" id="attachmentsBlock[0][filename]" mime="@attachmentsBlock[0][type]" href="@attachmentsBlock[0][mime_url]" noLang="1" mimeData="@attachmentsBlock[0][mime_data]"></et2-description-expose>
+                                                            <et2-description align="right" value="@attachmentsBlockTitle" class="et2_bold"></et2-description>
+                                                        </row>
+                                                    </rows>
+                                                </grid>
+                                            </et2-hbox>
+                                            <grid id="attachmentsBlock" class="previewAttachmentArea egwGridView_grid">
+                                                <columns>
+                                                    <column disabled="!@showtempname"/>
+                                                    <column disabled="!@showtempname"/>
+                                                    <column disabled="!@showtempname"/>
+                                                    <column disabled="!@showtempname"/>
+                                                    <column width="70%" />
+                                                    <column width="11%" />
+                                                    <column width="10%"/>
+                                                </columns>
+                                                <rows>
+                                                    <row class="row attachmentRow" id="${row}">
+                                                        <et2-description  id="${row}[attachment_number]"></et2-description>
+                                                        <et2-description  id="${row}[partID]"></et2-description>
+                                                        <et2-description  id="${row}[type]"></et2-description>
+                                                        <et2-description  id="${row}[winmailFlag]"></et2-description>
+                                                        <et2-description-expose  class="et2_link useEllipsis" id="${row}[filename]" mime="$row_cont[type]" href="$row_cont[mime_url]" noLang="1" mimeData="$row_cont[mime_data]"></et2-description-expose>
+                                                        <et2-description  align="right" id="${row}[size]"></et2-description>
+                                                        <et2-dropdown-button  id="${row}[actions]" label="$row_cont[actionsDefaultLabel]" onchange="app.mail.attachmentsBlockActions" onclick="app.mail.attachmentsBlockActions"/>
+                                                    </row>
+                                                </rows>
+                                            </grid>
+                                        </et2-details>
+                                    </et2-hbox>
                                 </et2-vbox>
-
                             </et2-vbox>
                         </et2-hbox>
-                        <et2-details overlaySummaryOnOpen="true" toggleAlign="left" toggleOnHover="true" hoist="true" class="attachments" disabled="!@attachmentsBlock">
-                            <et2-hbox  slot="summary">
-                                <grid class="previewAttachmentArea egwGridView_grid" >
-                                    <columns>
-                                        <column disabled="!@showtempname"/>
-                                        <column disabled="!@showtempname"/>
-                                        <column disabled="!@showtempname"/>
-                                        <column disabled="!@showtempname"/>
-                                        <column width="70%" />
-                                        <column width="20%" />
-                                    </columns>
-                                    <rows>
-                                        <row class="row attachmentRow">
-                                            <et2-description  id="attachmentsBlock[0][attachment_number]"></et2-description>
-                                            <et2-description  id="attachmentsBlock[0][partID]"></et2-description>
-                                            <et2-description  id="attachmentsBlock[0][type]"></et2-description>
-                                            <et2-description  id="attachmentsBlock[0][winmailFlag]"></et2-description>
-                                            <et2-description-expose  class="et2_link useEllipsis" id="attachmentsBlock[0][filename]" mime="@attachmentsBlock[0][type]" href="@attachmentsBlock[0][mime_url]" noLang="1" mimeData="@attachmentsBlock[0][mime_data]"></et2-description-expose>
-                                            <et2-description align="right" value="@attachmentsBlockTitle" class="et2_bold"></et2-description>
-                                        </row>
-                                    </rows>
-                                </grid>
-                            </et2-hbox>
-
-                            <grid id="attachmentsBlock" class="previewAttachmentArea egwGridView_grid">
-                                <columns>
-                                    <column disabled="!@showtempname"/>
-                                    <column disabled="!@showtempname"/>
-                                    <column disabled="!@showtempname"/>
-                                    <column disabled="!@showtempname"/>
-                                    <column width="70%" />
-                                    <column width="11%" />
-                                    <column width="10%"/>
-                                </columns>
-                                <rows>
-                                    <row class="row attachmentRow" id="${row}">
-                                        <et2-description  id="${row}[attachment_number]"></et2-description>
-                                        <et2-description  id="${row}[partID]"></et2-description>
-                                        <et2-description  id="${row}[type]"></et2-description>
-                                        <et2-description  id="${row}[winmailFlag]"></et2-description>
-                                        <et2-description-expose  class="et2_link useEllipsis" id="${row}[filename]" mime="$row_cont[type]" href="$row_cont[mime_url]" noLang="1" mimeData="$row_cont[mime_data]"></et2-description-expose>
-                                        <et2-description  align="right" id="${row}[size]"></et2-description>
-                                        <et2-dropdown-button  id="${row}[actions]" label="$row_cont[actionsDefaultLabel]" onchange="app.mail.attachmentsBlockActions" onclick="app.mail.attachmentsBlockActions"/>
-                                    </row>
-                                </rows>
-                            </grid>
-                        </et2-details>
                     </et2-vbox>
                 </row>
             </rows>