mail compose move toggle html checkbox to the top next to toolbar

This commit is contained in:
milan 2024-12-18 16:24:37 +01:00
parent 849cc8071e
commit 914c723c78
2 changed files with 32 additions and 29 deletions

View File

@ -906,7 +906,24 @@ and (orientation : landscape) {
margin-left:1em;
}
#mail-compose_mimeType{margin-left:1em;}
#popupMainDiv .et2_container .mailComposeHeaderSection et2-hbox {
border-bottom: 1px solid;
border-color: hsl(240 5% 64.9%);/*var(--sl-panel-border-color);*/
&::part(base){
gap: 1em;
}
#mail-compose_mimeType {
flex-grow: 0;
}
.et2_toolbar
{
border:none;
}
}
/*Make file uploads in compose dialog invisible*/
.mail-compose_toolbar_assist div.mail-compose_fileselector, .mail-compose_toolbar_assist {
display:none;

View File

@ -3,7 +3,14 @@
<overlay>
<template id="mail.compose" template="" lang="" group="0" version="23.1">
<et2-vbox class="mailCompose mailComposeHeaderSection" width="100%">
<toolbar id="composeToolbar" width="et2_fullWidth" view_range="7" flat_list="false" list_header="short"/>
<et2-hbox>
<toolbar id="composeToolbar" width="et2_fullWidth" view_range="7" flat_list="false"
list_header="short"/>
<et2-checkbox align="right"
statustext="Change editor type" label="HTML" id="mimeType"
onchange="app.mail.submitOnChange" tabindex="7" roTrue=" " roFalse="disable">
</et2-checkbox>
</et2-hbox>
<et2-vfs-select-dialog class="$cont[vfsNotAvailable] compose_egw_icons" title="Attach files" buttonLabel="attach" id="selectFromVFSForCompose" multiple="true" onchange="app.mail.vfsUploadForCompose"/>
<et2-hbox class="mail-compose_toolbar_assist" width="100%">
<file class="mail-compose_fileselector" statustext="Select file to attach to message" multiple="true" progress="attachments" onFinish="app.mail.uploadForCompose" onStart="app.mail.composeUploadStart" id="uploadForCompose" drop_target="mail-compose"/>
@ -23,40 +30,26 @@
<columns>
<column width="10%"/>
<column width="70%"/>
<column width="20%"/>
<column width="0%"/>
</columns>
<rows>
<row class="mailComposeHeaders" >
<et2-description value="From"></et2-description>
<et2-select id="mailaccount" onchange="app.mail.submitOnChange"></et2-select>
<et2-vbox class="expanderFirstRow">
<et2-textbox class="mail-index_quotaDisplayNone" readonly="true" id="composeID"></et2-textbox>
<et2-textbox class="mail-index_quotaDisplayNone" readonly="true" id="serverID"></et2-textbox>
<et2-textbox class="mail-index_quotaDisplayNone" readonly="true" id="processedmail_id"></et2-textbox>
<et2-textbox class="mail-index_quotaDisplayNone" readonly="true" id="mode"></et2-textbox>
<et2-textbox class="mail-index_quotaDisplayNone" id="lastDrafted"></et2-textbox>
<et2-textbox class="mail-index_quotaDisplayNone" readonly="true" id="references"></et2-textbox>
<et2-textbox class="mail-index_quotaDisplayNone" readonly="true" id="in-reply-to"></et2-textbox>
<et2-textbox class="mail-index_quotaDisplayNone" readonly="true" id="thread-topic"></et2-textbox>
<et2-textbox class="mail-index_quotaDisplayNone" readonly="true" id="thread-index"></et2-textbox>
<et2-textbox class="mail-index_quotaDisplayNone" readonly="true" id="list-id"></et2-textbox>
</et2-vbox>
</row>
<row class="mailComposeHeaders mailComposeJQueryReplyto">
<et2-description value="Reply to"></et2-description>
<et2-email id="replyto" width="100%" onclick="app.mail.address_click" multiple="true"
searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" allowPlaceholder="true"></et2-email>
<et2-description></et2-description>
</row>
<row class="mailComposeHeaders mailComposeJQueryFolder">
<et2-description value="Folder"></et2-description>
<et2-select id="folder" allowFreeEntries="false" onclick="app.mail.address_click" multiple="true" searchUrl="mail.mail_compose.ajax_searchFolder" searchOptions=""></et2-select>
<et2-description></et2-description>
</row>
<row class="mailComposeHeaders" >
<et2-dropdown>
<et2-button slot="trigger" caret="true" noSubmit="true" >To</et2-button>
<et2-button slot="trigger" caret="true" noSubmit="true">
<et2-description value="To"></et2-description>
</et2-button>
<et2-button id="cc_expander" label="Cc" onclick="app.mail.compose_fieldExpander"></et2-button>
<et2-button id="bcc_expander" label="Bcc" onclick="app.mail.compose_fieldExpander"></et2-button>
<et2-button id="replyto_expander" label="Reply to" onclick="app.mail.compose_fieldExpander"></et2-button>
@ -65,31 +58,24 @@
<et2-email id="to" width="100%" onclick="app.mail.address_click" autofocus="true"
onchange="app.mail.recipients_onchange"
placeholder="select or insert email address" includeLists="true" allowPlaceholder="true"></et2-email>
<et2-hbox>
<et2-description id="placeholder"></et2-description>
</et2-hbox>
</row>
<row class="mailComposeHeaders mailComposeJQueryCc">
<et2-description value="Cc"></et2-description>
<et2-email id="cc" width="100%" onclick="app.mail.address_click"
onchange="app.mail.recipients_onchange" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email"
placeholder="select or insert email address" includeLists="true" allowPlaceholder="true"></et2-email>
<et2-description></et2-description>
</row>
<row class="mailComposeHeaders mailComposeJQueryBcc">
<et2-description value="Bcc"></et2-description>
<et2-email id="bcc" width="100%" onclick="app.mail.address_click"
onchange="app.mail.recipients_onchange" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email"
placeholder="select or insert email address" includeLists="true" allowPlaceholder="true"></et2-email>
<et2-description></et2-description>
</row>
<row class="mailComposeHeaders">
<et2-description value="Subject"></et2-description>
<et2-textbox align="left" width="100%" id="subject" height="25" onchange="app.mail.subject2title"></et2-textbox>
<et2-hbox align="right">
<et2-checkbox statustext="Change editor type" label="HTML" id="mimeType" onchange="app.mail.submitOnChange" tabindex="7" roTrue=" " roFalse="disable"></et2-checkbox>
</et2-hbox>
</row>
</row>
</rows>
</grid>
</et2-vbox>
@ -136,7 +122,7 @@
<et2-hbox>
<et2-select id="filemode" label="Send files as" onchange="app.mail.check_sharing_filemode"></et2-select>
<et2-hbox>
<et2-description value="Expiration"></et2-description>
<et2-description value="Expiration" style="align-self: center;"></et2-description>
<et2-date id="expiration" placeholder="@expiration_blur" dataFormat="Y-m-d"></et2-date>
</et2-hbox>
<et2-password id="password" statustext="Only makes sense, if you transport password through a different channel / outside of this mail to recipients!" placeholder="password protect"></et2-password>