Bug 470048 - feed and "popup blocked" button cleanup. r=gavin

browser/base/content/browser.css

@@ -31,14 +31,14 @@ toolbar[printpreview="true"] {
   display: none;
 }
 
-#feed-button > .button-box > .box-inherit > .button-text {
+#feed-button > .button-box > .box-inherit > .button-text,
+#feed-button > .button-box > .button-menu-dropmarker {
   display: none;
 }
 
 #urlbar[pageproxystate="invalid"] > #urlbar-icons > :not(#go-button) ,
 #urlbar[pageproxystate="valid"] > #urlbar-icons > #go-button ,
-#urlbar[empty="true"] > #urlbar-icons > #go-button,
-#feed-button:not([feeds]) {
+#urlbar[empty="true"] > #urlbar-icons > #go-button {
   visibility: collapse;
 }
 

browser/base/content/browser.js

@@ -333,12 +333,12 @@ const gPopupBlockerObserver = {
 
     if (!gBrowser.pageReport) {
       // Hide the popup blocker statusbar button
-      this._reportButton.removeAttribute("blocked");
+      this._reportButton.hidden = true;
 
       return;
     }
 
-    this._reportButton.setAttribute("blocked", true);
+    this._reportButton.hidden = false;
 
     // Only show the notification again if we've not already shown it. Since
     // notifications are per-browser, we don't need to worry about re-adding
@@ -6103,20 +6103,15 @@ var FeedHandler = {
     var feeds = gBrowser.mCurrentBrowser.feeds;
     if (!feeds || feeds.length == 0) {
       if (feedButton) {
-        feedButton.removeAttribute("feeds");
+        feedButton.collapsed = true;
         feedButton.removeAttribute("feed");
-        feedButton.setAttribute("tooltiptext", 
-                                gNavigatorBundle.getString("feedNoFeeds"));
       }
       this._feedMenuitem.setAttribute("disabled", "true");
       this._feedMenupopup.setAttribute("hidden", "true");
       this._feedMenuitem.removeAttribute("hidden");
     } else {
-      if (feedButton) {
-        feedButton.setAttribute("feeds", "true");
-        feedButton.setAttribute("tooltiptext", 
-                                gNavigatorBundle.getString("feedHasFeedsNew"));
-      }
+      if (feedButton)
+        feedButton.collapsed = false;
       
       if (feeds.length > 1) {
         this._feedMenuitem.setAttribute("hidden", "true");
@@ -6152,11 +6147,8 @@ var FeedHandler = {
       browserForLink.feeds = feeds;
       if (browserForLink == gBrowser || browserForLink == gBrowser.mCurrentBrowser) {
         var feedButton = document.getElementById("feed-button");
-        if (feedButton) {
-          feedButton.setAttribute("feeds", "true");
-          feedButton.setAttribute("tooltiptext", 
-                                  gNavigatorBundle.getString("feedHasFeedsNew"));
-        }
+        if (feedButton)
+          feedButton.collapsed = false;
       }
     }
   }

browser/base/content/browser.xul

@@ -397,6 +397,8 @@
                     class="plain urlbar-icon"
                     id="feed-button"
                     chromedir="&locale.dir;"
+                    collapsed="true"
+                    tooltiptext="&feedButton.tooltip;"
                     onclick="return FeedHandler.onFeedButtonClick(event);">
               <menupopup position="after_end"
                          onpopupshowing="return FeedHandler.buildFeedList(this);"
@@ -573,6 +575,7 @@
                       ondblclick="if (event.button == 0) displaySecurityInfo();"/>
       <statusbarpanel id="page-report-button" type="menu"
                       class="statusbarpanel-menu-iconic"
+                      hidden="true"
                       tooltiptext="&pageReportIcon.tooltip;">
         <menupopup onpopupshowing="gPopupBlockerObserver.fillPopupList(event);">
           <menuitem observes="blockedPopupAllowSite"/>

browser/base/content/pageReportFirstTime.xul

@@ -64,7 +64,7 @@
   <hbox pack="center">
     <statusbar style="width:20em">
       <statusbarpanel flex="1" pack="left"><description>&done.label;</description></statusbarpanel>
-      <statusbarpanel class="statusbarpanel-iconic" style="min-height:18px" id="page-report-button" blocked="true"/>
+      <statusbarpanel class="statusbarpanel-iconic" style="min-height:18px" id="page-report-button"/>
     </statusbar>
   </hbox>
 

browser/locales/en-US/chrome/browser/browser.dtd

@@ -88,6 +88,7 @@
 <!ENTITY stopCmd.macCommandKey        ".">
 <!ENTITY stopButton.tooltip           "Stop loading this page">
 <!ENTITY goEndCap.tooltip             "Go to the address in the Location Bar">
+<!ENTITY feedButton.tooltip           "Subscribe to this page…">
 <!ENTITY printButton.label            "Print">
 <!ENTITY printButton.tooltip          "Print this page">
 

browser/locales/en-US/chrome/browser/browser.properties

@@ -73,9 +73,7 @@ updatesItem_pending=Apply Downloaded Update Now…
 updatesItem_pendingFallback=Apply Downloaded Update Now…
 
 # RSS Pretty Print
-feedNoFeeds=Page has no feeds
 feedShowFeedNew=Subscribe to '%S'…
-feedHasFeedsNew=Subscribe to this page…
 
 # History menu
 menuOpenAllInTabs.label=Open All in Tabs

browser/themes/gnomestripe/browser/browser.css

@@ -986,10 +986,6 @@ toolbar[iconsize="small"] #paste-button[disabled="true"] {
   background-color: transparent;
 }
 
-#feed-button > .button-box > .button-menu-dropmarker {
-  display: none;
-}
-
 #feed-button {
   -moz-appearance: none; 
   min-width: 0px; 
@@ -1125,14 +1121,8 @@ statusbarpanel#statusbar-display {
 }
 
 #page-report-button {
