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

Mail compose move "add cc/bcc etc" to dropdown button

Browse Source
This commit is contained in:
milan 2024-12-05 15:57:30 +01:00
parent 408a763dc9
commit 021f780548
4 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/templates/default/etemplate2.css
View File

@ -2932,7 +2932,7 @@ et2-button.transparent-button::part(container) {
.et2_toolbar-dropdown {
display: inline-block;
height: 24px;
height: auto;
text-align: left;
font-weight: normal !important;
font-size: 9pt !important;

30
mail/js/app.js
View File

@ -4713,8 +4713,8 @@ app.classes.mail = AppJS.extend(
*/
compose_fieldExpander: function(event,widget)
{
var expWidgets = {cc:{},bcc:{},folder:{},replyto:{}};
for (var name in expWidgets)
const expWidgets = {cc:{},bcc:{},folder:{},replyto:{}};
for (const name in expWidgets)
{
expWidgets[name] = this.et2.getWidgetById(name+'_expander');
}
@ -4727,37 +4727,37 @@ app.classes.mail = AppJS.extend(
jQuery(".mailComposeJQueryCc").show();
if (typeof expWidgets.cc !='undefined')
{
expWidgets.cc.set_disabled(true);
//expWidgets.cc.set_disabled(true);
}
break;
case 'bcc_expander':
jQuery(".mailComposeJQueryBcc").show();
if (typeof expWidgets.bcc !='undefined')
{
expWidgets.bcc.set_disabled(true);
//expWidgets.bcc.set_disabled(true);
}
break;
case 'folder_expander':
jQuery(".mailComposeJQueryFolder").show();
if (typeof expWidgets.folder !='undefined')
{
expWidgets.folder.set_disabled(true);
//expWidgets.folder.set_disabled(true);
}
break;
case 'replyto_expander':
jQuery(".mailComposeJQueryReplyto").show();
if (typeof expWidgets.replyto !='undefined')
{
expWidgets.replyto.set_disabled(true);
//expWidgets.replyto.set_disabled(true);
}
break;
}
}
else if (typeof widget == "undefined")
{
var widgets = {cc:{},bcc:{},folder:{},replyto:{}};
const widgets = {cc:{},bcc:{},folder:{},replyto:{}};
for(var widget in widgets)
for(const widget in widgets)
{
widgets[widget] = this.et2.getWidgetById(widget);
@ -4767,30 +4767,30 @@ app.classes.mail = AppJS.extend(
{
case 'cc':
jQuery(".mailComposeJQueryCc").show();
if (typeof expWidgets.cc != 'undefiend')
if (typeof expWidgets.cc != 'undefined')
{
expWidgets.cc.set_disabled(true);
//expWidgets.cc.set_disabled(true);
}
break;
case 'bcc':
jQuery(".mailComposeJQueryBcc").show();
if (typeof expWidgets.bcc != 'undefiend')
if (typeof expWidgets.bcc != 'undefined')
{
expWidgets.bcc.set_disabled(true);
//expWidgets.bcc.set_disabled(true);
}
break;
case 'folder':
jQuery(".mailComposeJQueryFolder").show();
if (typeof expWidgets.folder != 'undefiend')
if (typeof expWidgets.folder != 'undefined')
{
expWidgets.folder.set_disabled(true);
//expWidgets.folder.set_disabled(true);
}
break;
case 'replyto':
jQuery(".mailComposeJQueryReplyto").show();
if (typeof expWidgets.replyto != 'undefiend')
{
expWidgets.replyto.set_disabled(true);
//expWidgets.replyto.set_disabled(true);
}
break;
}

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

@ -902,19 +902,9 @@ and (orientation : landscape) {
}
#mail-compose_cc_expander,
#mail-compose_bcc_expander,
#mail-compose_folder_expander,
#mail-compose_replyto_expander {
width: 100%;
margin: 0px;
margin-left: 1em;
text-align: left;
padding: 0;
cursor: pointer;
border: none;
color: rgb(38, 83, 124);
background-color: transparent;
#mail-compose_cc_expander::part(main) {
margin-left:1em;
}
#mail-compose_mimeType{margin-left:1em;}
/*Make file uploads in compose dialog invisible*/

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

@ -24,14 +24,19 @@
<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-dropdown-button id="cc_expander" label="Cc" class="et2_button_text2" onclick="app.mail.compose_fieldExpander" >
<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>
<et2-button id="folder_expander" label="Folder" onclick="app.mail.compose_fieldExpander"></et2-button>
</et2-dropdown-button>
<et2-vbox class="expanderFirstRow">
<et2-description id="replyto_expander" value="Reply to" class="et2_button_text" onclick="app.mail.compose_fieldExpander"></et2-description>
<et2-description id="folder_expander" value="Folder" class="et2_button_text" onclick="app.mail.compose_fieldExpander"></et2-description>
<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>
@ -61,8 +66,7 @@
onchange="app.mail.recipients_onchange"
placeholder="select or insert email address" includeLists="true" allowPlaceholder="true"></et2-email>
<et2-hbox>
<et2-description id="cc_expander" value="Cc" class="et2_button_text" onclick="app.mail.compose_fieldExpander"></et2-description>
<et2-description id="bcc_expander" value="Bcc" class="et2_button_text" onclick="app.mail.compose_fieldExpander"></et2-description>
<et2-description id="placeholder"></et2-description>
</et2-hbox>
</row>
<row class="mailComposeHeaders mailComposeJQueryCc">
@ -82,7 +86,7 @@
<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="left">
<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>