From 05c0f1f3fc18c2a52ef69ca8f2c5fc08b894468b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adomas=20Ven=C4=8Dkauskas?= <adomas.ven@gmail.com>
Date: Thu, 11 Feb 2016 09:33:29 +0000
Subject: [PATCH] Closes #905, Move library creation buttons into menu

---
 chrome/content/zotero/zoteroPane.xul   | 8 ++++++--
 chrome/locale/en-US/zotero/zotero.dtd  | 1 +
 chrome/skin/default/zotero/overlay.css | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/chrome/content/zotero/zoteroPane.xul b/chrome/content/zotero/zoteroPane.xul
index 8b9799cd7..cb7661cc1 100644
--- a/chrome/content/zotero/zoteroPane.xul
+++ b/chrome/content/zotero/zoteroPane.xul
@@ -103,8 +103,12 @@
 			<toolbar id="zotero-toolbar" class="toolbar toolbar-primary">
 				<hbox id="zotero-collections-toolbar" align="center">
 					<toolbarbutton id="zotero-tb-collection-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newCollection.label;" command="cmd_zotero_newCollection"/>
-					<toolbarbutton id="zotero-tb-feed-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newFeed.label;" command="cmd_zotero_newFeed"/>
-					<toolbarbutton id="zotero-tb-group-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newGroup;" oncommand="ZoteroPane_Local.newGroup()"/>
+					<toolbarbutton id="zotero-tb-library-add-menu" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newLibrary.label;" type="menu">
+						<menupopup id="zotero-tb-library-add-popup">
+							<menuitem id="zotero-tb-group-add" label="&zotero.toolbar.newGroup;" oncommand="ZoteroPane_Local.newGroup()"/>
+							<menuitem id="zotero-tb-feed-add" label="&zotero.toolbar.newFeed.label;" command="cmd_zotero_newFeed"/>
+						</menupopup>
+					</toolbarbutton>
 					<spacer flex="1"/>
 					<toolbarbutton id="zotero-tb-actions-menu" class="zotero-tb-button" tooltiptext="&zotero.toolbar.actions.label;" type="menu">
 						<menupopup id="zotero-tb-actions-popup">
diff --git a/chrome/locale/en-US/zotero/zotero.dtd b/chrome/locale/en-US/zotero/zotero.dtd
index 989b11bd5..d68c91a7c 100644
--- a/chrome/locale/en-US/zotero/zotero.dtd
+++ b/chrome/locale/en-US/zotero/zotero.dtd
@@ -103,6 +103,7 @@
 <!ENTITY zotero.toolbar.newItemFromPage.label			"Create Web Page Item from Current Page">
 <!ENTITY zotero.toolbar.lookup.label				"Add Item(s) by Identifier">
 <!ENTITY zotero.toolbar.removeItem.label				"Remove Item…">
+<!ENTITY zotero.toolbar.newLibrary.label			"New Library…">
 <!ENTITY zotero.toolbar.newCollection.label			"New Collection…">
 <!ENTITY zotero.toolbar.newFeed.label				"New Feed…">
 <!ENTITY zotero.toolbar.refreshFeed.label			"Refresh Feed">
diff --git a/chrome/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css
index 8d335dab2..f5d726c88 100644
--- a/chrome/skin/default/zotero/overlay.css
+++ b/chrome/skin/default/zotero/overlay.css
@@ -284,12 +284,12 @@
 	list-style-image: url('chrome://zotero/skin/toolbar-collection-add.png');
 }
 
-#zotero-tb-feed-add, .zotero-menuitem-new-feed
+.zotero-menuitem-new-feed
 {
 	list-style-image: url('chrome://zotero/skin/toolbar-feed-add.png');
 }
 
-#zotero-tb-group-add
+#zotero-tb-library-add-menu
 {
 	list-style-image: url('chrome://zotero/skin/group_add.png');
 }