From fb61cdfd9f9e15ea020f849b8b196a2e481b5e93 Mon Sep 17 00:00:00 2001
From: "tony%ponderer.org" <tony%ponderer.org>
Date: Thu, 8 Feb 2007 18:25:31 +0000
Subject: [PATCH] =?UTF-8?q?Bug=20368761=20=EF=BF=BD=EF=BF=BD=EF=BF=BD=20"R?=
 =?UTF-8?q?eport=20Web=20Forgery..."=20in=20the=20Help=20menu=20should=20b?=
 =?UTF-8?q?e=20smarter=20patch:=20show/hide=20menus=20in=20JS=20and=20reve?=
 =?UTF-8?q?rt=20css=20theme=20changes=20r=3Dbryner?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 browser/components/safebrowsing/content/sb-loader.js | 9 +++++++--
 browser/themes/pinstripe/browser/browser.css         | 9 ---------
 browser/themes/winstripe/browser/browser.css         | 9 ---------
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/browser/components/safebrowsing/content/sb-loader.js b/browser/components/safebrowsing/content/sb-loader.js
index 85450cc1cd7e..c0b8b190b1db 100644
--- a/browser/components/safebrowsing/content/sb-loader.js
+++ b/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";
diff --git a/browser/themes/pinstripe/browser/browser.css b/browser/themes/pinstripe/browser/browser.css
index 76531102a398..7211a78f7e37 100755
--- a/browser/themes/pinstripe/browser/browser.css
+++ b/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");
diff --git a/browser/themes/winstripe/browser/browser.css b/browser/themes/winstripe/browser/browser.css
index 3d038bb97968..f6af3dd7e01c 100644
--- a/browser/themes/winstripe/browser/browser.css
+++ b/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");