Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

core now allows forwarding multiple messages as attachments (d9f109b56a)

  • Loading branch information...
commit ecc18fa4df2c13b2c513217676d8342d98e882d0 1 parent e070d37
@JohnDoh authored
View
4 contextmenu.js
@@ -3,7 +3,7 @@
*/
rcube_webmail.prototype.contextmenu_command_handlers = new Object();
-rcube_webmail.prototype.contextmenu_disable_multi = new Array('#reply','#reply-all','#reply-list','#forward','#forward-attachment','#print','#edit','#viewsource','#download','#open','#edit');
+rcube_webmail.prototype.contextmenu_disable_multi = new Array('#reply','#reply-all','#reply-list','#forward-inline','#print','#edit','#viewsource','#download','#open','#edit');
function rcm_contextmenu_update() {
//if (!rcmail.env.flag_for_deletion && rcmail.env.trash_mailbox && rcmail.env.mailbox != rcmail.env.trash_mailbox)
@@ -51,7 +51,7 @@ function rcm_contextmenu_init(row) {
case 'reply':
case 'reply-all':
case 'reply-list':
- case 'forward':
+ case 'forward-inline':
case 'forward-attachment':
case 'print':
case 'download':
View
4 contextmenu.php
@@ -84,9 +84,9 @@ public function show_mailbox_menu($args)
$li .= html::tag('li', array('class' => 'submenu replyacts'), html::a(array('href' => "#reply-all", 'class' => 'active'), html::span(null, rcmail::Q($this->gettext('replyall')))) . html::tag('ul', array('class' => 'popupmenu toolbarmenu replyacts'), $lis));
$lis = '';
- $lis .= html::tag('li', array('class' => 'forward'), html::a(array('href' => "#forward", 'class' => 'active'), html::span(null, rcmail::Q($this->gettext('forwardinline')))));
+ $lis .= html::tag('li', array('class' => 'forwardinline'), html::a(array('href' => "#forward-inline", 'class' => 'active'), html::span(null, rcmail::Q($this->gettext('forwardinline')))));
$lis .= html::tag('li', array('class' => 'forwardattachment'), html::a(array('href' => "#forward-attachment", 'class' => 'active'), html::span(null, rcmail::Q($this->gettext('forwardattachment')))));
- $li .= html::tag('li', array('class' => 'submenu forwardacts'), html::a(array('href' => "#forward", 'class' => 'active'), html::span(null, rcmail::Q($this->gettext('forward')))) . html::tag('ul', array('class' => 'popupmenu toolbarmenu forwardacts'), $lis));
+ $li .= html::tag('li', array('class' => 'submenu forwardacts'), html::a(array('href' => "#forward-inline", 'class' => 'active'), html::span(null, rcmail::Q($this->gettext('forward')))) . html::tag('ul', array('class' => 'popupmenu toolbarmenu forwardacts'), $lis));
//$rcmail = rcmail::get_instance();
//if (!$rcmail->config->get('flag_for_deletion', false) && $rcmail->config->get('trash_mbox') && $_SESSION['mbox'] != $rcmail->config->get('trash_mbox'))
View
2  skins/classic/contextmenu.css
@@ -174,7 +174,7 @@
background-position: 7px -119px;
}
-#rcmContextMenu .forward a, #rcmContextMenu .forwardattachment a
+#rcmContextMenu .forwardinline a, #rcmContextMenu .forwardattachment a
{
background-position: 7px -102px;
}
View
2  skins/larry/contextmenu.css
@@ -229,7 +229,7 @@
background-position: 5px -144px;
}
-#rcmContextMenu .forward a span, #rcmContextMenu .forwardattachment a span
+#rcmContextMenu .forwardinline a span, #rcmContextMenu .forwardattachment a span
{
background-position: 5px -167px;
}
Please sign in to comment.
Something went wrong with that request. Please try again.