Fix mail preview in mobile template

This commit is contained in:
Hadi Nategh 2022-08-23 15:57:30 +02:00
parent 9000b802f6
commit 6118bf6a7a
4 changed files with 93 additions and 86 deletions

View File

@ -5,7 +5,7 @@
<template id="mail.index.rows" template="" lang="" group="0" version="1.9.001"> <template id="mail.index.rows" template="" lang="" group="0" version="1.9.001">
<grid width="100%"> <grid width="100%">
<columns> <columns>
<column width="20"/> <column width="50"/>
<column width="90%"/> <column width="90%"/>
<column width="80"/> <column width="80"/>
</columns> </columns>
@ -14,7 +14,10 @@
</row> </row>
<row> <row>
<description class="$row_cont[class] mobile_cat_col"/> <hbox>
<description class="$row_cont[class] mobile_cat_col"/>
<lavatar src="$row_cont[avatar]" lname="$row_cont[address]" shape="rounded" size="2.75em"/>
</hbox>
<vbox> <vbox>
<url-email id="${row}[address]" class="$row_cont[class]" readonly="true"/> <url-email id="${row}[address]" class="$row_cont[class]" readonly="true"/>
<hbox> <hbox>
@ -25,7 +28,7 @@
</vbox> </vbox>
<vbox> <vbox>
<hbox> <hbox>
<time_or_date align="center" class="$row_cont[class]" id="${row}[date]" readonly="true"/> <date-time-today align="center" class="$row_cont[class]" id="${row}[date]" readonly="true"/>
</hbox> </hbox>
<hbox> <hbox>
<image src="$row_cont[smime]" height="16px"/> <image src="$row_cont[smime]" height="16px"/>

View File

@ -10,83 +10,87 @@
<description/> <description/>
</hbox> </hbox>
</hbox> </hbox>
<hbox class="mail-d-h1" width="100%"> <hbox class="mailPreviewHeaders">
<description align="left" id="subject" no_lang="1" readonly="true"/> <description id="subject" readonly="true"
<hbox class="smimeIcons"> hover_action="app.mail.modifyMessageSubjectDialog"
<image id="smime_signature" src="smime_sign" statustext="Smime signed message" disabled="true" align="right" width="24"/> hover_action_title="Modify subject of this message"/>
<image id="smime_encryption" src="smime_encrypt" statustext="Smime encrypted message" disabled="true" align="right" width="24"/> <hbox class="mailPreviewHeaders smimeIcons">
<image id="smime_signature" src="smime_sign" statustext="Smime signed message" disabled="!@smime=smime_sign"
align="right" width="24"/>
<image id="smime_encryption" src="smime_encrypt" statustext="Smime encrypted message"
disabled="!@smime=smime_encrypt" align="right" width="24"/>
</hbox> </hbox>
</hbox> </hbox>
<hbox class="mail-d-h2" disabled="!@fromaddress" width="100%"> <hbox width="100%" class="mailPreviewHeaders">
<url-email id="fromaddress" readonly="true"/> <lavatar src="@avatar" lname="@address" shape="rounded" size="2.75em"/>
</hbox> <vbox>
<hbox class="mail-d-h2" align="right" width="100%"> <hbox>
<date-time id="date" readonly="true"/> <et2-details class="details" toggleOnHover="true" hoist="true" toggleAlign="left">
</hbox> <et2-select-email slot="summary" id="fromaddress" readonly="true"/>
<hbox class="mail-d-h2" disabled="!@toaddress" width="100%"> <hbox>
<description value="To"/> <description value="From" class="firstColumnTitle"/>
<url-email id="toaddress" readonly="true"/> <et2-select-email id="additionalfromaddress" readonly="true"></et2-select-email>
<description id="toaddressdetails"/> </hbox>
</hbox> <hbox disabled="!@toaddress" width="100%">
<hbox> <description value="To" class="firstColumnTitle"/>
<details class="details" title="details" toggle_align="left"> <et2-select-email id="additionaltoaddress" readonly="true"></et2-select-email>
<hbox class="mail-d-h2" disabled="!@toaddress" width="100%"> </hbox>
<description value="To"/> <hbox disabled="!@ccaddress" width="100%">
<grid id="additionaltoaddress"> <description value="Cc" class="firstColumnTitle"/>
<et2-select-email id="ccaddress" readonly="true"></et2-select-email>
</hbox>
</et2-details>
<date-time-today align="right" id="date" readonly="true"/>
</hbox>
<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="@attachmentsBlock[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> <columns>
<column/> <column disabled="!@showtempname"/>
<column disabled="!@showtempname"/>
<column disabled="!@showtempname"/>
<column disabled="!@showtempname"/>
<column width="70%" />
<column width="11%" />
<column width="10%"/>
</columns> </columns>
<rows> <rows>
<row> <row class="row attachmentRow" id="${row}">
<url-email 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> </row>
</rows> </rows>
</grid> </grid>
</hbox> </et2-details>
<hbox class="mail-d-h2" disabled="!@ccaddress" width="100%"> </vbox>
<description value="Cc"/>
<grid id="ccaddress">
<columns>
<column/>
</columns>
<rows>
<row>
<url-email id="${row}"/>
</row>
</rows>
</grid>
</hbox>
</details>
<details title="show attachments" toggle_align="left" class="attachments">
<grid disabled="@no_griddata" 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="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="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]"/>
<buttononly id="${row}[save]" image="fileexport" readonly="false" onclick="app.mail.saveAttachmentHandler(widget,'downloadOneAsFile', ${row})"/>
<buttononly id="${row}[saveAsVFS]" image="filemanager/navbar" readonly="false" onclick="app.mail.saveAttachmentHandler(widget,'saveOneToVfs', ${row})"/>
<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" readonly="false" id="${row}[save_all]" image="mail/save_all" onclick="app.mail.saveAttachmentHandler(widget,'saveAllToVfs', ${row})"/>
<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" readonly="false" id="${row}[save_zip]" image="mail/save_zip" onclick="app.mail.saveAttachmentHandler(widget,'downloadAllToZip', ${row})" label="Save as Zip"/>
</row>
</rows>
</grid>
</details>
</hbox> </hbox>
<box height="100%"> <box height="100%">
<iframe id="iframe" width="100%" height="100%" scrolling="auto"/> <iframe id="iframe" width="100%" height="100%" scrolling="auto"/>

