holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use et2-details for mail from and attachments

Browse Source
This commit is contained in:
Hadi Nategh 2022-07-28 15:32:33 +02:00
parent 53baf00ebf
commit 5c637e47be
4 changed files with 170 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail/templates/default/app.css
View File

@ -175,7 +175,7 @@ A.sieveRowInActive
bottom:80px; bottom:80px;
} }
table tr.attachmentRow > td{ table tr.attachmentRow > td{
padding:0 !important; vertical-align: middle;
} }
table tr.attachmentRow > td > img { table tr.attachmentRow > td > img {
background:transparent; background:transparent;

209
mail/templates/default/display.xet
View File

@ -22,101 +22,126 @@
<hbox width="100%" class="mailPreviewHeaders"> <hbox width="100%" class="mailPreviewHeaders">
<lavatar src="@avatar" lname="@address" shape="rounded"/> <lavatar src="@avatar" lname="@address" shape="rounded"/>
<vbox class="previewWrapper"> <vbox class="previewWrapper">
<details class="details" title="details" toggle_align="left"> <et2-details class="details" title="details" toggleOnHover="true" hoist="true">
<hbox disabled="!@from"> <et2-select-email slot="summary" value="@from" readonly="true"/>
<description value="From" class="firstColumnTitle"/> <hbox disabled="!@from">
<grid id="from"> <description value="From" class="firstColumnTitle"/>
<columns> <grid id="from">
<column/> <columns>
</columns> <column/>
<rows> </columns>
<row> <rows>
<et2-select-email id="${row}" readonly="true"></et2-select-email> <row>
</row> <et2-select-email id="${row}" readonly="true"></et2-select-email>
</rows> </row>
</grid> </rows>
</hbox> </grid>
<hbox disabled="!@sender"> </hbox>
<description value="Sender" class="firstColumnTitle"/> <hbox disabled="!@sender">
<grid id="sender"> <description value="Sender" class="firstColumnTitle"/>
<columns> <grid id="sender">
<column/> <columns>
</columns> <column/>
<rows> </columns>
<row> <rows>
<et2-select-email id="${row}" readonly="true"></et2-select-email> <row>
</row> <et2-select-email id="${row}" readonly="true"></et2-select-email>
</rows> </row>
</grid> </rows>
</hbox> </grid>
<hbox disabled="!@to"> </hbox>
<description value="To" class="firstColumnTitle"/> <hbox disabled="!@to">
<grid id="to"> <description value="To" class="firstColumnTitle"/>
<columns> <grid id="to">
<column/> <columns>
</columns> <column/>
<rows> </columns>
<row> <rows>
<et2-select-email id="${row}" readonly="true"></et2-select-email> <row>
</row> <et2-select-email id="${row}" readonly="true"></et2-select-email>
</rows> </row>
</grid> </rows>
</hbox> </grid>
<hbox disabled="!@cc"> </hbox>
<description value="Cc" class="firstColumnTitle"/> <hbox disabled="!@cc">
<grid id="cc"> <description value="Cc" class="firstColumnTitle"/>
<columns> <grid id="cc">
<column/> <columns>
</columns> <column/>
<rows> </columns>
<row> <rows>
<et2-select-email id="${row}" readonly="true"></et2-select-email> <row>
</row> <et2-select-email id="${row}" readonly="true"></et2-select-email>
</rows> </row>
</grid> </rows>
</hbox> </grid>
<hbox disabled="!@bcc"> </hbox>
<description value="Bcc" class="firstColumnTitle"/> <hbox disabled="!@bcc">
<grid id="bcc"> <description value="Bcc" class="firstColumnTitle"/>
<columns> <grid id="bcc">
<column/> <columns>
</columns> <column/>
<rows> </columns>
<row> <rows>
<et2-select-email id="${row}" readonly="true"></et2-select-email> <row>
</row> <et2-select-email id="${row}" readonly="true"></et2-select-email>
</rows> </row>
</grid> </rows>
</hbox> --> </grid>
</details> </hbox>
<details title="@attachmentsBlockTitle" toggle_align="left" class="attachments" disabled="!@mail_displayattachments"> </et2-details>
<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>
</details>
</vbox> </vbox>
<date-time-today align="right" id="mail_displaydate" readonly="true"/> <date-time-today align="right" id="mail_displaydate" readonly="true"/>
</hbox> </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"> <box class="mailDisplayContainer">
<iframe frameborder="1" class="mail_displaybody" id="mailDisplayBodySrc" name="mailDisplayBodySrc" scrolling="auto" width="100%"/> <iframe frameborder="1" class="mail_displaybody" id="mailDisplayBodySrc" name="mailDisplayBodySrc" scrolling="auto" width="100%"/>
</box> </box>

79
mail/templates/default/index.xet
View File

@ -38,9 +38,10 @@
</hbox> </hbox>
</hbox> </hbox>
<hbox width="100%" class="mailPreviewHeaders"> <hbox width="100%" class="mailPreviewHeaders">
<lavatar src="@avatar" lname="@address" shape="rounded"/> <lavatar src="@avatar" lname="@address" shape="rounded" size="2.45em"/>
<vbox> <vbox>
<details class="details" title="details" toggle_align="left"> <et2-details class="details" toggleOnHover="true" hoist="true">
<et2-select-email slot="summary" id="fromaddress" readonly="true"/>
<hbox> <hbox>
<description value="From" class="firstColumnTitle"/> <description value="From" class="firstColumnTitle"/>
<grid id="additionalfromaddress"> <grid id="additionalfromaddress">
@ -80,37 +81,59 @@
</rows> </rows>
</grid> </grid>
</hbox> </hbox>
</details> </et2-details>
<details title="@attachmentsBlockTitle" toggle_align="left" class="attachments" disabled="!@attachmentsBlock">
<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>
</details>
</vbox> </vbox>
<date-time-today align="right" id="date" readonly="true"/> <date-time-today align="right" id="date" readonly="true"/>
</hbox> </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> </hbox>
<box id="mailPreviewContainer"> <box id="mailPreviewContainer">
<iframe frameborder="1" id="messageIFRAME" scrolling="auto"/> <iframe frameborder="1" id="messageIFRAME" scrolling="auto"/>

2
mail/templates/pixelegg/app.css
View File

@ -167,7 +167,7 @@ A.sieveRowInActive {
bottom: 80px; bottom: 80px;
} }
table tr.attachmentRow > td { table tr.attachmentRow > td {
padding: 0 !important; vertical-align: middle;
} }
table tr.attachmentRow > td > img { table tr.attachmentRow > td > img {
background: transparent; background: transparent;