bug 450205 - Hide feed discovery UI for SeaMonkey 2.0a1 (release only)
authorJustin Wood <bugspam.Callek@gmail.com>
Thu, 25 Sep 2008 00:31:07 +0200
changeset 426 03197e388cfd25df2b8ab786b460ee0af5eb513c
parent 425 c794f257143c648d6ece4e14fcfc6215e3e53dd6
child 427 474f19a1b5fccec46bbeeeacd6f3cd368f3543a4
push idunknown
push userunknown
push dateunknown
bugs450205
bug 450205 - Hide feed discovery UI for SeaMonkey 2.0a1 (release only)
suite/browser/linkToolbarOverlay.xul
suite/browser/navigator.xul
suite/browser/navigatorOverlay.xul
suite/browser/pageinfo/feeds.xml
suite/locales/en-US/chrome/browser/linkToolbar.dtd
--- a/suite/browser/linkToolbarOverlay.xul
+++ b/suite/browser/linkToolbarOverlay.xul
@@ -193,14 +193,14 @@
           <menuseparator collapsed="true" id="misc-separator" />
 
         </menupopup>
       </toolbarbutton>
 
       <toolbarbutton id="link-feed" class="bookmark-item"
           type="menu"
           container="true"
-          label="&feedButton.label;" disabled="true">
+          label="&feedButton.labelTemp;" disabled="true">
         <menupopup id="link-feed-popup"/>
       </toolbarbutton>
     </toolbar>
   </toolbox>
 </overlay>
--- a/suite/browser/navigator.xul
+++ b/suite/browser/navigator.xul
@@ -198,17 +198,17 @@
                    ondraggesture="PageProxyDragGesture(event);"
                    onload="this.parentNode.selectedIndex = 1;
                            event.stopPropagation();
                            HandleBookmarkIcon(this.src, true);"
                    onerror="gBrowser.addToMissedIconCache(this.src); HandleBookmarkIcon(this.src, false);"
                    tooltiptext="&proxyIcon.tooltip;"/>
           </deck>
           <hbox id="urlbar-icons">
-            <image id="feedsButton" hidden="true" popup="feedsPopup"/>
+            <image id="feedsButton" hidden="true" popup="feedsPopup" style="display: none !important"/>
           </hbox>
           <menupopup id="ubhist-popup" class="autocomplete-history-popup"
                      popupalign="topleft" popupanchor="bottomleft"
                      onpopupshowing="createUBHistoryMenu(event.target);" 
                      oncommand="executeUrlBarHistoryCommand(event.target);"/>
         </textbox>
 
         <button id="go-button" class="button-toolbar chromeclass-location"
--- a/suite/browser/navigatorOverlay.xul
+++ b/suite/browser/navigatorOverlay.xul
@@ -487,21 +487,22 @@
                  context="bookmarks-context-menu"
                  onpopupshowing="updateGroupmarkCommand();">
         <menuitem key="addBookmarkKb"   command="Browser:AddBookmark"/>
         <menuitem key="addBookmarkAsKb" command="Browser:AddBookmarkAs"/>
         <menuitem                       command="Browser:AddGroupmarkAs"/>
         <menuitem key="manBookmarkKb"   command="Browser:ManageBookmark"/>
         <menuseparator/>
         <menu id="feedsMenu" class="menu-iconic" disabled="true"
-              label="&feedsMenu.label;" accesskey="&feedsMenu.accesskey;">
+              label="&feedsMenu.label;" accesskey="&feedsMenu.accesskey;"
+              style="display: none !important">
           <menupopup onpopupshowing="window.XULBrowserWindow.populateFeeds(this);"
                      oncommand="loadURI(event.target.statusText, gBrowser.currentURI);"/>
         </menu>
-        <menuseparator/>
+        <menuseparator style="display: none !important"/>
       </menupopup>
     </menu>
       
   <menu id="tasksMenu">
     <menupopup id="taskPopup">
       <menuitem id="menu_searchWeb" label="&searchInternetCmd.label;" key="searchInternetKb" accesskey="&searchInternetCmd.accesskey;" command="Browser:SearchInternet"/>
       <menuitem id="menu_translate" label="&translateMenu.label;" accesskey="&translateMenu.accesskey;" oncommand="Translate();"/>  
       <menuseparator id="navBeginGlobalItems"/>
--- a/suite/browser/pageinfo/feeds.xml
+++ b/suite/browser/pageinfo/feeds.xml
@@ -51,17 +51,17 @@
     <content>
       <xul:vbox flex="1">
         <xul:hbox flex="1">
           <xul:textbox flex="1" readonly="true" xbl:inherits="value=name"
                        class="feedTitle"/>
           <xul:label xbl:inherits="value=type"/>
         </xul:hbox>
         <xul:textbox xbl:inherits="value=feedURL" readonly="true"/>
-        <xul:hbox flex="1" class="feed-subscribe">
+        <xul:hbox flex="1" class="feed-subscribe" style="display: none !important">
           <xul:spacer flex="1"/>
           <xul:button label="&feedSubscribe;" accesskey="&feedSubscribe.accesskey;"
                       oncommand="onSubscribeFeed()"/>
         </xul:hbox>
       </xul:vbox>
     </content>
   </binding>
 </bindings>
--- a/suite/locales/en-US/chrome/browser/linkToolbar.dtd
+++ b/suite/locales/en-US/chrome/browser/linkToolbar.dtd
@@ -73,9 +73,11 @@
 
 <!ENTITY authorButton.label "Author(s)">
 <!ENTITY copyrightButton.label "Copyright">
 
 <!ENTITY bookmarkButton.label "Bookmarks">
 
 <!ENTITY alternateButton.label "Other Versions">
 
-<!ENTITY feedButton.label "Subscribe">
+<!-- XXXCallek Disabling for alpha release only -->
+<!--<!ENTITY feedButton.label "Subscribe">-->
+<!ENTITY feedButton.labelTemp "Feeds">