From 875e9f674f46657a8b6b9a1ddda124e548b0ad66 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 15 Sep 2020 03:30:17 -0400
Subject: [PATCH] Initial tab bar implementation

---
 chrome/content/zotero/components/tabBar.jsx   | 110 ++
 .../content/zotero/standalone/standalone.xul  |  15 +-
 chrome/content/zotero/tabs.js                 | 105 ++
 chrome/content/zotero/zoteroPane.js           |   5 +
 chrome/content/zotero/zoteroPane.xul          | 981 +++++++++---------
 scss/_zotero-react-client.scss                |   2 +
 scss/components/_mainWindow.scss              | 149 +++
 scss/components/_tabsBar.scss                 |  42 +
 scss/mac/_tabsBar.scss                        |   9 +
 scss/zotero-react-client-mac.scss             |   1 +
 10 files changed, 929 insertions(+), 490 deletions(-)
 create mode 100644 chrome/content/zotero/components/tabBar.jsx
 create mode 100644 chrome/content/zotero/tabs.js
 create mode 100644 scss/components/_mainWindow.scss
 create mode 100644 scss/components/_tabsBar.scss
 create mode 100644 scss/mac/_tabsBar.scss

diff --git a/chrome/content/zotero/components/tabBar.jsx b/chrome/content/zotero/components/tabBar.jsx
new file mode 100644
index 0000000000..e88ecabc76
--- /dev/null
+++ b/chrome/content/zotero/components/tabBar.jsx
@@ -0,0 +1,110 @@
+/*
+    ***** BEGIN LICENSE BLOCK *****
+    
+    Copyright © 2020 Corporation for Digital Scholarship
+                     Vienna, Virginia, USA
+                     https://www.zotero.org
+    
+    This file is part of Zotero.
+    
+    Zotero is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    
+    Zotero is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+    
+    You should have received a copy of the GNU Affero General Public License
+    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
+    
+    ***** END LICENSE BLOCK *****
+*/
+
+"use strict";
+
+import React, { forwardRef, useState, useImperativeHandle, useEffect } from 'react';
+import cx from 'classnames';
+
+const TabBar = forwardRef(function (props, ref) {
+	const [tabs, setTabs] = useState(props.initialTabs);
+	const [selectedIndex, setSelectedIndex] = useState(0);
+	
+	useImperativeHandle(ref, () => ({
+		addTab({ title, type }) {
+			var newTabs = [...tabs];
+			newTabs.push({ title, type });
+			setTabs(newTabs);
+			setSelectedIndex(newTabs.length - 1);
+		},
+		
+		renameTab(title, index) {
+			var newTabs = tabs.map((tab, currentIndex) => {
+				let newTab = Object.assign({}, tab);
+				if (index == currentIndex) {
+					newTab.title = title;
+				}
+				return newTab;
+			});
+			setTabs(newTabs);
+		}
+	}));
+	
+	useEffect(() => {
+		if (props.onTabSelected) {
+			props.onTabSelected(selectedIndex);
+		}
+	}, [selectedIndex]);
+	
+	
+	function removeTab(index) {
+		var newTabs = [...tabs];
+		newTabs.splice(index, 1);
+		setTabs(newTabs);
+		setSelectedIndex(selectedIndex - 1);
+		if (props.onTabClosed) {
+			props.onTabClosed(index);
+		}
+	}
+	
+	function handleTabClick(event, index) {
+		setSelectedIndex(index);
+		event.stopPropagation();
+	}
+	
+	function handleTabClose(event, index) {
+		removeTab(index);
+		if (props.onTabClose) {
+			props.onTabClose(index);
+		}
+		event.stopPropagation();
+	}
+	
+	function renderTab(tab, index) {
+		return (
+			<div
+				key={index}
+				className={cx("tab", { selected: index == selectedIndex })}
+				onClick={(event) => handleTabClick(event, index)}
+			>
+				<div className="tab-name">{tab.title}</div>
+				<div
+					className="tab-close"
+					onClick={(event) => handleTabClose(event, index)}
+				>
+					X
+				</div>
+			</div>
+		);
+	}
+	
+	return (
+		<div className="tabs">
+			{ tabs.map((tab, index) => renderTab(tab, index)) }
+        </div>
+	);
+});
+
+export default TabBar;
\ No newline at end of file
diff --git a/chrome/content/zotero/standalone/standalone.xul b/chrome/content/zotero/standalone/standalone.xul
index d6f748d1d4..712511567c 100644
--- a/chrome/content/zotero/standalone/standalone.xul
+++ b/chrome/content/zotero/standalone/standalone.xul
@@ -43,9 +43,13 @@
 
 <window id="main-window"
 				xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+				xmlns:html="http://www.w3.org/1999/xhtml"
 				windowtype="navigator:browser" 
 				title="&brandShortName;"
 				width="1000" height="600"
+				drawintitlebar="true"
+				tabsintitlebar="true"
+				chromemargin="0,-1,-1,-1"
 				persist="screenX screenY width height sizemode">
 	<script type="application/javascript" src="resource://zotero/require.js"/>
 	<script type="application/javascript" src="standalone.js"/>
@@ -111,7 +115,16 @@
 				accesskey="&selectAllCmd.accesskey;"
 				command="cmd_selectAll"/>
 	</menupopup>
-	
+	<vbox id="titlebar">
+		<hbox id="titlebar-buttonbox-container" skipintoolbarset="true">
+			<hbox id="titlebar-buttonbox">
+				<toolbarbutton class="titlebar-button titlebar-min" oncommand="window.minimize();"/>
+				<toolbarbutton class="titlebar-button titlebar-max" oncommand="onTitlebarMaxClick();"/>
+				<toolbarbutton class="titlebar-button titlebar-close" command="cmd_closeWindow"/>
+			</hbox>
+		</hbox>
+	</vbox>
+	<vbox id="tab-bar-container" style="-moz-window-dragging: drag"/>
 	<toolbox id="navigator-toolbox" class="toolbox-top" mode="icons" defaultmode="icons">
 		<!-- Menu -->
 		<toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true"
diff --git a/chrome/content/zotero/tabs.js b/chrome/content/zotero/tabs.js
new file mode 100644
index 0000000000..af07e5fd8d
--- /dev/null
+++ b/chrome/content/zotero/tabs.js
@@ -0,0 +1,105 @@
+/*
+    ***** BEGIN LICENSE BLOCK *****
+    
+    Copyright © 2020 Corporation for Digital Scholarship
+                     Vienna, Virginia, USA
+                     https://www.zotero.org
+    
+    This file is part of Zotero.
+    
+    Zotero is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    
+    Zotero is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+    
+    You should have received a copy of the GNU Affero General Public License
+    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
+    
+    ***** END LICENSE BLOCK *****
+*/
+
+"use strict";
+
+// Using 'import' breaks hooks
+var React = require('react');
+var ReactDOM = require('react-dom');
+import TabBar from 'components/tabBar';
+
+var Zotero_Tabs = new function () {
+	const HTML_NS = 'http://www.w3.org/1999/xhtml';
+	
+	Object.defineProperty(this, 'deck', {
+		get: () => document.getElementById('tabs-deck')
+	});
+	
+	this._tabBarRef = {};
+	this._tabs = [
+		{
+			title: "",
+			type: 'library'
+		}
+	];
+	
+	this.init = function () {
+		ReactDOM.render(
+			<TabBar
+				ref={this._tabBarRef}
+				initialTabs={this._tabs}
+				onTabSelected={this._onTabSelected.bind(this)}
+				onTabClosed={this._onTabClosed.bind(this)}
+			/>,
+			document.getElementById('tab-bar-container')
+		);
+		
+	};
+	
+	
+	/**
+	 * @return {Element} - The element created in the deck
+	 */
+	this.add = function ({ title, type, url, index }) {
+		this._tabBarRef.current.addTab({ title, type });
+		
+		var elem;
+		if (url) {
+			elem = document.createElement('iframe');
+			elem.setAttribute('type', 'content');
+			elem.setAttribute('src', url);
+		}
+		else {
+			elem = document.createElementNS(HTML_NS, 'div');
+			elem.textContent = title;
+		}
+		
+		var deck = this.deck;
+		deck.insertBefore(elem, index === undefined ? null : deck.childNodes[index]);
+		
+		return elem;
+	};
+	
+	
+	this.rename = function (title, index) {
+		if (index === undefined) {
+			index = this.deck.selectedIndex;
+		}
+		this._tabs[index].title = title;
+		this._tabBarRef.current.renameTab(title, index);
+	};
+	
+	
+	this._onTabSelected = function (index) {
+		this.deck.selectedIndex = index;
+	};
+	
+	
+	this._onTabClosed = function (index) {
+		this._tabs.splice(index, 1);
+		var deck = this.deck;
+		deck.removeChild(deck.childNodes[index]);
+	};
+};
\ No newline at end of file
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index 449efc7c7e..62039e4892 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -144,6 +144,7 @@ var ZoteroPane = new function()
 		Zotero.hiDPI = window.devicePixelRatio > 1;
 		Zotero.hiDPISuffix = Zotero.hiDPI ? "@2x" : "";
 		
+		Zotero_Tabs.init();
 		ZoteroPane_Local.setItemsPaneMessage(Zotero.getString('pane.items.loading'));
 		
 		// Add a default progress window
@@ -1166,6 +1167,10 @@ var ZoteroPane = new function()
 				return;
 			}
 			
