Bug 1478993 - Move "Edit Template" to top of context menu. r=jorgk, ui-r=Paenglab a=jorgk BETA_60_CONTINUATION
authorThomas Duellmann <bugzilla2007@duellmann24.net>
Fri, 24 Aug 2018 15:25:00 +0200
branchBETA_60_CONTINUATION
changeset 32453 116b05cad1af
parent 32452 6ee14490f62a
child 32454 3631b10bbfed
push id385
push userclokep@gmail.com
push dateTue, 04 Sep 2018 23:26:14 +0000
reviewersjorgk, Paenglab, jorgk
bugs1478993
Bug 1478993 - Move "Edit Template" to top of context menu. r=jorgk, ui-r=Paenglab a=jorgk
mail/base/content/mailWindowOverlay.xul
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -691,16 +691,21 @@
     <menuitem id="mailContext-editDraftMsg"
               label="&contextEditDraftMsg.label;"
               default="true"
               oncommand="MsgEditDraftMessage(event);"/>
     <menuitem id="mailContext-newMsgFromTemplate"
               label="&contextNewMsgFromTemplate.label;"
               default="true"
               oncommand="MsgNewMessageFromTemplate(event);"/>
+    <menuseparator id="mailContext-sep-editTemplate"/>
+    <menuitem id="mailContext-editTemplateMsg"
+              label="&contextEditTemplate.label;"
+              accesskey="&contextEditTemplate.accesskey;"
+              oncommand="MsgEditTemplateMessage(event);"/>
     <menuseparator id="mailContext-sep-open"/>
     <menuitem id="mailContext-media-play"
               label="&contextPlay.label;"
               accesskey="&contextPlay.accesskey;"
               oncommand="gContextMenu.mediaCommand('play');"/>
     <menuitem id="mailContext-media-pause"
               label="&contextPause.label;"
               accesskey="&contextPause.accesskey;"
@@ -763,27 +768,23 @@
                   accesskey="&contextForwardAsAttachmentItem.accesskey;"
                   command="cmd_forwardAttachment"/>
       </menupopup>
     </menu>
     <menuitem id="mailContext-multiForwardAsAttachment"
               label="&contextMultiForwardAsAttachment.label;"
               accesskey="&contextMultiForwardAsAttachment.accesskey;"
               oncommand="MsgForwardAsAttachment(event);"/>
-    <!-- The following two items are not hooked to their commands because we need
-         to enable them even in some cases there is no real selected message yet,
-         only a rightclick on a message. -->
+    <!-- The following item (mailContext-editAsNew) is not hooked to its command
+         because we need to enable it even in some cases there is no real
+         selected message yet, only a rightclick on a message. -->
     <menuitem id="mailContext-editAsNew"
               label="&contextEditMsgAsNew.label;"
               accesskey="&contextEditMsgAsNew.accesskey;"
               oncommand="MsgEditMessageAsNew(event);"/>
-    <menuitem id="mailContext-editTemplateMsg"
-              label="&contextEditTemplate.label;"
-              accesskey="&contextEditTemplate.accesskey;"
-              oncommand="MsgEditTemplateMessage(event);"/>
     <menuseparator id="mailContext-sep-reply"/>
     <menu id="mailContext-tags" label="&tagMenu.label;" accesskey="&tagMenu.accesskey;">
       <menupopup id="mailContext-tagpopup"
                  onpopupshowing="InitMessageTags(this);">
         <menuitem id="mailContext-addNewTag"
                   label="&addNewTag.label;"
                   accesskey="&addNewTag.accesskey;"
                   command="cmd_addTag"/>
@@ -1973,17 +1974,17 @@
                       label="&editDraftMsgCmd.label;"
                       command="cmd_editDraftMsg"/>
             <menuitem id="appmenu_newMsgFromTemplateCmd"
                       label="&newMsgFromTemplateCmd.label;"
                       key="key_newMsgFromTemplate"
                       command="cmd_newMsgFromTemplate"/>
             <menuitem id="appmenu_editTemplateMsgCmd"
                       label="&editTemplateMsgCmd.label;"
-                      command="cmd_editTemplate"/>
+                      command="cmd_editTemplateMsg"/>
             <menuseparator id="appmenu_messageMenuAfterCompositionCommandsSeparator"/>
             <menuitem id="appmenu_openMessageWindowMenuitem"
                       label="&openMessageWindowCmd.label;"
                       key="key_openMessage"
                       command="cmd_openMessage"/>
             <menuitem id="appmenu_openConversationMenuitem"
                       label="&openConversationCmd.label;"
                       key="key_openConversation"