Bug 1162147 - "View Pocket List" menuitem should be at top of bookmarks menu. r=jaws, a=dolske
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -402,16 +402,19 @@
if (!this.parentNode._placesView)
new PlacesMenu(event, 'place:folder=BOOKMARKS_MENU');"
tooltip="bhTooltip" popupsinherittooltip="true">
<menuitem id="bookmarksShowAll"
label="&showAllBookmarks2.label;"
command="Browser:ShowAllBookmarks"
key="manBookmarkKb"/>
<menuseparator id="organizeBookmarksSeparator"/>
+ <menuitem id="menu_pocket" label="&pocketMenuitem.label;"
+ oncommand="openUILink(Pocket.listURL, event);"/>
+ <menuseparator id="menu_pocketSeparator"/>
<menuitem id="menu_bookmarkThisPage"
command="Browser:AddBookmarkAs"
observes="bookmarkThisPageBroadcaster"
key="addBookmarkAsKb"/>
<menuitem id="subscribeToPageMenuitem"
#ifndef XP_MACOSX
class="menuitem-iconic"
#endif
@@ -467,19 +470,16 @@
<menuitem id="viewReadingListSidebar" class="subviewbutton"
oncommand="SidebarUI.toggle('readingListSidebar');"
label="&readingList.showSidebar.label;">
<observes element="readingListSidebar" attribute="checked"/>
</menuitem>
</menupopup>
</menu>
#endif
- <menuseparator id="menu_pocketSeparator"/>
- <menuitem id="menu_pocket" label="&pocketMenuitem.label;"
- oncommand="openUILink(Pocket.listURL, event);"/>
<menuseparator id="bookmarksMenuItemsSeparator"/>
<!-- Bookmarks menu items -->
<menuseparator builder="end"
class="hide-if-empty-places-result"/>
<menuitem id="menu_unsortedBookmarks"
label="&unsortedBookmarksCmd.label;"
oncommand="PlacesCommandHook.showPlacesOrganizer('UnfiledBookmarks');"/>
</menupopup>
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -894,16 +894,21 @@
</menuitem>
<!-- NB: temporary solution for bug 985024, this should go away soon. -->
<menuitem id="BMB_bookmarksShowAllTop"
class="menuitem-iconic subviewbutton"
label="&showAllBookmarks2.label;"
command="Browser:ShowAllBookmarks"
key="manBookmarkKb"/>
<menuseparator/>
+ <menuitem id="BMB_pocket"
+ class="menuitem-iconic bookmark-item subviewbutton"
+ label="&pocketMenuitem.label;"
+ oncommand="openUILink(Pocket.listURL, event);"/>
+ <menuseparator id="BMB_pocketSeparator"/>
<menuitem id="BMB_subscribeToPageMenuitem"
#ifndef XP_MACOSX
class="menuitem-iconic subviewbutton"
#else
class="subviewbutton"
#endif
label="&subscribeToPageMenuitem.label;"
oncommand="return FeedHandler.subscribeToFeed(null, event);"
@@ -965,21 +970,16 @@
<menupopup id="BMB_readingListPopup"
placespopup="true"
onpopupshowing="ReadingListUI.onReadingListPopupShowing(this);">
<menuitem id="BMB_viewReadingListSidebar" class="subviewbutton"
oncommand="SidebarUI.show('readingListSidebar');"
label="&readingList.showSidebar.label;"/>
</menupopup>
</menu>
- <menuseparator id="BMB_pocketSeparator"/>
- <menuitem id="BMB_pocket"
- class="menuitem-iconic bookmark-item subviewbutton"
- label="&pocketMenuitem.label;"
- oncommand="openUILink(Pocket.listURL, event);"/>
<menuseparator/>
<!-- Bookmarks menu items will go here -->
<menuitem id="BMB_bookmarksShowAll"
class="subviewbutton panel-subview-footer"
label="&showAllBookmarks2.label;"
command="Browser:ShowAllBookmarks"
key="manBookmarkKb"/>
</menupopup>