Move some more entries into submenus

diff --git a/imp/js/src/DimpBase.js b/imp/js/src/DimpBase.js
index c242c97..a9b2414 100644 (file)
--- a/imp/js/src/DimpBase.js
+++ b/imp/js/src/DimpBase.js
@@ -621,7 +621,10 @@ var DimpBase = {
             break;
 
         case 'ctx_message':
-            [ $('ctx_message_reply_list') ].invoke(this.viewport.createSelection('domid', ctx.id).get('dataob').first().listmsg ? 'show' : 'hide');
+            DimpCore.DMenu.addSubMenu('ctx_message_reply', 'ctx_reply');
+            DimpCore.DMenu.addSubMenu('ctx_message_forward', 'ctx_forward');
+            DimpCore.DMenu.addSubMenu('ctx_message_setflag', 'ctx_flag');
+            DimpCore.DMenu.addSubMenu('ctx_message_clearflag', 'ctx_clearflag');
             break;
 
         case 'ctx_reply':
@@ -634,8 +637,8 @@ var DimpBase = {
 
         case 'ctx_otheractions':
             $('oa_setflag', 'oa_clearflag', 'oa_sep1', 'oa_blacklist', 'oa_whitelist', 'oa_sep2', 'oa_undeleted').compact().invoke(this.viewport.getSelected().size() ? 'show' : 'hide');
-            DimpCore.DMenu.addSubMenu('oa_setflag', 'ctx_otheractions2');
-            DimpCore.DMenu.addSubMenu('oa_clearflag', 'ctx_otheractions3');
+            DimpCore.DMenu.addSubMenu('oa_setflag', 'ctx_flag');
+            DimpCore.DMenu.addSubMenu('oa_clearflag', 'ctx_clearflag');
             break;
         }
         return true;
@@ -1504,19 +1507,6 @@ var DimpBase = {
                 this.renameFolder(DimpCore.DMenu.element());
                 break;
 
-            case 'ctx_message_reply':
-            case 'ctx_message_reply_all':
-            case 'ctx_message_reply_list':
-            case 'ctx_message_forward_all':
-            case 'ctx_message_forward_body':
-            case 'ctx_message_forward_attachments':
-                this.composeMailbox(id.substring(12));
-                break;
-
-            case 'ctx_message_seen':
-            case 'ctx_message_unseen':
-            case 'ctx_message_flagged':
-            case 'ctx_message_clear':
             case 'ctx_message_spam':
             case 'ctx_message_ham':
             case 'ctx_message_blacklist':

diff --git a/imp/templates/index/index-dimp.inc b/imp/templates/index/index-dimp.inc
index 2b75d32..4a25bbd 100644 (file)
--- a/imp/templates/index/index-dimp.inc
+++ b/imp/templates/index/index-dimp.inc
@@ -358,18 +358,12 @@ function _simpleButton($id, $text, $image, $imagedir = null)
 </div>
 
 <div class="context" id="ctx_message" style="display:none">
- <a id="ctx_message_reply"><span class="contextImg replyImg"></span><?php echo _("Reply to Sender") ?></a>
- <a id="ctx_message_reply_all"><span class="contextImg replyallImg"></span><?php echo _("Reply to All") ?></a>
- <a id="ctx_message_reply_list"><span class="contextImg replyallImg"></span><?php echo _("Reply to List") ?></a>
+ <a id="ctx_message_reply"><span class="contextImg replyImg"></span><?php echo _("Reply") ?></a>
  <div class="sep"></div>
- <a id="ctx_message_forward_all"><span class="contextImg forwardImg"></span><?php echo _("Forward Entire Message") ?></a>
- <a id="ctx_message_forward_body"><span class="contextImg forwardImg"></span><?php echo _("Forward Body Text Only") ?></a>
- <a id="ctx_message_forward_attachments"><span class="contextImg forwardImg"></span><?php echo _("Forward Attachments Only") ?></a>
+ <a id="ctx_message_forward"><span class="contextImg forwardImg"></span><?php echo _("Forward") ?></a>
  <div class="sep"></div>
- <a id="ctx_message_seen"><span class="contextImg mailseenImg"></span><?php echo _("Mark as Read") ?></a>
- <a id="ctx_message_unseen"><span class="contextImg mailunseenImg"></span><?php echo _("Mark as New") ?></a>
- <a id="ctx_message_flagged"><span class="contextImg mailflaggedImg"></span><?php echo _("Flag Message") ?></a>
- <a id="ctx_message_clear"><span class="contextImg clearflagImg"></span><?php echo _("Clear Flag") ?></a>
+ <a id="ctx_message_setflag"><span class="contextImg mailflaggedImg"></span><?php echo _("Set Flag") ?></a>
+ <a id="ctx_message_clearflag"><span class="contextImg clearflagImg"></span><?php echo _("Clear Flag") ?></a>
  <div class="sep"></div>
 <?php if (!empty($conf['spam']['reporting'])): ?>
  <a id="ctx_message_spam"><span class="contextImg spamImg"></span><?php echo _("Mark as Spam") ?></a>
@@ -436,12 +430,12 @@ function _simpleButton($id, $text, $image, $imagedir = null)
 <?php endif; ?>
 </div>
 
-<div class="context" id="ctx_otheractions2" style="display:none">
+<div class="context" id="ctx_flag" style="display:none">
  <a id="oa_unseen"><span class="contextImg mailunseenImg"></span><?php echo _("Mark as New") ?></a>
  <a id="oa_flagged"><span class="contextImg mailflaggedImg"></span><?php echo _("Flag Message") ?></a>
 </div>
 
-<div class="context" id="ctx_otheractions3" style="display:none">
+<div class="context" id="ctx_clearflag" style="display:none">
  <a id="oa_seen"><span class="contextImg mailseenImg"></span><?php echo _("Mark as Read") ?></a>
  <a id="oa_clear"><span class="contextImg clearflagImg"></span><?php echo _("Clear Flag") ?></a>
 </div>