+			// Rename tab
+			// TODO: What if PDF is in front?
+			Zotero_Tabs.rename(collectionTreeRow.getName());
+			
 			// Clear quick search and tag selector when switching views
 			document.getElementById('zotero-tb-search').value = "";
 			if (ZoteroPane.tagSelector) {
diff --git a/chrome/content/zotero/zoteroPane.xul b/chrome/content/zotero/zoteroPane.xul
index b43c55c473..323ec585e2 100644
--- a/chrome/content/zotero/zoteroPane.xul
+++ b/chrome/content/zotero/zoteroPane.xul
@@ -41,6 +41,7 @@
 	xmlns:html="http://www.w3.org/1999/xhtml">
 	
 	<script src="include.js"/>
+	<script src="tabs.js"/>
 	<script src="zoteroPane.js" type="application/javascript"/>
 	<script src="fileInterface.js"/>
 	<script src="reportInterface.js"/>
@@ -73,506 +74,508 @@
 	</commandset>
 	
 	<stack id="zotero-pane-stack">
-		<vbox id="zotero-pane"
-			onkeydown="ZoteroPane_Local.handleKeyDown(event, this.id)"
-			onkeyup="ZoteroPane_Local.handleKeyUp(event, this.id)"
-			onkeypress="ZoteroPane_Local.handleKeyPress(event)"
-			chromedir="&locale.dir;">
-			
-			<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-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()"/>
-							<menu id="zotero-tb-feed-add-menu" label="&zotero.toolbar.feeds.new;">
-								<menupopup>
-									<menuitem id="zotero-tb-feed-add-fromURL" label="&zotero.toolbar.feeds.new.fromURL;" 
-										command="cmd_zotero_newFeed_fromURL"/>
-									<menuitem id="zotero-tb-feed-add-fromOPML" label="&zotero.toolbar.feeds.new.fromOPML;" 
-										oncommand="ZoteroPane_Local.importFeedsFromOPML()"/>
-								</menupopup>
-							</menu>
-						</menupopup>
-					</toolbarbutton>
-				</hbox>
+		<deck id="tabs-deck">
+			<vbox id="zotero-pane"
+				onkeydown="ZoteroPane_Local.handleKeyDown(event, this.id)"
+				onkeyup="ZoteroPane_Local.handleKeyUp(event, this.id)"
+				onkeypress="ZoteroPane_Local.handleKeyPress(event)"
+				chromedir="&locale.dir;">
 				
-				<hbox id="zotero-items-toolbar" align="center">
-					<toolbarbutton id="zotero-tb-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newItem.label;" type="menu"
-							onmousedown="if (this.disabled) { event.preventDefault(); return; }">
-						<menupopup onpopupshowing="ZoteroPane_Local.updateNewItemTypes()">
-							<menuseparator/>
-							<menuitem label="&zotero.toolbar.attachment.linked;" oncommand="ZoteroPane_Local.addAttachmentFromDialog(true);" tooltiptext=""/>
-							<menuitem label="&zotero.toolbar.attachment.add;" oncommand="ZoteroPane_Local.addAttachmentFromDialog();"  tooltiptext=""/>
-							<menuseparator/>
-							<menu label="&zotero.toolbar.moreItemTypes.label;" tooltiptext="">
-								<menupopup id="zotero-tb-add-more" onpopupshowing="event.stopPropagation()"/>
-							</menu>
-						</menupopup>
-					</toolbarbutton>
-					
-					<toolbarbutton id="zotero-tb-lookup" class="zotero-tb-button" tooltiptext="&zotero.toolbar.lookup.label;" type="panel"
-							onmousedown="if (this.disabled) { event.preventDefault(); return; } Zotero_Lookup.showPanel(this)"/>
-					
-					<panel id="zotero-lookup-panel" type="arrow" onpopupshown="Zotero_Lookup.onShowing(event)"
-							onpopuphidden="Zotero_Lookup.onHidden(event)">
-						<vbox>
-							<description>&zotero.lookup.description;</description>
-							<vbox id="zotero-lookup-singleLine">
-								<stack>
-									<progressmeter id="zotero-lookup-progress" mode="determined"/>
-									<textbox id="zotero-lookup-textbox"
-										onkeypress="return Zotero_Lookup.onKeyPress(event, this)"
-										oninput="Zotero_Lookup.onInput(event, this)"
-										flex="1"
-										newlines="pasteintact"/>
-								</stack>
-							</vbox>
-							<vbox id="zotero-lookup-multiline" collapsed="true">
-								<textbox id="zotero-lookup-multiline-textbox" onkeypress="return Zotero_Lookup.onKeyPress(event, this)" multiline="true" rows="5" wrap="off" flex="1"/>
-								<hbox align="start" id="zotero-lookup-buttons" class="zotero-button-clear-image">
-									<button label="&zotero.lookup.button.search;" align="start" oncommand="Zotero_Lookup.accept(document.getElementById('zotero-lookup-multiline-textbox'))"/>
-									<progressmeter id="zotero-lookup-multiline-progress" mode="determined" flex="1" hidden="true"/>
-								</hbox>
-							</vbox>
-						</vbox>
-					</panel>
-					
-					<!--<toolbarbutton id="zotero-tb-note-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.note.standalone;" oncommand="ZoteroPane_Local.newNote(event.shiftKey);"/>-->
-					<toolbarbutton id="zotero-tb-note-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newNote;" type="menu"
-							onmousedown="if (this.disabled) { event.preventDefault(); return; }">
-						<menupopup onpopupshowing="ZoteroPane_Local.updateNoteButtonMenu()">
-							<menuitem label="&zotero.toolbar.note.standalone;" command="cmd_zotero_newStandaloneNote"/>
-							<menuitem label="&zotero.toolbar.note.child;" command="cmd_zotero_newChildNote"/>
-						</menupopup>
-					</toolbarbutton>
-					<toolbarbutton id="zotero-tb-attachment-add" class="zotero-tb-button" tooltiptext="&zotero.items.menu.attach;" type="menu"
-							onmousedown="if (this.disabled) { event.preventDefault(); return; }">
-						<menupopup onpopupshowing="ZoteroPane_Local.updateAttachmentButtonMenu(this)">
-							<menuitem class="menuitem-iconic zotero-menuitem-attachments-web-link" label="&zotero.items.menu.attach.link.uri;" oncommand="var itemID = ZoteroPane_Local.getSelectedItems()[0].id; ZoteroPane_Local.addAttachmentFromURI(true, itemID);"/>
-							<menuitem class="menuitem-iconic zotero-menuitem-attachments-file" label="&zotero.items.menu.attach.file;" oncommand="var itemID = ZoteroPane_Local.getSelectedItems()[0].id; ZoteroPane_Local.addAttachmentFromDialog(false, itemID);"/>
-							<menuitem class="menuitem-iconic zotero-menuitem-attachments-link" label="&zotero.items.menu.attach.fileLink;" oncommand="var itemID = ZoteroPane_Local.getSelectedItems()[0].id; ZoteroPane_Local.addAttachmentFromDialog(true, itemID);" id="zotero-tb-attachment-add-file-link"/>
-						</menupopup>
-					</toolbarbutton>
-					<toolbarseparator/>
-					<toolbarbutton id="zotero-tb-advanced-search" class="zotero-tb-button" tooltiptext="&zotero.toolbar.advancedSearch;" command="cmd_zotero_advancedSearch"/>
-					<spacer flex="1"/>
-					<image id="zotero-tb-search-spinner" class="zotero-spinner-14" style="display: none"/>
-					<textbox id="zotero-tb-search" type="search" timeout="250"
-							onkeypress="ZoteroPane_Local.handleSearchKeypress(this, event)"
-							oninput="ZoteroPane_Local.handleSearchInput(this, event)"
-							oncommand="ZoteroPane_Local.search()"/>
-				</hbox>
-				
-				<hbox id="zotero-item-toolbar" flex="1" align="center">
-					<hbox align="center" pack="start" flex="1">
-						<toolbarbutton id="zotero-tb-locate" class="zotero-tb-button" tooltiptext="&zotero.toolbar.openURL.label;" type="menu">
-							<menupopup id="zotero-tb-locate-menu" onpopupshowing="Zotero_LocateMenu.buildLocateMenu()"/>
+				<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-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()"/>
+								<menu id="zotero-tb-feed-add-menu" label="&zotero.toolbar.feeds.new;">
+									<menupopup>
+										<menuitem id="zotero-tb-feed-add-fromURL" label="&zotero.toolbar.feeds.new.fromURL;" 
+											command="cmd_zotero_newFeed_fromURL"/>
+										<menuitem id="zotero-tb-feed-add-fromOPML" label="&zotero.toolbar.feeds.new.fromOPML;" 
+											oncommand="ZoteroPane_Local.importFeedsFromOPML()"/>
+									</menupopup>
+								</menu>
+							</menupopup>
 						</toolbarbutton>
 					</hbox>
-					<hbox align="center" pack="end">
-						<toolbarbutton id="zotero-tb-sync-stop"
-							tooltiptext="&zotero.sync.stop;"
-							oncommand="this.hidden = true; Zotero.Sync.Runner.stop()"
-							hidden="true"/>
-						<hbox id="zotero-tb-sync-progress-box" hidden="true" align="center">
-							<!-- TODO: localize -->
-							<toolbarbutton id="zotero-tb-sync-storage-cancel"
-								tooltiptext="Stop sync"
-								oncommand="Zotero.Sync.Runner.stop()"/>
-							<progressmeter id="zotero-tb-sync-progress" mode="determined"
-								value="0" tooltip="zotero-tb-sync-progress-tooltip">
-							</progressmeter>
-							<tooltip id="zotero-tb-sync-progress-tooltip" noautohide="true">
-								<hbox id="zotero-tb-sync-progress-tooltip-progress">
-									<label value="&zotero.sync.storage.progress;"/>
-									<label/>
-								</hbox>
-								<zoterofilesyncstatus id="zotero-tb-sync-progress-status"/>
-							</tooltip>
+					
+					<hbox id="zotero-items-toolbar" align="center">
+						<toolbarbutton id="zotero-tb-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newItem.label;" type="menu"
+								onmousedown="if (this.disabled) { event.preventDefault(); return; }">
+							<menupopup onpopupshowing="ZoteroPane_Local.updateNewItemTypes()">
+								<menuseparator/>
+								<menuitem label="&zotero.toolbar.attachment.linked;" oncommand="ZoteroPane_Local.addAttachmentFromDialog(true);" tooltiptext=""/>
+								<menuitem label="&zotero.toolbar.attachment.add;" oncommand="ZoteroPane_Local.addAttachmentFromDialog();"  tooltiptext=""/>
+								<menuseparator/>
+								<menu label="&zotero.toolbar.moreItemTypes.label;" tooltiptext="">
+									<menupopup id="zotero-tb-add-more" onpopupshowing="event.stopPropagation()"/>
+								</menu>
+							</menupopup>
+						</toolbarbutton>
+						
+						<toolbarbutton id="zotero-tb-lookup" class="zotero-tb-button" tooltiptext="&zotero.toolbar.lookup.label;" type="panel"
+								onmousedown="if (this.disabled) { event.preventDefault(); return; } Zotero_Lookup.showPanel(this)"/>
+						
+						<panel id="zotero-lookup-panel" type="arrow" onpopupshown="Zotero_Lookup.onShowing(event)"
+								onpopuphidden="Zotero_Lookup.onHidden(event)">
+							<vbox>
+								<description>&zotero.lookup.description;</description>
+								<vbox id="zotero-lookup-singleLine">
+									<stack>
+										<progressmeter id="zotero-lookup-progress" mode="determined"/>
+										<textbox id="zotero-lookup-textbox"
+											onkeypress="return Zotero_Lookup.onKeyPress(event, this)"
+											oninput="Zotero_Lookup.onInput(event, this)"
+											flex="1"
+											newlines="pasteintact"/>
+									</stack>
+								</vbox>
+								<vbox id="zotero-lookup-multiline" collapsed="true">
+									<textbox id="zotero-lookup-multiline-textbox" onkeypress="return Zotero_Lookup.onKeyPress(event, this)" multiline="true" rows="5" wrap="off" flex="1"/>
+									<hbox align="start" id="zotero-lookup-buttons" class="zotero-button-clear-image">
+										<button label="&zotero.lookup.button.search;" align="start" oncommand="Zotero_Lookup.accept(document.getElementById('zotero-lookup-multiline-textbox'))"/>
+										<progressmeter id="zotero-lookup-multiline-progress" mode="determined" flex="1" hidden="true"/>
+									</hbox>
+								</vbox>
+							</vbox>
+						</panel>
+						
+						<!--<toolbarbutton id="zotero-tb-note-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.note.standalone;" oncommand="ZoteroPane_Local.newNote(event.shiftKey);"/>-->
+						<toolbarbutton id="zotero-tb-note-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newNote;" type="menu"
+								onmousedown="if (this.disabled) { event.preventDefault(); return; }">
+							<menupopup onpopupshowing="ZoteroPane_Local.updateNoteButtonMenu()">
+								<menuitem label="&zotero.toolbar.note.standalone;" command="cmd_zotero_newStandaloneNote"/>
+								<menuitem label="&zotero.toolbar.note.child;" command="cmd_zotero_newChildNote"/>
+							</menupopup>
+						</toolbarbutton>
+						<toolbarbutton id="zotero-tb-attachment-add" class="zotero-tb-button" tooltiptext="&zotero.items.menu.attach;" type="menu"
+								onmousedown="if (this.disabled) { event.preventDefault(); return; }">
+							<menupopup onpopupshowing="ZoteroPane_Local.updateAttachmentButtonMenu(this)">
+								<menuitem class="menuitem-iconic zotero-menuitem-attachments-web-link" label="&zotero.items.menu.attach.link.uri;" oncommand="var itemID = ZoteroPane_Local.getSelectedItems()[0].id; ZoteroPane_Local.addAttachmentFromURI(true, itemID);"/>
+								<menuitem class="menuitem-iconic zotero-menuitem-attachments-file" label="&zotero.items.menu.attach.file;" oncommand="var itemID = ZoteroPane_Local.getSelectedItems()[0].id; ZoteroPane_Local.addAttachmentFromDialog(false, itemID);"/>
+								<menuitem class="menuitem-iconic zotero-menuitem-attachments-link" label="&zotero.items.menu.attach.fileLink;" oncommand="var itemID = ZoteroPane_Local.getSelectedItems()[0].id; ZoteroPane_Local.addAttachmentFromDialog(true, itemID);" id="zotero-tb-attachment-add-file-link"/>
+							</menupopup>
+						</toolbarbutton>
+						<toolbarseparator/>
+						<toolbarbutton id="zotero-tb-advanced-search" class="zotero-tb-button" tooltiptext="&zotero.toolbar.advancedSearch;" command="cmd_zotero_advancedSearch"/>
+						<spacer flex="1"/>
+						<image id="zotero-tb-search-spinner" class="zotero-spinner-14" style="display: none"/>
+						<textbox id="zotero-tb-search" type="search" timeout="250"
+								onkeypress="ZoteroPane_Local.handleSearchKeypress(this, event)"
+								oninput="ZoteroPane_Local.handleSearchInput(this, event)"
+								oncommand="ZoteroPane_Local.search()"/>
+					</hbox>
+					
+					<hbox id="zotero-item-toolbar" flex="1" align="center">
+						<hbox align="center" pack="start" flex="1">
+							<toolbarbutton id="zotero-tb-locate" class="zotero-tb-button" tooltiptext="&zotero.toolbar.openURL.label;" type="menu">
+								<menupopup id="zotero-tb-locate-menu" onpopupshowing="Zotero_LocateMenu.buildLocateMenu()"/>
+							</toolbarbutton>
 						</hbox>
+						<hbox align="center" pack="end">
+							<toolbarbutton id="zotero-tb-sync-stop"
+								tooltiptext="&zotero.sync.stop;"
+								oncommand="this.hidden = true; Zotero.Sync.Runner.stop()"
+								hidden="true"/>
+							<hbox id="zotero-tb-sync-progress-box" hidden="true" align="center">
+								<!-- TODO: localize -->
+								<toolbarbutton id="zotero-tb-sync-storage-cancel"
+									tooltiptext="Stop sync"
+									oncommand="Zotero.Sync.Runner.stop()"/>
+								<progressmeter id="zotero-tb-sync-progress" mode="determined"
+									value="0" tooltip="zotero-tb-sync-progress-tooltip">
+								</progressmeter>
+								<tooltip id="zotero-tb-sync-progress-tooltip" noautohide="true">
+									<hbox id="zotero-tb-sync-progress-tooltip-progress">
+										<label value="&zotero.sync.storage.progress;"/>
+										<label/>
+									</hbox>
+									<zoterofilesyncstatus id="zotero-tb-sync-progress-status"/>
+								</tooltip>
+							</hbox>
+						</hbox>
+	
+						<hbox id="zotero-pq-buttons">
+						</hbox>
+	
+						<toolbarbutton id="zotero-tb-sync-error" hidden="true"/>
+						
+						<!--
+							We put this here, but it can be used wherever
+							Zotero.Sync.Runner.updateErrorPanel() puts it
+						-->
+						<panel id="zotero-sync-error-panel" type="arrow"/>
+						
+						<toolbarbutton id="zotero-tb-sync" class="zotero-tb-button" tooltip="_child"
+								oncommand="Zotero.Sync.Server.canAutoResetClient = true; Zotero.Sync.Server.manualSyncRequired = false; Zotero.Sync.Runner.sync()">
+							<tooltip
+									id="zotero-tb-sync-tooltip"
+									onpopupshowing="Zotero.Sync.Runner.registerSyncStatus(this)"
+									onpopuphiding="Zotero.Sync.Runner.registerSyncStatus()"
+									noautohide="true">
+								<label id="zotero-tb-sync-label"/>
+								<label id="zotero-tb-sync-status" hidden="true"/>
+								<label id="zotero-tb-sync-last-sync"/>
+								<div xmlns="http://www.w3.org/1999/xhtml" class="sync-button-tooltip-messages"/>
+							</tooltip>
+						</toolbarbutton>
 					</hbox>
-
-					<hbox id="zotero-pq-buttons">
-					</hbox>
-
-					<toolbarbutton id="zotero-tb-sync-error" hidden="true"/>
-					
-					<!--
-						We put this here, but it can be used wherever
-						Zotero.Sync.Runner.updateErrorPanel() puts it
-					-->
-					<panel id="zotero-sync-error-panel" type="arrow"/>
-					
-					<toolbarbutton id="zotero-tb-sync" class="zotero-tb-button" tooltip="_child"
-							oncommand="Zotero.Sync.Server.canAutoResetClient = true; Zotero.Sync.Server.manualSyncRequired = false; Zotero.Sync.Runner.sync()">
-						<tooltip
-								id="zotero-tb-sync-tooltip"
-								onpopupshowing="Zotero.Sync.Runner.registerSyncStatus(this)"
-								onpopuphiding="Zotero.Sync.Runner.registerSyncStatus()"
-								noautohide="true">
-							<label id="zotero-tb-sync-label"/>
-							<label id="zotero-tb-sync-status" hidden="true"/>
-							<label id="zotero-tb-sync-last-sync"/>
-							<div xmlns="http://www.w3.org/1999/xhtml" class="sync-button-tooltip-messages"/>
-						</tooltip>
-					</toolbarbutton>
-				</hbox>
-			</toolbar>
-			
-			<vbox id="retracted-items-container" collapsed="true">
-				<div xmlns="http://www.w3.org/1999/xhtml" id="retracted-items-banner">
-					<div id="retracted-items-message"/>
-					<div id="retracted-items-link"/>
-					<div id="retracted-items-close">×</div>
-				</div>
-			</vbox>
-			
-			<popupset>
-				<menupopup id="zotero-collectionmenu"
-						oncommand="ZoteroPane.onCollectionContextMenuSelect(event)">
-					<!-- Keep order in sync with buildCollectionContextMenu, which adds additional attributes -->
-					<menuitem class="zotero-menuitem-sync"/>
-					<menuseparator/>
-					<menuitem class="zotero-menuitem-new-collection" label="&zotero.toolbar.newCollection.label;"/>
-					<menuitem class="zotero-menuitem-new-saved-search" label="&zotero.toolbar.newSavedSearch.label;"/>
-					<menuitem class="zotero-menuitem-new-collection" label="&zotero.toolbar.newSubcollection.label;"/>
-					<menuitem class="zotero-menuitem-refresh-feed" label="&zotero.toolbar.feeds.refresh;"/>
-					<menuseparator/>
-					<menuitem class="zotero-menuitem-show-duplicates" label="&zotero.toolbar.duplicate.label;"/>
-					<menuitem class="zotero-menuitem-show-unfiled" label="&zotero.collections.showUnfiledItems;"/>
-					<menuitem class="zotero-menuitem-show-retracted" label="&zotero.collections.showRetractedItems;"/>
-					<menuitem class="zotero-menuitem-edit-collection"/>
-					<menuitem class="zotero-menuitem-duplicate-collection"/>
-					<menuitem class="zotero-menuitem-mark-read-feed" label="&zotero.toolbar.markFeedRead.label;"/>
-					<menuitem class="zotero-menuitem-edit-feed" label="&zotero.toolbar.feeds.edit;"/>
-					<menuitem class="zotero-menuitem-delete-collection"/>
-					<menuitem class="zotero-menuitem-move-to-trash"/>
-					<menuseparator/>
-					<menuitem class="zotero-menuitem-export"/>
-					<menuitem class="zotero-menuitem-create-bibliography"/>
-					<menuitem class="zotero-menuitem-export" label="&zotero.toolbar.export.label;"/>
-					<menuitem class="zotero-menuitem-create-report"/>
-					<menuitem class="zotero-menuitem-delete-from-lib" label="&zotero.toolbar.emptyTrash.label;"/>
-					<menuitem class="zotero-menuitem-removeLibrary"/>
-				</menupopup>
-				<menupopup id="zotero-itemmenu">
-					<!-- Keep order in sync with buildItemContextMenu -->
-					<menuitem class="menuitem-iconic zotero-menuitem-show-in-library" label="&zotero.items.menu.showInLibrary;" oncommand="ZoteroPane.selectItem(parseInt(this.parentNode.getAttribute('itemID')), true)"/>
-					<menuseparator/>
-					<!-- with icon: <menuitem class="menuitem-iconic" id="zotero-menuitem-note" label="&zotero.items.menu.attach.note;" oncommand="ZoteroPane_Local.newNote(false, this.parentNode.getAttribute('itemID'))"/>-->
-					<menuitem class="menuitem-iconic zotero-menuitem-attach-note" label="&zotero.items.menu.attach.note;" oncommand="ZoteroPane_Local.newNote(false, this.parentNode.getAttribute('itemKey'))"/>
-					<menu class="menu-iconic zotero-menuitem-attach" label="&zotero.items.menu.attach;">
-						<menupopup id="zotero-add-attachment-popup">
-							<menuitem class="menuitem-iconic zotero-menuitem-attachments-web-link" label="&zotero.items.menu.attach.link.uri;" oncommand="var itemID = parseInt(this.parentNode.parentNode.parentNode.getAttribute('itemID')); ZoteroPane_Local.addAttachmentFromURI(true, itemID);"/>
-							<menuitem class="menuitem-iconic zotero-menuitem-attachments-file" label="&zotero.items.menu.attach.file;" oncommand="var itemID = parseInt(this.parentNode.parentNode.parentNode.getAttribute('itemID')); ZoteroPane_Local.addAttachmentFromDialog(false, itemID);"/>
-							<menuitem class="menuitem-iconic zotero-menuitem-attachments-link" label="&zotero.items.menu.attach.fileLink;" oncommand="var itemID = parseInt(this.parentNode.parentNode.parentNode.getAttribute('itemID')); ZoteroPane_Local.addAttachmentFromDialog(true, itemID);"/>
-						</menupopup>
-					</menu>
-					<menuseparator/>
-					<menuitem class="menuitem-iconic zotero-menuitem-find-pdf" oncommand="ZoteroPane.findPDFForSelectedItems()"/>
-					<menuseparator/>
-					<menuitem class="menuitem-iconic zotero-menuitem-toggle-read-item" oncommand="ZoteroPane_Local.toggleSelectedItemsRead();"/>
-					<menuitem class="menuitem-iconic zotero-menuitem-duplicate-item" label="&zotero.items.menu.duplicateItem;" oncommand="ZoteroPane_Local.duplicateSelectedItem().done();"/>
-					<menuitem class="menuitem-iconic zotero-menuitem-remove-items" oncommand="ZoteroPane_Local.deleteSelectedItems();"/>
-					<menuitem class="menuitem-iconic zotero-menuitem-restore-to-library" label="&zotero.items.menu.restoreToLibrary;" oncommand="ZoteroPane_Local.restoreSelectedItems();"/>
-					<menuitem class="menuitem-iconic zotero-menuitem-move-to-trash" oncommand="ZoteroPane_Local.deleteSelectedItems(true, true);"/>
-					<menuitem class="menuitem-iconic zotero-menuitem-delete-from-lib" oncommand="ZoteroPane_Local.deleteSelectedItems(false, true)"/>
-					<menuitem class="menuitem-iconic zotero-menuitem-merge-items" label="&zotero.items.menu.mergeItems;" oncommand="ZoteroPane_Local.mergeSelectedItems();"/>
-					<menuseparator/>
-					<menuitem class="menuitem-iconic zotero-menuitem-export" oncommand="Zotero_File_Interface.exportItems();"/>
-					<menuitem class="menuitem-iconic zotero-menuitem-create-bibliography" oncommand="Zotero_File_Interface.bibliographyFromItems();"/>
-					<menuitem class="menuitem-iconic zotero-menuitem-create-report" oncommand="Zotero_Report_Interface.loadItemReport()"/>
-					<menuseparator/>
-					<menuitem class="menuitem-iconic zotero-menuitem-retrieve-metadata" oncommand="ZoteroPane.recognizeSelected();"/>
-					<menuitem class="menuitem-iconic zotero-menuitem-unrecognize" label="&zotero.items.menu.unrecognize;" oncommand="ZoteroPane.unrecognizeSelected()"/>
-					<menuitem class="menuitem-iconic zotero-menuitem-report-metadata" label="&zotero.items.menu.reportMetadata;" oncommand="ZoteroPane.reportMetadataForSelected()"/>
-					<menuitem class="menuitem-iconic zotero-menuitem-create-parent" oncommand="ZoteroPane_Local.createParentItemsFromSelected();"/>
-					<menuitem class="menuitem-iconic zotero-menuitem-rename-from-parent" oncommand="ZoteroPane_Local.renameSelectedAttachmentsFromParents()"/>
-					<menuitem class="menuitem-iconic zotero-menuitem-reindex" oncommand="ZoteroPane_Local.reindexItem();"/>
-<!--					<menuitem class="menuitem-iconic zotero-menuitem-import-annotations" label="&zotero.items.menu.importAnnotations;" oncommand="ZoteroPane.importAnnotationsForSelected()"/>-->
-					<menuitem class="menuitem-iconic zotero-menuitem-import-annotations" label="Import annotations" oncommand="ZoteroPane.importAnnotationsForSelected()"/>
-<!--					<menuitem class="menuitem-iconic zotero-menuitem-export-annotations" label="&zotero.items.menu.exportAnnotations;" oncommand="ZoteroPane.exportAnnotationsForSelected()"/>-->
-					<menuitem class="menuitem-iconic zotero-menuitem-export-annotations" label="Export Annotations" oncommand="ZoteroPane.exportAnnotationsForSelected()"/>
-				</menupopup>
+				</toolbar>
 				
-				<tooltip id="fake-tooltip"/>
-			</popupset>
-			
-			<hbox id="zotero-trees" flex="1">
-				<vbox id="zotero-collections-pane" zotero-persist="width">
-					<!-- This is used for positioning the sync error icon panel
-							under specific tree cells, which don't exist as
-							elements on their own -->
-					<box id="zotero-collections-tree-shim"/>
-					<!-- This extra vbox prevents the toolbar from getting compressed when resizing
-							the tag selector to max height -->
-					<tree id="zotero-collections-tree"
-							hidecolumnpicker="true"
-							oncontextmenu="ZoteroPane.onCollectionsContextMenuOpen(event)"
-							onmouseover="ZoteroPane_Local.collectionsView.setHighlightedRows();"
-							onselect="ZoteroPane_Local.onCollectionSelected();"
-							seltype="cell" flex="1" editable="true">
-						<treecols>
-							<treecol
-								id="zotero-collections-name-column"
-								flex="1"
-								primary="true"
-								hideheader="true"/>
-						</treecols>
-						<treechildren ondragstart="ZoteroPane_Local.collectionsView.onDragStart(event)"
-							ondragenter="return ZoteroPane_Local.collectionsView.onDragEnter(event)"
-							ondragover="return ZoteroPane_Local.collectionsView.onDragOver(event)"
-							ondrop="return ZoteroPane_Local.collectionsView.onDrop(event)"/>
-					</tree>
-					<splitter
-							id="zotero-tags-splitter"
-							orient="vertical"
-							collapse="after"
-							zotero-persist="state"
-							onmousemove="if (this.getAttribute('state') == 'dragging') { ZoteroPane.handleTagSelectorResize(); }"
-					>
-						<grippy oncommand="ZoteroPane_Local.toggleTagSelector()"/>
-					</splitter>
-					<!-- 'collapsed' is no longer necessary here due to the persisted 'state' on
-					     zotero-tags-splitter, but without this an old-style entry for 'collapsed'
-					     in localstore.rdf can cause the pane to always be closed on Zotero open.
-					     
-					     TODO: deal with this some other way?
-					-->
-					<vbox id="zotero-tag-selector-container" zotero-persist="height,collapsed">
-						<html:div id="zotero-tag-selector"/>
-					</vbox>
+				<vbox id="retracted-items-container" collapsed="true">
+					<div xmlns="http://www.w3.org/1999/xhtml" id="retracted-items-banner">
+						<div id="retracted-items-message"/>
+						<div id="retracted-items-link"/>
+						<div id="retracted-items-close">×</div>
+					</div>
 				</vbox>
 				
-				<splitter id="zotero-collections-splitter" resizebefore="closest" resizeafter="closest" collapse="before"
-					zotero-persist="state"
-					onmousemove="document.getElementById('zotero-items-toolbar').setAttribute('state', this.getAttribute('state'));ZoteroPane_Local.updateToolbarPosition();"
-					oncommand="ZoteroPane_Local.updateToolbarPosition()">
-					<grippy id="zotero-collections-grippy"/>
-				</splitter>
+				<popupset>
+					<menupopup id="zotero-collectionmenu"
+							oncommand="ZoteroPane.onCollectionContextMenuSelect(event)">
+						<!-- Keep order in sync with buildCollectionContextMenu, which adds additional attributes -->
+						<menuitem class="zotero-menuitem-sync"/>
+						<menuseparator/>
+						<menuitem class="zotero-menuitem-new-collection" label="&zotero.toolbar.newCollection.label;"/>
+						<menuitem class="zotero-menuitem-new-saved-search" label="&zotero.toolbar.newSavedSearch.label;"/>
+						<menuitem class="zotero-menuitem-new-collection" label="&zotero.toolbar.newSubcollection.label;"/>
+						<menuitem class="zotero-menuitem-refresh-feed" label="&zotero.toolbar.feeds.refresh;"/>
+						<menuseparator/>
+						<menuitem class="zotero-menuitem-show-duplicates" label="&zotero.toolbar.duplicate.label;"/>
+						<menuitem class="zotero-menuitem-show-unfiled" label="&zotero.collections.showUnfiledItems;"/>
+						<menuitem class="zotero-menuitem-show-retracted" label="&zotero.collections.showRetractedItems;"/>
+						<menuitem class="zotero-menuitem-edit-collection"/>
+						<menuitem class="zotero-menuitem-duplicate-collection"/>
+						<menuitem class="zotero-menuitem-mark-read-feed" label="&zotero.toolbar.markFeedRead.label;"/>
+						<menuitem class="zotero-menuitem-edit-feed" label="&zotero.toolbar.feeds.edit;"/>
+						<menuitem class="zotero-menuitem-delete-collection"/>
+						<menuitem class="zotero-menuitem-move-to-trash"/>
+						<menuseparator/>
+						<menuitem class="zotero-menuitem-export"/>
+						<menuitem class="zotero-menuitem-create-bibliography"/>
+						<menuitem class="zotero-menuitem-export" label="&zotero.toolbar.export.label;"/>
+						<menuitem class="zotero-menuitem-create-report"/>
+						<menuitem class="zotero-menuitem-delete-from-lib" label="&zotero.toolbar.emptyTrash.label;"/>
+						<menuitem class="zotero-menuitem-removeLibrary"/>
+					</menupopup>
+					<menupopup id="zotero-itemmenu">
+						<!-- Keep order in sync with buildItemContextMenu -->
+						<menuitem class="menuitem-iconic zotero-menuitem-show-in-library" label="&zotero.items.menu.showInLibrary;" oncommand="ZoteroPane.selectItem(parseInt(this.parentNode.getAttribute('itemID')), true)"/>
+						<menuseparator/>
+						<!-- with icon: <menuitem class="menuitem-iconic" id="zotero-menuitem-note" label="&zotero.items.menu.attach.note;" oncommand="ZoteroPane_Local.newNote(false, this.parentNode.getAttribute('itemID'))"/>-->
+						<menuitem class="menuitem-iconic zotero-menuitem-attach-note" label="&zotero.items.menu.attach.note;" oncommand="ZoteroPane_Local.newNote(false, this.parentNode.getAttribute('itemKey'))"/>
+						<menu class="menu-iconic zotero-menuitem-attach" label="&zotero.items.menu.attach;">
+							<menupopup id="zotero-add-attachment-popup">
+								<menuitem class="menuitem-iconic zotero-menuitem-attachments-web-link" label="&zotero.items.menu.attach.link.uri;" oncommand="var itemID = parseInt(this.parentNode.parentNode.parentNode.getAttribute('itemID')); ZoteroPane_Local.addAttachmentFromURI(true, itemID);"/>
+								<menuitem class="menuitem-iconic zotero-menuitem-attachments-file" label="&zotero.items.menu.attach.file;" oncommand="var itemID = parseInt(this.parentNode.parentNode.parentNode.getAttribute('itemID')); ZoteroPane_Local.addAttachmentFromDialog(false, itemID);"/>
+								<menuitem class="menuitem-iconic zotero-menuitem-attachments-link" label="&zotero.items.menu.attach.fileLink;" oncommand="var itemID = parseInt(this.parentNode.parentNode.parentNode.getAttribute('itemID')); ZoteroPane_Local.addAttachmentFromDialog(true, itemID);"/>
+							</menupopup>
+						</menu>
+						<menuseparator/>
+						<menuitem class="menuitem-iconic zotero-menuitem-find-pdf" oncommand="ZoteroPane.findPDFForSelectedItems()"/>
+						<menuseparator/>
+						<menuitem class="menuitem-iconic zotero-menuitem-toggle-read-item" oncommand="ZoteroPane_Local.toggleSelectedItemsRead();"/>
+						<menuitem class="menuitem-iconic zotero-menuitem-duplicate-item" label="&zotero.items.menu.duplicateItem;" oncommand="ZoteroPane_Local.duplicateSelectedItem().done();"/>
+						<menuitem class="menuitem-iconic zotero-menuitem-remove-items" oncommand="ZoteroPane_Local.deleteSelectedItems();"/>
+						<menuitem class="menuitem-iconic zotero-menuitem-restore-to-library" label="&zotero.items.menu.restoreToLibrary;" oncommand="ZoteroPane_Local.restoreSelectedItems();"/>
+						<menuitem class="menuitem-iconic zotero-menuitem-move-to-trash" oncommand="ZoteroPane_Local.deleteSelectedItems(true, true);"/>
+						<menuitem class="menuitem-iconic zotero-menuitem-delete-from-lib" oncommand="ZoteroPane_Local.deleteSelectedItems(false, true)"/>
+						<menuitem class="menuitem-iconic zotero-menuitem-merge-items" label="&zotero.items.menu.mergeItems;" oncommand="ZoteroPane_Local.mergeSelectedItems();"/>
+						<menuseparator/>
+						<menuitem class="menuitem-iconic zotero-menuitem-export" oncommand="Zotero_File_Interface.exportItems();"/>
+						<menuitem class="menuitem-iconic zotero-menuitem-create-bibliography" oncommand="Zotero_File_Interface.bibliographyFromItems();"/>
+						<menuitem class="menuitem-iconic zotero-menuitem-create-report" oncommand="Zotero_Report_Interface.loadItemReport()"/>
+						<menuseparator/>
+						<menuitem class="menuitem-iconic zotero-menuitem-retrieve-metadata" oncommand="ZoteroPane.recognizeSelected();"/>
+						<menuitem class="menuitem-iconic zotero-menuitem-unrecognize" label="&zotero.items.menu.unrecognize;" oncommand="ZoteroPane.unrecognizeSelected()"/>
+						<menuitem class="menuitem-iconic zotero-menuitem-report-metadata" label="&zotero.items.menu.reportMetadata;" oncommand="ZoteroPane.reportMetadataForSelected()"/>
+						<menuitem class="menuitem-iconic zotero-menuitem-create-parent" oncommand="ZoteroPane_Local.createParentItemsFromSelected();"/>
+						<menuitem class="menuitem-iconic zotero-menuitem-rename-from-parent" oncommand="ZoteroPane_Local.renameSelectedAttachmentsFromParents()"/>
+						<menuitem class="menuitem-iconic zotero-menuitem-reindex" oncommand="ZoteroPane_Local.reindexItem();"/>
+	<!--					<menuitem class="menuitem-iconic zotero-menuitem-import-annotations" label="&zotero.items.menu.importAnnotations;" oncommand="ZoteroPane.importAnnotationsForSelected()"/>-->
+						<menuitem class="menuitem-iconic zotero-menuitem-import-annotations" label="Import annotations" oncommand="ZoteroPane.importAnnotationsForSelected()"/>
+	<!--					<menuitem class="menuitem-iconic zotero-menuitem-export-annotations" label="&zotero.items.menu.exportAnnotations;" oncommand="ZoteroPane.exportAnnotationsForSelected()"/>-->
+						<menuitem class="menuitem-iconic zotero-menuitem-export-annotations" label="Export Annotations" oncommand="ZoteroPane.exportAnnotationsForSelected()"/>
+					</menupopup>
+					
+					<tooltip id="fake-tooltip"/>
+				</popupset>
 				
-				<box id="zotero-layout-switcher" orient="horizontal" zotero-persist="orient" flex="1">
-					<vbox id="zotero-items-pane" zotero-persist="width height" flex="1">
-						<deck id="zotero-items-pane-content" selectedIndex="0" flex="1">
-							<!-- Key navigation is handled by listener in itemTreeView.js -->
-							<tree 
-								id="zotero-items-tree"
-								enableColumnDrag="true"
-								disableKeyNavigation="true"
-								onfocus="if (ZoteroPane_Local.itemsView.rowCount &amp;&amp; !ZoteroPane_Local.itemsView.selection.count) { ZoteroPane_Local.itemsView.selection.select(0); }"
-								onkeydown="ZoteroPane_Local.handleKeyDown(event, this.id)"
-								onselect="ZoteroPane_Local.itemSelected(event)"
-								oncommand="ZoteroPane_Local.serializePersist()"
-								oncontextmenu="ZoteroPane.onItemsContextMenuOpen(event)"
-								flex="1"
-								hidden="true"
-								zotero-persist="current-view-group">
-								<treecols id="zotero-items-columns-header">
-									<treecol
-										id="zotero-items-column-title" primary="true" default-in="default feed"
-										label="&zotero.items.title_column;" ignoreincolumnpicker="true"
-										flex="4" zotero-persist="width ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>
-									<treecol
-										id="zotero-items-column-firstCreator" default-in="default feed"
-										label="&zotero.items.creator_column;"
-										flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>
-									<treecol
-										id="zotero-items-column-itemType"
-										label="&zotero.items.type_column;"
-										width="40" zotero-persist="width ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>
-									<treecol
-										id="zotero-items-column-date" default-in="feed"
-										label="&zotero.items.date_column;"
-										flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>
-									<treecol
-										id="zotero-items-column-year" disabled-in="feed"
-										label="&zotero.items.year_column;"
-										flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>
-									<treecol
-										id="zotero-items-column-publisher"
-										label="&zotero.items.publisher_column;"
-										flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>
-									<treecol
-										id="zotero-items-column-publicationTitle" disabled-in="feed"
-										label="&zotero.items.publication_column;"
-										flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>
-									<treecol
-										id="zotero-items-column-journalAbbreviation" disabled-in="feed"
-										submenu="true"
-										label="&zotero.items.journalAbbr_column;"
-										flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>
-									<treecol
-										id="zotero-items-column-language"
-										submenu="true"
-										label="&zotero.items.language_column;"
-										flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>
-									<treecol
-										id="zotero-items-column-accessDate" disabled-in="feed"
-										submenu="true"
-										label="&zotero.items.accessDate_column;"
-										flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>
-									<treecol
-										id="zotero-items-column-libraryCatalog" disabled-in="feed"
-										submenu="true"
-										label="&zotero.items.libraryCatalog_column;"
-										flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>
-									<treecol
-										id="zotero-items-column-callNumber" disabled-in="feed"
-										submenu="true"
-										label="&zotero.items.callNumber_column;"
-										flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>
-									<treecol
-										id="zotero-items-column-rights"
-										submenu="true"
-										label="&zotero.items.rights_column;"
-										flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>
-									<treecol
-										id="zotero-items-column-dateAdded" disabled-in="feed"
-										label="&zotero.items.dateAdded_column;"
-										flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>
-									<treecol
-										id="zotero-items-column-dateModified" disabled-in="feed"
-										label="&zotero.items.dateModified_column;"
-										flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>
-									<treecol
-										id="zotero-items-column-archive" disabled-in="feed"
-										submenu="true"
-										label="&zotero.items.archive_column;"
-										flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>								
-									<treecol
-										id="zotero-items-column-archiveLocation" disabled-in="feed"
-										submenu="true"
-										label="&zotero.items.archiveLocation_column;"
-										flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>
-									<treecol
-										id="zotero-items-column-place" disabled-in="feed"
-										submenu="true"
-										label="&zotero.items.place_column;"
-										flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>
-									<treecol
-										id="zotero-items-column-volume" disabled-in="feed"
-										submenu="true"
-										label="&zotero.items.volume_column;"
-										flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>
-									<treecol
-										id="zotero-items-column-edition" disabled-in="feed"
-										submenu="true"
-										label="&zotero.items.edition_column;"
-										flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>
-									<treecol
-										id="zotero-items-column-pages" disabled-in="feed"
-										submenu="true"
-										label="&zotero.items.pages_column;"
-										flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>
-									<treecol
-										id="zotero-items-column-issue" disabled-in="feed"
-										submenu="true"
-										label="&zotero.items.issue_column;"
-										flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>
-									<treecol
-										id="zotero-items-column-series" disabled-in="feed"
-										submenu="true"
-										label="&zotero.items.series_column;"
-										flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>
-									<treecol
-										id="zotero-items-column-seriesTitle" disabled-in="feed"
-										submenu="true"
-										label="&zotero.items.seriesTitle_column;"
-										flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>
-									<treecol
-										id="zotero-items-column-court" disabled-in="feed"
-										submenu="true"
-										label="&zotero.items.court_column;"
-										flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>
-									<treecol
-										id="zotero-items-column-medium" disabled-in="feed"
-										submenu="true"
-										label="&zotero.items.medium_column;"
-										flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>
-									<treecol
-										id="zotero-items-column-genre" disabled-in="feed"
-										submenu="true"
-										label="&zotero.items.genre_column;"
-										flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>
-									<treecol
-										id="zotero-items-column-system" disabled-in="feed"
-										submenu="true"
-										label="&zotero.items.system_column;"
-										flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>
-									<treecol
-										id="zotero-items-column-extra" disabled-in="feed"
-										label="&zotero.items.extra_column;"
-										flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>
-									<treecol
-										id="zotero-items-column-hasAttachment" default-in="default" disabled-in="feed" 
-										class="treecol-image"
-										label="&zotero.tabs.attachments.label;"
-										fixed="true"
-										zotero-persist="ordinal hidden sortActive sortDirection"/>
-									<splitter class="tree-splitter"/>
-									<treecol
-										id="zotero-items-column-numNotes" disabled-in="feed"
-										class="treecol-image"
-										label="&zotero.tabs.notes.label;"
-										zotero-persist="width ordinal hidden sortActive sortDirection"/>
-								</treecols>
-								<treechildren ondragstart="ZoteroPane_Local.itemsView.onDragStart(event)"
-									ondragenter="return ZoteroPane_Local.itemsView.onDragEnter(event)"
-									ondragover="return ZoteroPane_Local.itemsView.onDragOver(event)"
-									ondrop="return ZoteroPane_Local.itemsView.onDrop(event)"
-									ondragend="ZoteroPane_Local.itemsView.onDragEnd(event)"/>
-							</tree>
-
-							<!-- Label for displaying messages when items pane is hidden
-							 (e.g. "Advanced search mode — press Enter to search.")-->
-							<vbox id="zotero-items-pane-message-box" pack="center" align="center"
-								ondragenter="return ZoteroPane.itemsView.onDragEnter(event)"
-								ondragover="return ZoteroPane.itemsView.onDragOver(event)"
-								ondrop="ZoteroPane.itemsView.onDrop(event); ZoteroPane.itemsView.drop(-1, -1, event.dataTransfer)"/>
-						</deck>
+				<hbox id="zotero-trees" flex="1">
+					<vbox id="zotero-collections-pane" zotero-persist="width">
+						<!-- This is used for positioning the sync error icon panel
+								under specific tree cells, which don't exist as
+								elements on their own -->
+						<box id="zotero-collections-tree-shim"/>
+						<!-- This extra vbox prevents the toolbar from getting compressed when resizing
+								the tag selector to max height -->
+						<tree id="zotero-collections-tree"
+								hidecolumnpicker="true"
+								oncontextmenu="ZoteroPane.onCollectionsContextMenuOpen(event)"
+								onmouseover="ZoteroPane_Local.collectionsView.setHighlightedRows();"
+								onselect="ZoteroPane_Local.onCollectionSelected();"
+								seltype="cell" flex="1" editable="true">
+							<treecols>
+								<treecol
+									id="zotero-collections-name-column"
+									flex="1"
+									primary="true"
+									hideheader="true"/>
+							</treecols>
+							<treechildren ondragstart="ZoteroPane_Local.collectionsView.onDragStart(event)"
+								ondragenter="return ZoteroPane_Local.collectionsView.onDragEnter(event)"
+								ondragover="return ZoteroPane_Local.collectionsView.onDragOver(event)"
+								ondrop="return ZoteroPane_Local.collectionsView.onDrop(event)"/>
+						</tree>
+						<splitter
+								id="zotero-tags-splitter"
+								orient="vertical"
+								collapse="after"
+								zotero-persist="state"
+								onmousemove="if (this.getAttribute('state') == 'dragging') { ZoteroPane.handleTagSelectorResize(); }"
+						>
+							<grippy oncommand="ZoteroPane_Local.toggleTagSelector()"/>
+						</splitter>
+						<!-- 'collapsed' is no longer necessary here due to the persisted 'state' on
+							 zotero-tags-splitter, but without this an old-style entry for 'collapsed'
+							 in localstore.rdf can cause the pane to always be closed on Zotero open.
+							 
+							 TODO: deal with this some other way?
+						-->
+						<vbox id="zotero-tag-selector-container" zotero-persist="height,collapsed">
+							<html:div id="zotero-tag-selector"/>
+						</vbox>
 					</vbox>
-
-					<splitter id="zotero-items-splitter" resizebefore="closest" resizeafter="closest" collapse="after" orient="horizontal" zotero-persist="state orient"
-						onmousemove="ZoteroPane.updateToolbarPosition(); ZoteroPane.updateTagsBoxSize()"
-						oncommand="ZoteroPane.updateToolbarPosition(); ZoteroPane.updateTagsBoxSize()">
-						<grippy id="zotero-items-grippy"/>
+					
+					<splitter id="zotero-collections-splitter" resizebefore="closest" resizeafter="closest" collapse="before"
+						zotero-persist="state"
+						onmousemove="document.getElementById('zotero-items-toolbar').setAttribute('state', this.getAttribute('state'));ZoteroPane_Local.updateToolbarPosition();"
+						oncommand="ZoteroPane_Local.updateToolbarPosition()">
+						<grippy id="zotero-collections-grippy"/>
 					</splitter>
-
-					<!-- itemPane.xul -->
-					<vbox id="zotero-item-pane"/>
-				</box>
-			</hbox>
-		</vbox>
+					
+					<box id="zotero-layout-switcher" orient="horizontal" zotero-persist="orient" flex="1">
+						<vbox id="zotero-items-pane" zotero-persist="width height" flex="1">
+							<deck id="zotero-items-pane-content" selectedIndex="0" flex="1">
+								<!-- Key navigation is handled by listener in itemTreeView.js -->
+								<tree 
+									id="zotero-items-tree"
+									enableColumnDrag="true"
+									disableKeyNavigation="true"
+									onfocus="if (ZoteroPane_Local.itemsView.rowCount &amp;&amp; !ZoteroPane_Local.itemsView.selection.count) { ZoteroPane_Local.itemsView.selection.select(0); }"
+									onkeydown="ZoteroPane_Local.handleKeyDown(event, this.id)"
+									onselect="ZoteroPane_Local.itemSelected(event)"
+									oncommand="ZoteroPane_Local.serializePersist()"
+									oncontextmenu="ZoteroPane.onItemsContextMenuOpen(event)"
+									flex="1"
+									hidden="true"
+									zotero-persist="current-view-group">
+									<treecols id="zotero-items-columns-header">
+										<treecol
+											id="zotero-items-column-title" primary="true" default-in="default feed"
+											label="&zotero.items.title_column;" ignoreincolumnpicker="true"
+											flex="4" zotero-persist="width ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>
+										<treecol
+											id="zotero-items-column-firstCreator" default-in="default feed"
+											label="&zotero.items.creator_column;"
+											flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>
+										<treecol
+											id="zotero-items-column-itemType"
+											label="&zotero.items.type_column;"
+											width="40" zotero-persist="width ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>
+										<treecol
+											id="zotero-items-column-date" default-in="feed"
+											label="&zotero.items.date_column;"
+											flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>
+										<treecol
+											id="zotero-items-column-year" disabled-in="feed"
+											label="&zotero.items.year_column;"
+											flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>
+										<treecol
+											id="zotero-items-column-publisher"
+											label="&zotero.items.publisher_column;"
+											flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>
+										<treecol
+											id="zotero-items-column-publicationTitle" disabled-in="feed"
+											label="&zotero.items.publication_column;"
+											flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>
+										<treecol
+											id="zotero-items-column-journalAbbreviation" disabled-in="feed"
+											submenu="true"
+											label="&zotero.items.journalAbbr_column;"
+											flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>
+										<treecol
+											id="zotero-items-column-language"
+											submenu="true"
+											label="&zotero.items.language_column;"
+											flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>
+										<treecol
+											id="zotero-items-column-accessDate" disabled-in="feed"
+											submenu="true"
+											label="&zotero.items.accessDate_column;"
+											flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>
+										<treecol
+											id="zotero-items-column-libraryCatalog" disabled-in="feed"
+											submenu="true"
+											label="&zotero.items.libraryCatalog_column;"
+											flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>
+										<treecol
+											id="zotero-items-column-callNumber" disabled-in="feed"
+											submenu="true"
+											label="&zotero.items.callNumber_column;"
+											flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>
+										<treecol
+											id="zotero-items-column-rights"
+											submenu="true"
+											label="&zotero.items.rights_column;"
+											flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>
+										<treecol
+											id="zotero-items-column-dateAdded" disabled-in="feed"
+											label="&zotero.items.dateAdded_column;"
+											flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>
+										<treecol
+											id="zotero-items-column-dateModified" disabled-in="feed"
+											label="&zotero.items.dateModified_column;"
+											flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>
+										<treecol
+											id="zotero-items-column-archive" disabled-in="feed"
+											submenu="true"
+											label="&zotero.items.archive_column;"
+											flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>								
+										<treecol
+											id="zotero-items-column-archiveLocation" disabled-in="feed"
+											submenu="true"
+											label="&zotero.items.archiveLocation_column;"
+											flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>
+										<treecol
+											id="zotero-items-column-place" disabled-in="feed"
+											submenu="true"
+											label="&zotero.items.place_column;"
+											flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>
+										<treecol
+											id="zotero-items-column-volume" disabled-in="feed"
+											submenu="true"
+											label="&zotero.items.volume_column;"
+											flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>
+										<treecol
+											id="zotero-items-column-edition" disabled-in="feed"
+											submenu="true"
+											label="&zotero.items.edition_column;"
+											flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>
+										<treecol
+											id="zotero-items-column-pages" disabled-in="feed"
+											submenu="true"
+											label="&zotero.items.pages_column;"
+											flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>
+										<treecol
+											id="zotero-items-column-issue" disabled-in="feed"
+											submenu="true"
+											label="&zotero.items.issue_column;"
+											flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>
+										<treecol
+											id="zotero-items-column-series" disabled-in="feed"
+											submenu="true"
+											label="&zotero.items.series_column;"
+											flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>
+										<treecol
+											id="zotero-items-column-seriesTitle" disabled-in="feed"
+											submenu="true"
+											label="&zotero.items.seriesTitle_column;"
+											flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>
+										<treecol
+											id="zotero-items-column-court" disabled-in="feed"
+											submenu="true"
+											label="&zotero.items.court_column;"
+											flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>
+										<treecol
+											id="zotero-items-column-medium" disabled-in="feed"
+											submenu="true"
+											label="&zotero.items.medium_column;"
+											flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>
+										<treecol
+											id="zotero-items-column-genre" disabled-in="feed"
+											submenu="true"
+											label="&zotero.items.genre_column;"
+											flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>
+										<treecol
+											id="zotero-items-column-system" disabled-in="feed"
+											submenu="true"
+											label="&zotero.items.system_column;"
+											flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>
+										<treecol
+											id="zotero-items-column-extra" disabled-in="feed"
+											label="&zotero.items.extra_column;"
+											flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>
+										<treecol
+											id="zotero-items-column-hasAttachment" default-in="default" disabled-in="feed" 
+											class="treecol-image"
+											label="&zotero.tabs.attachments.label;"
+											fixed="true"
+											zotero-persist="ordinal hidden sortActive sortDirection"/>
+										<splitter class="tree-splitter"/>
+										<treecol
+											id="zotero-items-column-numNotes" disabled-in="feed"
+											class="treecol-image"
+											label="&zotero.tabs.notes.label;"
+											zotero-persist="width ordinal hidden sortActive sortDirection"/>
+									</treecols>
+									<treechildren ondragstart="ZoteroPane_Local.itemsView.onDragStart(event)"
+										ondragenter="return ZoteroPane_Local.itemsView.onDragEnter(event)"
+										ondragover="return ZoteroPane_Local.itemsView.onDragOver(event)"
+										ondrop="return ZoteroPane_Local.itemsView.onDrop(event)"
+										ondragend="ZoteroPane_Local.itemsView.onDragEnd(event)"/>
+								</tree>
+	
+								<!-- Label for displaying messages when items pane is hidden
+								 (e.g. "Advanced search mode — press Enter to search.")-->
+								<vbox id="zotero-items-pane-message-box" pack="center" align="center"
+									ondragenter="return ZoteroPane.itemsView.onDragEnter(event)"
+									ondragover="return ZoteroPane.itemsView.onDragOver(event)"
+									ondrop="ZoteroPane.itemsView.onDrop(event); ZoteroPane.itemsView.drop(-1, -1, event.dataTransfer)"/>
+							</deck>
+						</vbox>
+	
+						<splitter id="zotero-items-splitter" resizebefore="closest" resizeafter="closest" collapse="after" orient="horizontal" zotero-persist="state orient"
+							onmousemove="ZoteroPane.updateToolbarPosition(); ZoteroPane.updateTagsBoxSize()"
+							oncommand="ZoteroPane.updateToolbarPosition(); ZoteroPane.updateTagsBoxSize()">
+							<grippy id="zotero-items-grippy"/>
+						</splitter>
+	
+						<!-- itemPane.xul -->
+						<vbox id="zotero-item-pane"/>
+					</box>
+				</hbox>
+			</vbox>
+		</deck>
 		
 		<!-- Barrier to prevent tabbing into Zotero pane when busy -->
 		<box id="zotero-pane-tab-catcher-bottom" hidden="true" align="center" pack="center" style="opacity: 0">
diff --git a/scss/_zotero-react-client.scss b/scss/_zotero-react-client.scss
index c99c1f191f..0e40965eb6 100644
--- a/scss/_zotero-react-client.scss
+++ b/scss/_zotero-react-client.scss
@@ -25,8 +25,10 @@
 @import "components/createParent";
 @import "components/editable";
 @import "components/icons";
+@import "components/mainWindow";
 @import "components/progressMeter";
 @import "components/search";
 @import "components/syncButtonTooltip";
+@import "components/tabsBar";
 @import "components/tagsBox";
 @import "components/tagSelector";
diff --git a/scss/components/_mainWindow.scss b/scss/components/_mainWindow.scss
new file mode 100644
index 0000000000..3aa8e23067
--- /dev/null
+++ b/scss/components/_mainWindow.scss
@@ -0,0 +1,149 @@
+:root {
+  --tab-min-height: 30px;
+  --tabs-border-color: rgba(0,0,0,.3);
+  --tabline-color: #0a84ff;
+
+  --toolbar-non-lwt-bgcolor: #f9f9fa;
+  --toolbar-non-lwt-textcolor: #0c0c0d;
+  --toolbar-non-lwt-bgimage: none;
+  --toolbar-bgcolor: var(--toolbar-non-lwt-bgcolor);
+  --toolbar-bgimage: var(--toolbar-non-lwt-bgimage);
+  --chrome-content-separator-color: hsl(0, 0%, 60%);
+
+  --toolbarbutton-border-radius: 3px;
+  --toolbarbutton-icon-fill-opacity: .85;
+  --toolbarbutton-hover-background: hsla(0, 0%, 100%, .1)
+                                    linear-gradient(hsla(0, 0%, 100%, .3),
+                                    hsla(0, 0%, 100%, .1)) no-repeat;
+  --toolbarbutton-hover-bordercolor: hsla(0, 0%, 0%, .2);
+  --toolbarbutton-header-bordercolor: hsla(0, 0%, 0%, .2);
+  --toolbarbutton-hover-boxshadow: 0 1px 0 hsla(0, 0%, 100%, .5),
+                                   0 1px 0 hsla(0, 0%, 100%, .5) inset;
+
+  --toolbarbutton-active-background: hsla(0, 0%, 0%, .02)
+                                     linear-gradient(hsla(0, 0%, 0%, .12),
+                                     transparent) border-box;
+  --toolbarbutton-active-bordercolor: hsla(0, 0%, 0%, .3);
+  --toolbarbutton-active-boxshadow: 0 1px 0 hsla(0, 0%, 100%, .5),
+                                    0 1px 0 hsla(0, 0%, 0%, .05) inset,
+                                    0 1px 1px hsla(0, 0%, 0%, .2) inset;
+  --toolbarbutton-inactive-bordercolor: rgba(0, 0, 0, 0.1);
+  --toolbarbutton-inactive-boxshadow: 0 1px 0 hsla(0, 0%, 0%, .05) inset;
+  --toolbarbutton-checkedhover-backgroundcolor: hsla(0, 0%, 0%, .09);
+  --toolbarbutton-icon-fill-attention: var(--lwt-toolbarbutton-icon-fill-attention, #0a84ff);
+
+  --lwt-header-image: none;
+  --row-grouped-header-bg-color: #d5d5d5;
+  --row-grouped-header-bg-color-selected: #3874d1;
+  --panel-separator-color: hsla(210, 4%, 10%, .14);
+  --arrowpanel-dimmed: hsla(0, 0%, 80%, .3);
+  --arrowpanel-dimmed-further: hsla(0, 0%, 80%, .45);
+  --splitter-color: #bdbdbd;
+  --urlbar-popup-url-color: hsl(210, 77%, 47%);
+  --urlbar-popup-action-color: hsl(178, 100%, 28%);
+}
+
+:root {
+  --autocomplete-popup-background: -moz-field;
+  --autocomplete-popup-color: -moz-fieldtext;
+  --autocomplete-popup-border-color: ThreeDShadow;
+  --autocomplete-popup-highlight-background: Highlight;
+  --autocomplete-popup-highlight-color: HighlightText;
+  /* Note: Setting this to 0 (without px) breaks CSS calculations for OSX. */
+  --space-above-tabbar: 0px;
+}
+
+:root:-moz-window-inactive {
+  --toolbar-bgcolor: -moz-mac-chrome-inactive;
+}
+
+
+
+
+#titlebar {
+	margin-bottom: -30px;
+	-moz-box-pack: center;
+}
+
+#personal-bookmarks {
+  -moz-window-dragging: inherit;
+}
+
+toolbarpaletteitem {
+  -moz-window-dragging: no-drag;
+  -moz-box-pack: start;
+}
+
+.titlebar-buttonbox-container {
+  -moz-box-ordinal-group: 1000;
+}
+
+#titlebar-fullscreen-button {
+  -moz-appearance: -moz-mac-fullscreen-button;
+}
+
+
+
+
+
+
+
+/* ::::: Tabs in Titlebar :::::: */
+
+/**
+ * For tabs in titlebar on OS X, we stretch the titlebar down so that the
+ * tabstrip can overlap it.
+ */
+#main-window[tabsintitlebar] > #titlebar {
+  min-height: calc(var(--tab-min-height) + var(--space-above-tabbar));
+}
+
+#main-window[tabsintitlebar="true"]:not(:-moz-lwtheme) > #titlebar {
+  -moz-appearance: -moz-window-titlebar;
+}
+
+#main-window:not([tabsintitlebar]) .titlebar-placeholder {
+  visibility: collapse;
+}
+
+/* NB: these would be margin-inline-start/end if it wasn't for the fact that OS X
+ * doesn't reverse the order of the items in the titlebar in RTL mode. */
+.titlebar-placeholder[type="caption-buttons"],
+#titlebar-buttonbox {
+  margin-right: 12px;
+  margin-left: 12px;
+}
+
+.titlebar-placeholder[type="fullscreen-button"],
+#titlebar-fullscreen-button {
+  margin-right: 7px;
+  margin-left: 7px;
+}
+
+#titlebar-fullscreen-button {
+  -moz-appearance: -moz-mac-fullscreen-button;
+}
+
+#titlebar-buttonbox {
+  -moz-appearance: -moz-window-button-box;
+}
+
+/* Fullscreen and caption buttons don't move with RTL on OS X so override the automatic ordering. */
+#titlebar-fullscreen-button:-moz-locale-dir(ltr),
+#titlebar-buttonbox-container:-moz-locale-dir(rtl),
+.titlebar-placeholder[type="fullscreen-button"]:-moz-locale-dir(ltr),
+.titlebar-placeholder[type="caption-buttons"]:-moz-locale-dir(rtl) {
+  -moz-box-ordinal-group: 1000;
+}
+
+#titlebar-fullscreen-button:-moz-locale-dir(rtl),
+#titlebar-buttonbox-container:-moz-locale-dir(ltr),
+.titlebar-placeholder[type="caption-buttons"]:-moz-locale-dir(ltr),
+.titlebar-placeholder[type="fullscreen-button"]:-moz-locale-dir(rtl) {
+  -moz-box-ordinal-group: 0;
+}
+
+#main-window[sizemode="fullscreen"] .titlebar-placeholder[type="fullscreen-button"],
+#main-window[sizemode="fullscreen"] .titlebar-placeholder[type="caption-buttons"] {
+  display: none;
+}
diff --git a/scss/components/_tabsBar.scss b/scss/components/_tabsBar.scss
new file mode 100644
index 0000000000..3fe4450e23
--- /dev/null
+++ b/scss/components/_tabsBar.scss
@@ -0,0 +1,42 @@
+#tab-bar-container {
+	min-height: 30px;
+}
+
+.tabs {
+	display: flex;
+}
+
+.tab {
+	-moz-appearance: toolbar;
+	width: 200px;
+	height: 30px;
+	line-height: 30px;
+	display: flex;
+	justify-content: center;
+	align-content: center;
+	position: relative;
+	background: #f9f9f9;
+	border: 1px solid black;
+	margin-right: -1px;
+	border-bottom: 1px solid transparent;
+	color: #000;
+	
+	.tab-name {
+		line-height: 30px;
+	}
+	
+	.tab-close {
+		position: absolute;
+		left: 6px;
+		top: 7px;
+		width: 16px;
+		height: 16px;
+		text-align: center;
+		line-height: 16px;
+		display: none;
+	}
+	
+	&:hover:not(:first-child) .tab-close {
+		display: block;
+	}
+}
\ No newline at end of file
diff --git a/scss/mac/_tabsBar.scss b/scss/mac/_tabsBar.scss
new file mode 100644
index 0000000000..ed7310c942
--- /dev/null
+++ b/scss/mac/_tabsBar.scss
@@ -0,0 +1,9 @@
+.tabs {
+	-moz-window-dragging: drag;
+	margin-left: 78px;
+}
+
+.tab {
+	-moz-window-dragging: no-drag;
+	
+}
\ No newline at end of file
diff --git a/scss/zotero-react-client-mac.scss b/scss/zotero-react-client-mac.scss
index 2678caa9c9..3db5c8b167 100644
--- a/scss/zotero-react-client-mac.scss
+++ b/scss/zotero-react-client-mac.scss
@@ -8,4 +8,5 @@
 @import "mac/createParent";
 @import "mac/editable";
 @import "mac/search";
+@import "mac/tabsBar";
 @import "mac/tag-selector";