View File

@ -9089,17 +9089,17 @@ table.egwGridView_grid img.et2_appicon {
body td.et2_fullWidth { body td.et2_fullWidth {
width: auto; width: auto;
} }
body div.et2_toolbar.et2_head_toolbar { body .et2_toolbar {
background-color: transparent; background-color: transparent;
padding: 1px 5px 5px 10px !important; padding: 1px 5px 5px 10px !important;
} }
body div.et2_toolbar.et2_head_toolbar button { body .et2_toolbar button {
width: 46px; width: 46px;
height: 46px; height: 46px;
background-size: 18px 18px; background-size: 18px 18px;
touch-action: auto; touch-action: auto;
} }
body div.et2_toolbar.et2_head_toolbar div.ui-toolbar-menulist { body .et2_toolbar .ui-toolbar-menulist {
width: 100%; width: 100%;
left: 0px; left: 0px;
overflow-y: auto !important; overflow-y: auto !important;
@ -9110,13 +9110,13 @@ table.egwGridView_grid img.et2_appicon {
filter: progid:DXImageTransform.Microsoft.Shadow(color=#999999, direction=135, strength=3); filter: progid:DXImageTransform.Microsoft.Shadow(color=#999999, direction=135, strength=3);
-moz-user-select: none; -moz-user-select: none;
} }
body div.et2_toolbar.et2_head_toolbar button.et2_toolbar_hasCaption { body .et2_toolbar button.et2_toolbar_hasCaption {
width: auto; width: auto;
} }
body div.et2_toolbar.et2_head_toolbar div.et2_toolbar_actionlist { body .et2_toolbar .et2_toolbar_actionlist {
margin-left: 50px; margin-left: 50px;
} }
body div.et2_toolbar.et2_head_toolbar div.et2_toolbar_actionlist button.et2_button.ui-draggable { body .et2_toolbar .et2_toolbar_actionlist button.et2_button.ui-draggable {
border: none !important; border: none !important;
box-shadow: none !important; box-shadow: none !important;
background-position: center !important; background-position: center !important;
@ -9127,13 +9127,13 @@ table.egwGridView_grid img.et2_appicon {
border: none; border: none;
width: 40px; width: 40px;
} }
body div.et2_toolbar.et2_head_toolbar div.et2_toolbar_more { body .et2_toolbar .et2_toolbar_more {
position: inherit; position: inherit;
} }
body div.et2_toolbar.et2_head_toolbar div.et2_toolbar_more .ui-state-hover { body .et2_toolbar .et2_toolbar_more .ui-state-hover {
background: none; background: none;
} }
body div.et2_toolbar.et2_head_toolbar div.et2_toolbar_more .ui-toolbar-menulistHeader { body .et2_toolbar .et2_toolbar_more .ui-toolbar-menulistHeader {
color: transparent; color: transparent;
height: 46px; height: 46px;
width: 50px; width: 50px;
@ -9148,7 +9148,7 @@ table.egwGridView_grid img.et2_appicon {
background-size: 24px 24px !important; background-size: 24px 24px !important;
border: none; border: none;
} }
body div.et2_toolbar.et2_head_toolbar div.et2_toolbar_more .ui-toolbar-menulistHeader span { body .et2_toolbar .et2_toolbar_more .ui-toolbar-menulistHeader span {
display: none; display: none;
} }
body .et2_tabbox.vertical .et2_tabflag { body .et2_tabbox.vertical .et2_tabflag {

View File

@ -1243,7 +1243,7 @@
//# # //# #
//########################################### //###########################################
div.et2_toolbar.et2_head_toolbar { .et2_toolbar {
background-color: transparent; background-color: transparent;
padding: 1px 5px 5px 10px !important; padding: 1px 5px 5px 10px !important;
button { button {
@ -1252,7 +1252,7 @@
background-size: 18px 18px; background-size: 18px 18px;
touch-action: auto; touch-action: auto;
} }
div.ui-toolbar-menulist .ui-toolbar-menulist
{ {
width: 100%; width: 100%;
left:0px; left:0px;
@ -1267,7 +1267,7 @@
button.et2_toolbar_hasCaption { button.et2_toolbar_hasCaption {
width:auto; width:auto;
} }
div.et2_toolbar_actionlist { .et2_toolbar_actionlist {
margin-left: 50px; margin-left: 50px;
button.et2_button.ui-draggable { button.et2_button.ui-draggable {
border: none !important; border: none !important;
@ -1277,7 +1277,7 @@
width: 40px; width: 40px;
} }
} }
div.et2_toolbar_more { .et2_toolbar_more {
position:inherit; position:inherit;
.ui-state-hover { .ui-state-hover {
background:none; background:none;