extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-03-04 10:11:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

WIP hide From in mail compose header

Browse Source
This commit is contained in:
milan 2025-02-27 12:03:55 +01:00
parent 019ff98ea1
commit fbeaefcf05
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mail/js/app.js
View File

@ -31,7 +31,7 @@ import {Et2VfsSelectButton} from "../../api/js/etemplate/Et2Vfs/Et2VfsSelectButt
import {et2_nextmatch} from "../../api/js/etemplate/et2_extension_nextmatch";
/* required dependency, commented out because no module, but egw:uses is no longer parsed
*/
var keepFromExpander;
/**
* UI for mail
*
@ -4841,7 +4841,7 @@ app.classes.mail = AppJS.extend(
&& typeof widgets[expanderBtn].widget != 'undefined'
&& (!widgets[widget].widget.value || !widgets[widget].widget.value.length)
&& actions.indexOf(expanderBtn)<0)
|| expanderBtn ==='from_expander'
|| expanderBtn ==='from_expander' && !keepFromExpander
)
{
widgets[expanderBtn].widget?.set_disabled(false);
@ -4902,12 +4902,13 @@ app.classes.mail = AppJS.extend(
}
break;
case 'from_expander':
document.querySelector('.mailComposeHideFrom').style.display=''
document.querySelector('.mailComposeJQueryFrom').style.display=''
keepFromExpander = true;
break;
}
widget.parentElement.hide()
}
else if (typeof widget == "undefined")
else if (typeof widget == "undefined") //show all widgets
{
const widgets = {cc:{},bcc:{},folder:{},replyto:{}};
@ -4960,7 +4961,7 @@ app.classes.mail = AppJS.extend(
{
if (!document.getElementById('mail_folder_lock_div'))
{
var parent = jQuery('#mail-index_nm\\[foldertree\\]');
var parent = document.querySelector('#mail-index_nm\\[foldertree\\]');
var lock_div = jQuery(document.createElement('div'));
lock_div.attr('id', 'mail_folder_lock_div')
.addClass('mail_folder_lock');

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

@ -1001,10 +1001,18 @@ et2-image.smime_cert_unknownemail {
border: none;
outline: none;
}
#mail-compose tr.mailComposeHeaders > td > et2-dropdown {
position: relative;
max-width: 100%;
}
#mail-compose tr.mailComposeHeaders et2-dropdown et2-button::part(base){
margin-left: 1ex;
background-color: var(--sl-color-gray-150);
}
#mail-compose tr.mailComposeHeaders et2-dropdown et2-button::part(label){
padding-left: 0;
margin-left: -1px;
}
#mail-compose tr.mailComposeHeaders .et2_taglist .ms-ctn-focus {
border: none;
@ -1135,9 +1143,3 @@ table.et2_egw_action_ddHelper_row .innerContainer {
tr.mailComposeJQueryCc, tr.mailComposeJQueryBcc, tr.mailComposeJQueryFolder, tr.mailComposeJQueryReplyto {
display: none;
}
tr.mailComposeHeaders > td > et2-dropdown {
position: relative;
left: -1em;
width: 100%;
max-width: 100%;
}

3
mail/templates/default/compose.xet
View File

@ -44,7 +44,7 @@
<column width="90%"/>
</columns>
<rows>
<row class="mailComposeHeaders" >
<row class="mailComposeHeaders mailComposeJQueryFrom" >
<et2-description value="From"></et2-description>
<et2-select id="mailaccount" onchange="app.mail.submitOnChange"></et2-select>
</row>
@ -62,6 +62,7 @@
<et2-button slot="trigger" caret="true" noSubmit="true">
<et2-description value="To"></et2-description>
</et2-button>
<et2-button id="from_expander" label="From" onclick="app.mail.compose_fieldExpander"></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>