Move mail attachments box under details

This commit is contained in:
Hadi Nategh 2022-08-05 16:55:18 +02:00
parent 2593acf303
commit a26dba5d27
4 changed files with 63 additions and 67 deletions

View File

@ -481,21 +481,16 @@ div.mail-compose_fileselector {
margin-bottom: 1em; margin-bottom: 1em;
font-size: 1.2em; font-size: 1.2em;
} }
et2-details.details::part(summary) { et2-details.details::part(summary),
et2-details.attachments::part(summary){
padding-left: 1em; padding-left: 1em;
} }
et2-details.attachments::part(header) {
padding-left: 0px;
}
.mailDisplay et2-details::part(base), .mailDisplay et2-details::part(base),
.previewWrapper et2-details::part(base){ .previewWrapper et2-details::part(base){
border: none; border: none;
} }
et2-details.attachments::part(content) { .mailPreviewHeaders et2-details::part(header) {padding: 0;}
padding-left: 0px;
}
#mail-index_mailPreview .et2_email > span { #mail-index_mailPreview .et2_email > span {
display: inline; display: inline;
} }
@ -681,10 +676,11 @@ div.mailDisplayHeaders div.mail_extraEmails.visible {
} }
.mailPreviewHeaders :first-child, .mailDisplayHeaders :first-child { .mailPreviewHeaders :first-child, .mailDisplayHeaders :first-child {
flex: 0 0 auto; color: #7a7a7a;
color: #7a7a7a; }
.mailPreviewHeaders et2-lavatar {
flex: 0 0 auto;
} }
div.mailPreviewHeaders div.mail_extraEmails { div.mailPreviewHeaders div.mail_extraEmails {
display: inline-block; display: inline-block;
max-height: 1.3em; max-height: 1.3em;

View File

@ -53,59 +53,58 @@
<et2-select-email id="ccaddress" readonly="true"></et2-select-email> <et2-select-email id="ccaddress" readonly="true"></et2-select-email>
</hbox> </hbox>
</et2-details> </et2-details>
<et2-details toggleAlign="left" title="@attachmentsBlockTitle" toggleOnHover="true" hoist="true" class="attachments" disabled="!@attachmentsBlock">
<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="attachmentsBlock[0][attachment_number]" />
<description id="attachmentsBlock[0][partID]" />
<description id="attachmentsBlock[0][type]" />
<description id="attachmentsBlock[0][winmailFlag]" />
<description class="et2_link useEllipsis" id="attachmentsBlock[0][filename]" no_lang="1" expose_view="true" mime="0[type]" mime_data="attachmentsBlock[0][mime_data]" href="attachmentsBlock[0][mime_url]"/>
<description align="right" id="attachmentsBlock[0][size]"/>
</row>
</rows>
</grid>
</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}">
<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]" onchange="app.mail.attachmentsBlockActions" onclick="app.mail.attachmentsBlockActions"/>
</row>
</rows>
</grid>
</et2-details>
</vbox> </vbox>
<date-time-today align="right" id="date" readonly="true"/> <date-time-today align="right" id="date" readonly="true"/>
</hbox> </hbox>
<hbox>
<et2-details title="@attachmentsBlockTitle" toggleOnHover="true" hoist="true" class="attachments" disabled="!@attachmentsBlock">
<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="attachmentsBlock[0][attachment_number]" />
<description id="attachmentsBlock[0][partID]" />
<description id="attachmentsBlock[0][type]" />
<description id="attachmentsBlock[0][winmailFlag]" />
<description class="et2_link useEllipsis" id="attachmentsBlock[0][filename]" no_lang="1" expose_view="true" mime="0[type]" mime_data="attachmentsBlock[0][mime_data]" href="attachmentsBlock[0][mime_url]"/>
<description align="right" id="attachmentsBlock[0][size]"/>
</row>
</rows>
</grid>
</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}">
<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]" onchange="app.mail.attachmentsBlockActions" onclick="app.mail.attachmentsBlockActions"/>
</row>
</rows>
</grid>
</et2-details>
</hbox>
<box id="mailPreviewContainer"> <box id="mailPreviewContainer">
<iframe frameborder="1" id="messageIFRAME" scrolling="auto"/> <iframe frameborder="1" id="messageIFRAME" scrolling="auto"/>
</box> </box>

View File

@ -2300,3 +2300,4 @@ table#mail-index_previewAttachmentArea::-webkit-scrollbar-thumb:hover {
border-bottom: 1px solid silver; border-bottom: 1px solid silver;
} }
} }
/*# sourceMappingURL=app.css.map */

View File

@ -481,18 +481,16 @@ div.mail-compose_fileselector {
margin-bottom: 1em; margin-bottom: 1em;
font-size: 1.2em; font-size: 1.2em;
} }
et2-details.details::part(summary) { et2-details.details::part(summary),
et2-details.attachments::part(summary) {
padding-left: 1em; padding-left: 1em;
} }
et2-details.attachments::part(header) {
padding-left: 0px;
}
.mailDisplay et2-details::part(base), .mailDisplay et2-details::part(base),
.previewWrapper et2-details::part(base) { .previewWrapper et2-details::part(base) {
border: none; border: none;
} }
et2-details.attachments::part(content) { .mailPreviewHeaders et2-details::part(header) {
padding-left: 0px; padding: 0;
} }
#mail-index_mailPreview .et2_email > span { #mail-index_mailPreview .et2_email > span {
display: inline; display: inline;
@ -671,9 +669,11 @@ div.mailDisplayHeaders div.mail_extraEmails.visible {
} }
.mailPreviewHeaders :first-child, .mailPreviewHeaders :first-child,
.mailDisplayHeaders :first-child { .mailDisplayHeaders :first-child {
flex: 0 0 auto;
color: #7a7a7a; color: #7a7a7a;
} }
.mailPreviewHeaders et2-lavatar {
flex: 0 0 auto;
}
div.mailPreviewHeaders div.mail_extraEmails { div.mailPreviewHeaders div.mail_extraEmails {
display: inline-block; display: inline-block;
max-height: 1.3em; max-height: 1.3em;