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

45
mail/js/app.js
View File

@ -104,6 +104,8 @@ app.classes.mail = AppJS.extend(
case 'mail.compose': case 'mail.compose':
this.mail_isMainWindow = false; this.mail_isMainWindow = false;
isCompose = true; isCompose = true;
this.hide_cc_compose();
break;
} }
} }
//alert('action about to go down'); //alert('action about to go down');
@ -2381,5 +2383,46 @@ app.classes.mail = AppJS.extend(
{ {
var acc_id = parseInt(_senders[0].id); var acc_id = parseInt(_senders[0].id);
this.egw.open_link('mail.mail_wizard.edit&acc_id='+acc_id, '_blank', '720x500'); 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);
}
}
},
}); });

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

@ -2,106 +2,117 @@
<!-- $Id$ --> <!-- $Id$ -->
<overlay> <overlay>
<template id="mail.compose" template="" lang="" group="0" version="1.9.001"> <template id="mail.compose" template="" lang="" group="0" version="1.9.001">
<html id="msg" class="message"/> <html id="msg" class="message"/>
<vbox class="mailCompose mailComposeHeaderSection" width="100%"> <vbox class="mailCompose mailComposeHeaderSection" width="99%">
<hbox class="mailComposeHeaders" width="99%"> <hbox class="et2_toolbar ui-widget-header ui-corner-all mail-compose_toolbar">
<description value="Mailaccount"/> <button class="et2_button ui-button mail-compose_button" label="Send" id="button[send]"/>
<menulist> <buttononly class="et2_button ui-button" label="Save as Draft" value="saveAsDraft" id="button[saveAsDraft]" image="fileexport" onclick="app.mail.saveAsDraft"/>
<menupopup id="mailaccount" onchange="app.mail.submitOnChange"/> <buttononly class="et2_button ui-button" label="Save as Draft and Print" value="saveAsDraftAndPrint" id="button[saveAsDraftAndPrint]" image="print" onclick="app.mail.saveAsDraftAndPrint"/>
</menulist> <vfs-select class="$cont[vfsNotAvailable]" id="selectFromVFSForCompose" onchange="app.mail.vfsUploadForCompose"/>
<textbox class="mail-index_quotaDisplayNone" readonly="true" id="composeID"/> <file class="mail-compose_fileselector" statustext="Select file to attach to message" multiple='true' progress='mailUploadProgress' onFinish="app.mail.uploadForCompose" id="uploadForCompose" drop_target ="mailUploadSection"/>
<textbox class="mail-index_quotaDisplayNone" readonly="true" id="serverID"/> <description class="$cont[noSaveAsAvailable]" value="Save:"/>
</hbox> <hbox class="$cont[noInfologAvailable]">
<hbox class="et2_toolbar ui-widget-header ui-corner-all mail-compose_toolbar"> <image class="et2_button ui-button et2_button_icon" label="Save as infolog on send" src="infolog/navbar" no_lang="1"/>
<button class="et2_button ui-button mail-compose_button" label="Send" id="button[send]"/> <checkbox statustext="check to save as infolog on send" id="to_infolog" options="on,off"/>
<buttononly class="et2_button ui-button" label="Save as Draft" value="saveAsDraft" id="button[saveAsDraft]" image="fileexport" onclick="app.mail.saveAsDraft"/> </hbox>
<buttononly class="et2_button ui-button" label="Save as Draft and Print" value="saveAsDraftAndPrint" id="button[saveAsDraftAndPrint]" image="print" onclick="app.mail.saveAsDraftAndPrint"/> <hbox class="$cont[noTrackerAvailable]">
<vfs-select class="$cont[vfsNotAvailable]" id="selectFromVFSForCompose" onchange="app.mail.vfsUploadForCompose"/> <image class="et2_button ui-button et2_button_icon" label="Save as tracker on send" src="tracker/navbar" no_lang="1"/>
<file class="mail-compose_fileselector" statustext="Select file to attach to message" multiple='true' progress='mailUploadProgress' onFinish="app.mail.uploadForCompose" id="uploadForCompose" drop_target ="mailUploadSection"/> <checkbox statustext="check to save as trackerentry on send" id="to_tracker" options="on,off"/>
<description class="$cont[noSaveAsAvailable]" value="Save:"/> </hbox>
<hbox class="$cont[noInfologAvailable]"> <description value="Recieve notification"/>
<image class="et2_button ui-button et2_button_icon" label="Save as infolog on send" src="infolog/navbar" no_lang="1"/> <checkbox statustext="check to recieve a notification when the message is read (note: not all clients support this and/or the reciever may not authorize the notification)" id="disposition" options="$cont[disposition]"/>
<checkbox statustext="check to save as infolog on send" id="to_infolog" options="on,off"/> <description value="Priority"/>
<menulist>
<menupopup id="priority"/>
</menulist>
</hbox> </hbox>
<hbox class="$cont[noTrackerAvailable]"> <grid width="100%">
<image class="et2_button ui-button et2_button_icon" label="Save as tracker on send" src="tracker/navbar" no_lang="1"/> <columns>
<checkbox statustext="check to save as trackerentry on send" id="to_tracker" options="on,off"/> <column widtd="10%"/>
</hbox> <column width="42%" />
<description value="Recieve notification"/> <column width="42%"/>
<checkbox statustext="check to recieve a notification when the message is read (note: not all clients support this and/or the reciever may not authorize the notification)" id="disposition" options="$cont[disposition]"/> <column width="6%"/>
<description value="Priority"/> </columns>
<menulist> <rows>
<menupopup id="priority"/> <row class="mailComposeHeaders" >
</menulist> <description value="From"/>
</hbox> <hbox>
<hbox class="mailComposeHeaders" width="99%"> <menulist>
<description value="To"/> <menupopup id="mailaccount" onchange="app.mail.submitOnChange"/>
<taglist-email id="to" width="88%" onclick="app.mail.address_click" include_lists="true"/> </menulist>
</hbox> <textbox class="mail-index_quotaDisplayNone" readonly="true" id="composeID"/>
<hbox class="mailComposeHeaders" width="99%"> <textbox class="mail-index_quotaDisplayNone" readonly="true" id="serverID"/>
<description value="Cc"/> </hbox>
<taglist-email id="cc" width="88%" onclick="app.mail.address_click" include_lists="true"/> <taglist-email id="replyto" empty_label="Reply to" width="100%" maxSelection="1" onclick="app.mail.address_click"/>
</hbox> <description/>
<hbox class="mailComposeHeaders" width="99%"> </row>
<description value="Bcc"/> <row class="mailComposeHeaders" >
<taglist-email id="bcc" width="88%" onclick="app.mail.address_click" include_lists="true"/> <description value="To"/>
</hbox> <taglist-email id="to" width="100%" onclick="app.mail.address_click" include_lists="true" span="2"/>
<hbox class="mailComposeHeaders" width="99%"> <hbox>
<description value="Reply To"/> <description id="cc_expander" value="Cc" onclick="app.mail.compose_cc_expander"/>
<taglist-email id="replyto" width="88%" maxSelection="1" onclick="app.mail.address_click"/> <description id="bcc_expander" value="Bcc" onclick="app.mail.compose_cc_expander"/>
</hbox> </hbox>
<hbox class="mailComposeHeaders" width="99%"> </row>
<description value="Store to Folder"/> <row class="mailComposeHeaders mailComposeJQueryCc">
<taglist id="folder" width="88%" autocomplete_url='mail.mail_compose.ajax_searchFolder' autocomplete_params='' allowFreeEntries="false" onclick="app.mail.address_click"/> <description value="Cc"/>
</hbox> <taglist-email id="cc" width="100%" onclick="app.mail.address_click" include_lists="true" span="2"/>
<hbox class="mailComposeHeaders" width="99%"> <taglist id="folder" empty_label="Folder" autocomplete_url='mail.mail_compose.ajax_searchFolder' autocomplete_params='' allowFreeEntries="false" onclick="app.mail.address_click"/>
<description value="Subject"/> </row>
<textbox align="left" width="88%" id="subject"/> <row class="mailComposeHeaders mailComposeJQueryBcc">
</hbox> <description value="Bcc"/>
<hbox class="mail_Composeicons"> <taglist-email id="bcc" width="100%" onclick="app.mail.address_click" include_lists="true" span="2"/>
<html id="mail_composeicons"/> </row>
</hbox> <row class="mailComposeHeaders">
</vbox> <description value="Subject"/>
<vbox class="mailComposeBodySection" width="99%"> <textbox align="left" width="100%" id="subject" span="2"/>
<hbox disabled="@is_plain" class="mailComposeBody"> <checkbox statustext="Change editor type" label="HTML" id="mimeType" onchange="app.mail.submitOnChange" options=",, ,disable"/>
<htmlarea span="all" name="mail_htmltext" id="mail_htmltext" expand_toolbar="true" height="320px" width="100%" /> </row>
</hbox> <row>
<hbox disabled="@is_html" class="mailComposeBody"> <description/>
<textbox multiline="true" rows="15" cols="120" width="99%" span="all" name="mail_plaintext" id="mail_plaintext"/> <hbox class="mail_Composeicons">
</hbox> <html id="mail_composeicons"/>
<groupbox class="mailSignature"> </hbox>
<menulist> </row>
<menupopup id="signatureid" onchange="app.mail.submitOnChange"/> </rows>
</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"/>
<box class="mailUploadProgress" id="mailUploadProgress" width="97%"/>
<grid disabled="@no_griddata" id="attachments" width="100%" maxheight="165" overflow="auto">
<columns>
<column disabled="!@showtempname"/>
<column width="50%" />
<column width="25%" />
<column width="15%"/>
<column />
</columns>
<rows>
<row >
<description id="${row}[tmp_name]" />
<description id="${row}[name]" />
<description id="${row}[type]" />
<description align="right" id="${row}[size]" />
<button id="delete[$row_cont[tmp_name]]" value="Delete" image="delete" />
</row>
</rows>
</grid> </grid>
</vbox>
<vbox class="mailComposeBodySection" width="99%">
<hbox disabled="@is_plain" class="mailComposeBody">
<htmlarea span="all" name="mail_htmltext" id="mail_htmltext" expand_toolbar="true" height="320px" width="100%" />
</hbox>
<hbox disabled="@is_html" class="mailComposeBody">
<textbox multiline="true" rows="15" cols="120" width="99%" span="all" name="mail_plaintext" id="mail_plaintext"/>
</hbox>
<groupbox class="mailSignature">
<menulist>
<menupopup id="signatureid" onchange="app.mail.submitOnChange"/>
</menulist>
<description value=" "/>
</groupbox>
<groupbox class="et2_file mailUploadSection">
<caption label="Files"/>
<box class="mailUploadProgress" id="mailUploadProgress" width="97%"/>
<grid disabled="@no_griddata" id="attachments" width="100%" maxheight="165" overflow="auto">
<columns>
<column disabled="!@showtempname"/>
<column width="50%" />
<column width="25%" />
<column width="15%"/>
<column />
</columns>
<rows>
<row >
<description id="${row}[tmp_name]" />
<description id="${row}[name]" />
<description id="${row}[type]" />
<description align="right" id="${row}[size]" />
<button id="delete[$row_cont[tmp_name]]" value="Delete" image="delete" />
</row>
</rows>
</grid>
</groupbox> </groupbox>
</vbox> </vbox>
</template> </template>
</overlay> </overlay>