From e8b6e726f6e023a46e23c982ba7b3f76f0b657cb Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Sat, 26 Mar 2016 09:02:57 -0400 Subject: [PATCH] Add message menu with viewsource and edit actions in message/rfc822 preview --- skins/larry/templates/messagepart.html | 10 ++++++++++ program/lib/Roundcube/rcube_message.php | 2 +- program/steps/mail/viewsource.inc | 19 ++++++++++++++++--- program/js/app.js | 3 ++- program/steps/mail/headers.inc | 2 +- skins/classic/templates/messagepart.html | 9 +++++++++ 6 files changed, 39 insertions(+), 6 deletions(-) diff --git a/program/js/app.js b/program/js/app.js index 75560e7..72c0b03 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -342,7 +342,8 @@ else if (this.env.action == 'get') { this.enable_command('download', 'print', true); if (this.env.is_message) { - this.enable_command('reply', 'reply-all', 'forward', 'forward-inline', 'forward-attachment', true); + this.enable_command('reply', 'reply-all', 'edit', 'viewsource', + 'forward', 'forward-inline', 'forward-attachment', true); if (this.env.list_post) this.enable_command('reply-list', true); } diff --git a/program/lib/Roundcube/rcube_message.php b/program/lib/Roundcube/rcube_message.php index 9e4e1d2..c021d58 100644 --- a/program/lib/Roundcube/rcube_message.php +++ b/program/lib/Roundcube/rcube_message.php @@ -176,7 +176,7 @@ * Get content of a specific part of this message * * @param string $mime_id Part MIME-ID - * @param resource $fp File pointer to save the message part + * @param resource $fp File pointer to save the message part * @param boolean $skip_charset_conv Disables charset conversion * @param int $max_bytes Only read this number of bytes * @param boolean $formatted Enables formatting of text/* parts bodies diff --git a/program/steps/mail/headers.inc b/program/steps/mail/headers.inc index 174a5e8..17a471e 100644 --- a/program/steps/mail/headers.inc +++ b/program/steps/mail/headers.inc @@ -22,7 +22,7 @@ if ($uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST)) { if ($pos = strpos($uid, '.')) { $message = new rcube_message($uid); - $source = $message->get_part_content(substr($uid, $pos + 1)); + $source = $message->get_part_body(substr($uid, $pos + 1)); $source = substr($source, 0, strpos($source, "\r\n\r\n")); } else { diff --git a/program/steps/mail/viewsource.inc b/program/steps/mail/viewsource.inc index 1e1fe26..6dab45c 100644 --- a/program/steps/mail/viewsource.inc +++ b/program/steps/mail/viewsource.inc @@ -5,7 +5,7 @@ | program/steps/mail/viewsource.inc | | | | This file is part of the Roundcube Webmail client | - | Copyright (C) 2005-2013, The Roundcube Dev Team | + | Copyright (C) 2005-2016, The Roundcube Dev Team | | | | Licensed under the GNU General Public License version 3 or | | any later version with exceptions for skins & plugins. | @@ -27,7 +27,15 @@ // similar code as in program/steps/mail/get.inc if ($uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET)) { - $headers = $RCMAIL->storage->get_message_headers($uid); + if ($pos = strpos($uid, '.')) { + $message = new rcube_message($uid); + $headers = $message->headers; + $part_id = substr($uid, $pos + 1); + } + else { + $headers = $RCMAIL->storage->get_message_headers($uid); + } + $charset = $headers->charset ?: $RCMAIL->config->get('default_charset'); header("Content-Type: text/plain; charset={$charset}"); @@ -46,7 +54,12 @@ header("Content-Disposition: attachment; filename=\"$filename\""); } - $RCMAIL->storage->print_raw_body($uid, empty($_GET['_save'])); + if (isset($message)) { + $message->get_part_body($part_id, empty($_GET['_save']), 0, -1); + } + else { + $RCMAIL->storage->print_raw_body($uid, empty($_GET['_save'])); + } } else { rcube::raise_error(array( diff --git a/skins/classic/templates/messagepart.html b/skins/classic/templates/messagepart.html index fe5a380..72653c1 100644 --- a/skins/classic/templates/messagepart.html +++ b/skins/classic/templates/messagepart.html @@ -28,6 +28,7 @@ <roundcube:button command="forward" type="link" class="buttonPas forward" classAct="button forward" classSel="button forwardSel" title="forwardmessage" content=" " /> <span id="forwardmenulink" onclick="rcmail_ui.show_popup('forwardmenu');return false"></span> </span> + <roundcube:button name="messagemenulink" id="messagemenulink" type="link" class="button messagemenu" title="moreactions" onclick="rcmail_ui.show_popup('messagemenu');return false" content=" " /> <roundcube:endif /> </div> @@ -59,6 +60,14 @@ <roundcube:container name="replyallmenu" id="replyallmenumenu" /> </ul> </div> + +<div id="messagemenu" class="popupmenu"> + <ul class="toolbarmenu" id="messagemenumenu"> + <roundcube:button type="link-menuitem" class="editlink" command="edit" prop="new" label="editasnew" classAct="editlink active" /> + <roundcube:button type="link-menuitem" class="sourcelink" command="viewsource" label="viewsource" classAct="sourcelink active" /> + <roundcube:container name="messagemenu" id="messagemenumenu" /> + </ul> +</div> <roundcube:endif /> <script type="text/javascript"> diff --git a/skins/larry/templates/messagepart.html b/skins/larry/templates/messagepart.html index e9e7cc0..ccc1d9f 100644 --- a/skins/larry/templates/messagepart.html +++ b/skins/larry/templates/messagepart.html @@ -28,6 +28,7 @@ <roundcube:button command="forward" type="link" class="button forward disabled" classAct="button forward" classSel="button forward pressed" label="forward" title="forwardmessage" /> <a href="#forward" class="dropbuttontip" id="forwardmenulink" onclick="UI.toggle_popup('forwardmenu',event);return false" aria-haspopup="true" aria-expanded="false" aria-owns="forwardmenu-menu" tabindex="0">Forwarding options</a> </span> + <roundcube:button name="messagemenulink" id="messagemenulink" type="link" class="button more" label="more" title="moreactions" onclick="UI.toggle_popup('messagemenu',event);return false" aria-haspopup="true" aria-expanded="false" aria-owns="messagemenu-menu" /> <roundcube:endif /> </div> @@ -68,6 +69,15 @@ <roundcube:container name="replyallmenu" id="replyallmenu-menu" /> </ul> </div> + +<div id="messagemenu" class="popupmenu" aria-hidden="true"> + <h3 id="aria-label-messagemenu" class="voice"><roundcube:label name="arialabelmoremessageactions" /></h3> + <ul id="messagemenu-menu" class="toolbarmenu iconized" role="menu" aria-labelledby="aria-label-messagemenu"> + <roundcube:button type="link-menuitem" command="edit" prop="new" label="editasnew" class="icon" classAct="icon active" innerclass="icon edit" /> + <roundcube:button type="link-menuitem" command="viewsource" label="viewsource" class="icon" classAct="icon active" innerclass="icon viewsource" /> + <roundcube:container name="messagemenu" id="messagemenu-menu" /> + </ul> +</div> <roundcube:endif /> <roundcube:include file="/includes/footer.html" /> -- Gitblit v1.9.1