From 59ff16f98bf0df623e27b3768a7fbc7f562a74e3 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Fri, 5 Aug 2022 16:57:42 +0200
Subject: [PATCH] Update mail display template for attachments change

---
 mail/templates/default/display.xet | 97 +++++++++++++++---------------
 1 file changed, 49 insertions(+), 48 deletions(-)

diff --git a/mail/templates/default/display.xet b/mail/templates/default/display.xet
index 4240cc6ff0..dd676a2286 100644
--- a/mail/templates/default/display.xet
+++ b/mail/templates/default/display.xet
@@ -45,57 +45,58 @@
                             <et2-select-email id="bcc" readonly="true"></et2-select-email>
                         </hbox>
 					</et2-details>
+                    <et2-details  toggleAlign="left" title="@attachmentsBlockTitle" toggleOnHover="true" class="attachments" hoist="true" disabled="!@mail_displayattachments">
+                        <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="11%" />
+                                    <column width="10%"/>
+                                </columns>
+                                <rows>
+                                    <row class="row attachmentRow">
+                                        <description id="mail_displayattachments[0][attachment_number]" />
+                                        <description id="mail_displayattachments[0][partID]" />
+                                        <description id="mail_displayattachments[0][type]" />
+                                        <description id="mail_displayattachments[0][winmailFlag]" />
+                                        <description class="et2_link useEllipsis" id="mail_displayattachments[0][filename]" no_lang="1" expose_view="true" mime="0[type]" mime_data="mail_displayattachments[0][mime_data]" href="mail_displayattachments[0][mime_url]"/>
+                                        <description align="right" id="mail_displayattachments[0][size]"/>
+                                    </row>
+                                </rows>
+                            </grid>
+                        </hbox>
+                        <grid id="mail_displayattachments" 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%"/>
+                                <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="et2_link useEllipsis" id="${row}[filename]" no_lang="1" expose_view="true" mime="$row_cont[type]" mime_data="$row_cont[mime_data]" href="$row_cont[mime_url]"/>
+                                    <description align="right" id="${row}[size]"/>
+                                    <et2-dropdown-button id="${row}[actions]" label="$row_cont[actionsDefaultLabel]" readonly="false" onchange="app.mail.attachmentsBlockActions" onclick="app.mail.attachmentsBlockActions"/>
+                                </row>
+                            </rows>
+                        </grid>
+                    </et2-details>
 				</vbox>
 				<date-time-today align="right" id="mail_displaydate" readonly="true"/>
 			</hbox>
-            <et2-details  title="@attachmentsBlockTitle" toggleOnHover="true" class="attachments" hoist="true" disabled="!@mail_displayattachments">
-                <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="11%" />
-                            <column width="10%"/>
-                        </columns>
-                        <rows>
-                            <row class="row attachmentRow">
-                                <description id="mail_displayattachments[0][attachment_number]" />
-                                <description id="mail_displayattachments[0][partID]" />
-                                <description id="mail_displayattachments[0][type]" />
-                                <description id="mail_displayattachments[0][winmailFlag]" />
-                                <description class="et2_link useEllipsis" id="mail_displayattachments[0][filename]" no_lang="1" expose_view="true" mime="0[type]" mime_data="mail_displayattachments[0][mime_data]" href="mail_displayattachments[0][mime_url]"/>
-                                <description align="right" id="mail_displayattachments[0][size]"/>
-                            </row>
-                        </rows>
-                    </grid>
-                </hbox>
-                <grid id="mail_displayattachments" 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%"/>
-                        <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="et2_link useEllipsis" id="${row}[filename]" no_lang="1" expose_view="true" mime="$row_cont[type]" mime_data="$row_cont[mime_data]" href="$row_cont[mime_url]"/>
-                            <description align="right" id="${row}[size]"/>
-                            <et2-dropdown-button id="${row}[actions]" label="$row_cont[actionsDefaultLabel]" readonly="false" onchange="app.mail.attachmentsBlockActions" onclick="app.mail.attachmentsBlockActions"/>
-                        </row>
-                    </rows>
-                </grid>
-            </et2-details>
+
 			<box class="mailDisplayContainer">
 				<iframe frameborder="1" class="mail_displaybody" id="mailDisplayBodySrc" name="mailDisplayBodySrc" scrolling="auto" width="100%"/>
 			</box>