extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change layout of mail compose

Browse Source
This commit is contained in:
Hadi Nategh 2014-01-18 14:01:07 +00:00
parent 6b926d5267
commit c2c8651097
2 changed files with 153 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
mail/js/app.js
View File

@ -104,6 +104,8 @@ app.classes.mail = AppJS.extend(
case 'mail.compose':
this.mail_isMainWindow = false;
isCompose = true;
this.hide_cc_compose();
break;
}
}
//alert('action about to go down');
@ -2381,5 +2383,46 @@ app.classes.mail = AppJS.extend(
{
var acc_id = parseInt(_senders[0].id);
this.egw.open_link('mail.mail_wizard.edit&acc_id='+acc_id, '_blank', '720x500');
},
/**
* Hide Cc and Bcc rows from the compose popup
*
*/
hide_cc_compose: function ()
{
jQuery(".mailComposeJQueryCc").hide();
jQuery(".mailComposeJQueryBcc").hide();
},
/**
* Display Cc or Bcc fields in compose popup
*
* @param {widget object} widget clicked label (Cc or Bcc) from compose popup
*
*/
compose_cc_expander: function(widget)
{
var Cc = this.et2.getWidgetById('cc_expander');
var Bcc = this.et2.getWidgetById('bcc_expander');
if (widget.id == "mail-compose_cc_expander")
{
jQuery(".mailComposeJQueryCc").show();
if (typeof Cc !='undefined')
{
Cc.set_disabled(true);
}
}
else if (widget.id == "mail-compose_bcc_expander")
{
jQuery(".mailComposeJQueryBcc").show();
if (typeof Bcc !='undefined')
{
Bcc.set_disabled(true);
}
}
},
});

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

@ -3,15 +3,7 @@
<overlay>
<template id="mail.compose" template="" lang="" group="0" version="1.9.001">
<html id="msg" class="message"/>
<vbox class="mailCompose mailComposeHeaderSection" width="100%">
<hbox class="mailComposeHeaders" width="99%">
<description value="Mailaccount"/>
<menulist>
<menupopup id="mailaccount" onchange="app.mail.submitOnChange"/>
</menulist>
<textbox class="mail-index_quotaDisplayNone" readonly="true" id="composeID"/>
<textbox class="mail-index_quotaDisplayNone" readonly="true" id="serverID"/>
</hbox>
<vbox class="mailCompose mailComposeHeaderSection" width="99%">
<hbox class="et2_toolbar ui-widget-header ui-corner-all mail-compose_toolbar">
<button class="et2_button ui-button mail-compose_button" label="Send" id="button[send]"/>
<buttononly class="et2_button ui-button" label="Save as Draft" value="saveAsDraft" id="button[saveAsDraft]" image="fileexport" onclick="app.mail.saveAsDraft"/>
@ -34,33 +26,56 @@
<menupopup id="priority"/>
</menulist>
</hbox>
<hbox class="mailComposeHeaders" width="99%">
<grid width="100%">
<columns>
<column widtd="10%"/>
<column width="42%" />
<column width="42%"/>
<column width="6%"/>
</columns>
<rows>
<row class="mailComposeHeaders" >
<description value="From"/>
<hbox>
<menulist>
<menupopup id="mailaccount" onchange="app.mail.submitOnChange"/>
</menulist>
<textbox class="mail-index_quotaDisplayNone" readonly="true" id="composeID"/>
<textbox class="mail-index_quotaDisplayNone" readonly="true" id="serverID"/>
</hbox>
<taglist-email id="replyto" empty_label="Reply to" width="100%" maxSelection="1" onclick="app.mail.address_click"/>
<description/>
</row>
<row class="mailComposeHeaders" >
<description value="To"/>
<taglist-email id="to" width="88%" onclick="app.mail.address_click" include_lists="true"/>
<taglist-email id="to" width="100%" onclick="app.mail.address_click" include_lists="true" span="2"/>
<hbox>
<description id="cc_expander" value="Cc" onclick="app.mail.compose_cc_expander"/>
<description id="bcc_expander" value="Bcc" onclick="app.mail.compose_cc_expander"/>
</hbox>
<hbox class="mailComposeHeaders" width="99%">
</row>
<row class="mailComposeHeaders mailComposeJQueryCc">
<description value="Cc"/>
<taglist-email id="cc" width="88%" onclick="app.mail.address_click" include_lists="true"/>
</hbox>
<hbox class="mailComposeHeaders" width="99%">
<taglist-email id="cc" width="100%" onclick="app.mail.address_click" include_lists="true" span="2"/>
<taglist id="folder" empty_label="Folder" autocomplete_url='mail.mail_compose.ajax_searchFolder' autocomplete_params='' allowFreeEntries="false" onclick="app.mail.address_click"/>
</row>
<row class="mailComposeHeaders mailComposeJQueryBcc">
<description value="Bcc"/>
<taglist-email id="bcc" width="88%" onclick="app.mail.address_click" include_lists="true"/>
</hbox>
<hbox class="mailComposeHeaders" width="99%">
<description value="Reply To"/>
<taglist-email id="replyto" width="88%" maxSelection="1" onclick="app.mail.address_click"/>
</hbox>
<hbox class="mailComposeHeaders" width="99%">
<description value="Store to Folder"/>
<taglist id="folder" width="88%" autocomplete_url='mail.mail_compose.ajax_searchFolder' autocomplete_params='' allowFreeEntries="false" onclick="app.mail.address_click"/>
</hbox>
<hbox class="mailComposeHeaders" width="99%">
<taglist-email id="bcc" width="100%" onclick="app.mail.address_click" include_lists="true" span="2"/>
</row>
<row class="mailComposeHeaders">
<description value="Subject"/>
<textbox align="left" width="88%" id="subject"/>
</hbox>
<textbox align="left" width="100%" id="subject" span="2"/>
<checkbox statustext="Change editor type" label="HTML" id="mimeType" onchange="app.mail.submitOnChange" options=",, ,disable"/>
</row>
<row>
<description/>
<hbox class="mail_Composeicons">
<html id="mail_composeicons"/>
</hbox>
</row>
</rows>
</grid>
</vbox>
<vbox class="mailComposeBodySection" width="99%">
<hbox disabled="@is_plain" class="mailComposeBody">
@ -74,10 +89,6 @@
<menupopup id="signatureid" onchange="app.mail.submitOnChange"/>
</menulist>
<description value=" "/>
<description value="Editor type"/>
<menulist>
<menupopup id="mimeType" onchange="app.mail.submitOnChange"/>
</menulist>
</groupbox>
<groupbox class="et2_file mailUploadSection">
<caption label="Files"/>