summaryrefslogtreecommitdiff
path: root/program/steps/mail
diff options
context:
space:
mode:
authorvbenincasa <vbenincasa@gmail.com>2009-10-04 08:16:20 +0000
committervbenincasa <vbenincasa@gmail.com>2009-10-04 08:16:20 +0000
commit3f97120cb1f546f9c7973f11949e37ac1fb23412 (patch)
tree4dca778649b296ba39c247199b34a55fa46ea138 /program/steps/mail
parenta23497f92f378b162f68aea35754aa02d314d4a9 (diff)
- Added an alert message when uploading still in progress and the user tries to send the message
- Added the functionality to abort the upload process - Changed the loading icon background to transparent, so it can be used in other templates easily
Diffstat (limited to 'program/steps/mail')
-rw-r--r--program/steps/mail/compose.inc8
1 files changed, 5 insertions, 3 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index e3c7fda16..c894da776 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -92,9 +92,9 @@ if (!is_array($_SESSION['compose']) || $_SESSION['compose']['id'] != get_input_v
// add some labels to client
-$OUTPUT->add_label('nosubject', 'nosenderwarning', 'norecipientwarning', 'nosubjectwarning',
- 'nobodywarning', 'notsentwarning', 'savingmessage', 'sendingmessage', 'messagesaved',
- 'converting', 'editorwarning', 'searching', 'uploading', 'fileuploaderror');
+$OUTPUT->add_label('nosubject', 'nosenderwarning', 'norecipientwarning', 'nosubjectwarning', 'cancel',
+ 'nobodywarning', 'notsentwarning', 'notuploadedwarning', 'savingmessage', 'sendingmessage',
+ 'messagesaved', 'converting', 'editorwarning', 'searching', 'uploading', 'fileuploaderror');
// add config parameters to client script
if (!empty($CONFIG['drafts_mbox'])) {
@@ -809,6 +809,8 @@ function rcmail_compose_attachment_list($attrib)
if ($attrib['deleteicon'])
$_SESSION['compose']['deleteicon'] = $CONFIG['skin_path'] . $attrib['deleteicon'];
+ if ($attrib['cancelicon'])
+ $OUTPUT->set_env('cancelicon', $CONFIG['skin_path'] . $attrib['cancelicon']);
if ($attrib['loadingicon'])
$OUTPUT->set_env('loadingicon', $CONFIG['skin_path'] . $attrib['loadingicon']);