-  list-style-image: none;
-  width: 20px;
-  display: none;
-}
-
-#page-report-button[blocked] {
   list-style-image: url("chrome://browser/skin/Info.png");
-  display: -moz-box;
+  width: 20px;
 }
 
 /* Throbber */

browser/themes/pinstripe/browser/browser.css

@@ -983,7 +983,7 @@ richlistitem[selected="true"][current="true"] > hbox > .ac-result-type-bookmark,
 /* STAR BUTTON */
 #star-button {
   padding: 1px;
-  -moz-padding-start: 4px !important;
+  -moz-padding-start: 4px;
   list-style-image: url("chrome://browser/skin/places/star-icons.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px);  
 }
@@ -1434,21 +1434,12 @@ sidebarheader > .tabs-closebutton > .toolbarbutton-text {
 /* ----- PAGE REPORT DISPLAY ----- */
 
 #page-report-button {
-  display: none;
-}
-
-#page-report-button[blocked] {
-  display: -moz-box;
   list-style-image: url("chrome://browser/skin/Popup-blocked.png");
   padding: 0px 3px 0px 3px;
 }
 
 /* ----- FEED CONTENT DISPLAY ---- */
 
-#feed-button > .button-box > .button-menu-dropmarker {
-  display: none;
-}
-
 #feed-button {
   -moz-appearance: none; 
   min-width: 0;

browser/themes/winstripe/browser/browser.css

@@ -1261,14 +1261,8 @@ statusbarpanel#statusbar-display {
 }
 
 #page-report-button {
-  list-style-image: none;
   width: 20px;
-  display: none;
-}
-
-#page-report-button[blocked] {
   list-style-image: url("chrome://browser/skin/Info.png");
-  display: -moz-box;
 }
 
 /* ::::: throbber ::::: */
@@ -1663,10 +1657,6 @@ toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-text {
   background-color: transparent;
 }
 
-#feed-button > .button-box > .button-menu-dropmarker {
-  display: none;
-}
-
 #feed-button {
   -moz-appearance: none; 
   min-width: 0px;