From fa22645e765b700a6a95243b2699f0d1c933468e Mon Sep 17 00:00:00 2001
From: Harald Kirschner <hkirschner@mozilla.com>
Date: Tue, 30 Oct 2012 10:25:17 -0700
Subject: [PATCH 1/2]  - Moving menu item from tools in web developer (fixing
 #32)  - Removing Install Page menu

---
 addon/lib/main.js | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/addon/lib/main.js b/addon/lib/main.js
index 45efd732..f1fba36a 100644
--- a/addon/lib/main.js
+++ b/addon/lib/main.js
@@ -558,9 +558,19 @@ ContextMenu.Item({
 });
 
 Menuitems.Menuitem({
-  id: "hamB2GerHelper",
-  menuid: "menu_ToolsPopup",
-  insertbefore: "sanitizeSeparator",
+  id: "webdevB2GSimulatorHelper",
+  menuid: "menuWebDeveloperPopup",
+  insertbefore: "devToolsEndSeparator",
+  label: "Firefox OS Simulator",
+  onCommand: function() {
+    openHelperTab();
+  },
+});
+
+Menuitems.Menuitem({
+  id: "appmenu_webDeveloper_popup",
+  menuid: "appmenu_webDeveloper_popup",
+  insertbefore: "appmenu_devToolsEndSeparator",
   label: "Firefox OS Simulator",
   onCommand: function() {
     openHelperTab();
@@ -577,15 +587,15 @@ Menuitems.Menuitem({
 //   },
 // });
 
-Menuitems.Menuitem({
-  id: "appifyPage",
-  menuid: "menu_ToolsPopup",
-  insertbefore: "sanitizeSeparator",
-  label: "Install Page in FxOS Simulator",
-  onCommand: function() {
-    simulator.addActiveTab();
-  },
-});
+// Menuitems.Menuitem({
+//   id: "appifyPage",
+//   menuid: "menu_ToolsPopup",
+//   insertbefore: "sanitizeSeparator",
+//   label: "Install Page in FxOS Simulator",
+//   onCommand: function() {
+//     simulator.addActiveTab();
+//   },
+// });
 
 function create() {
   let webappsDir = URL.toFilename(Self.data.url("profile/webapps"));

From b43d8cdee823e628fa7bf58d6b2a2c76cc9c62e8 Mon Sep 17 00:00:00 2001
From: Harald Kirschner <hkirschner@mozilla.com>
Date: Tue, 30 Oct 2012 11:34:17 -0700
Subject: [PATCH 2/2] Fixing menu ids.

---
 addon/lib/main.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/lib/main.js b/addon/lib/main.js
index f1fba36a..ed68f60a 100644
--- a/addon/lib/main.js
+++ b/addon/lib/main.js
@@ -558,7 +558,7 @@ ContextMenu.Item({
 });
 
 Menuitems.Menuitem({
-  id: "webdevB2GSimulatorHelper",
+  id: "webdevFxOSSimulatorHelper",
   menuid: "menuWebDeveloperPopup",
   insertbefore: "devToolsEndSeparator",
   label: "Firefox OS Simulator",
@@ -568,7 +568,7 @@ Menuitems.Menuitem({
 });
 
 Menuitems.Menuitem({
-  id: "appmenu_webDeveloper_popup",
+  id: "appmenu_fxossimulator",
   menuid: "appmenu_webDeveloper_popup",
   insertbefore: "appmenu_devToolsEndSeparator",
   label: "Firefox OS Simulator",