Bug 368761 ��� "Report Web Forgery..." in the Help menu should be smarter

patch: show/hide menus in JS and revert css theme changes
r=bryner

browser/components/safebrowsing/content/sb-loader.js

@@ -144,8 +144,13 @@ var safebrowsing = {
     var sbIconElt = document.getElementById("safebrowsing-urlbar-icon");
     var helpMenuElt = document.getElementById("helpMenu");
     var phishLevel = sbIconElt.getAttribute("level");
-    helpMenuElt.setAttribute("phishLevel", phishLevel);
-    
+
+    // Show/hide the appropriate menu item.
+    document.getElementById("menu_HelpPopup_reportPhishingtoolmenu")
+            .hidden = ("safe" != phishLevel);
+    document.getElementById("menu_HelpPopup_reportPhishingErrortoolmenu")
+            .hidden = ("safe" == phishLevel);
+
     var broadcasterId;
     if ("safe" == phishLevel) {
       broadcasterId = "reportPhishingBroadcaster";

browser/themes/pinstripe/browser/browser.css

@@ -1192,15 +1192,6 @@ tabpanels.plain {
 	background-color: #fff !important;
 }
 
-/* ::::: Help menu items ::::: */
-#helpMenu[phishLevel="safe"] #menu_HelpPopup_reportPhishingErrortoolmenu {
-  display: none;
-}
-
-#helpMenu[phishLevel="warn"] #menu_HelpPopup_reportPhishingtoolmenu {
-  display: none;
-}
-
 %ifdef MOZ_PLACES_BOOKMARKS
 #places-bookmark {
   list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png");

browser/themes/winstripe/browser/browser.css

@@ -1334,19 +1334,10 @@ toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-text {
   visibility: collapse;
 }
 
-/* ::::: Help menu items ::::: */
 #checkForUpdates[loading="true"] {
   list-style-image: url("chrome://global/skin/throbber/Throbber-small.gif");
 }
 
-#helpMenu[phishLevel="safe"] #menu_HelpPopup_reportPhishingErrortoolmenu {
-  display: none;
-}
-
-#helpMenu[phishLevel="warn"] #menu_HelpPopup_reportPhishingtoolmenu {
-  display: none;
-}
-
 %ifdef MOZ_PLACES_BOOKMARKS
 #places-bookmark {
   list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png");