From 3701b841166c24e4cfdb61da02d39f3b8f9b7762 Mon Sep 17 00:00:00 2001
From: Martynas Bagdonas <martbgd@gmail.com>
Date: Fri, 25 Sep 2020 19:44:48 +0300
Subject: [PATCH] Proof of concept note view in tab mode

---
 chrome/content/zotero/tabs.js         |   3 +
 chrome/content/zotero/xpcom/reader.js |  16 +
 chrome/content/zotero/zoteroPane.js   |  23 +
 chrome/content/zotero/zoteroPane.xul  | 720 +++++++++++++-------------
 4 files changed, 407 insertions(+), 355 deletions(-)

diff --git a/chrome/content/zotero/tabs.js b/chrome/content/zotero/tabs.js
index a426f3a27a..cf4f40c771 100644
--- a/chrome/content/zotero/tabs.js
+++ b/chrome/content/zotero/tabs.js
@@ -197,6 +197,9 @@ var Zotero_Tabs = new function () {
 		this._selectedID = id;
 		this.deck.selectedIndex = Array.from(this.deck.children).findIndex(x => x.id == id);
 		this._update();
+		if (this.onTabSelect) {
+			this.onTabSelect(tab.type);
+		}
 	};
 
 	/**
diff --git a/chrome/content/zotero/xpcom/reader.js b/chrome/content/zotero/xpcom/reader.js
index c4f8e37df5..9967469f66 100644
--- a/chrome/content/zotero/xpcom/reader.js
+++ b/chrome/content/zotero/xpcom/reader.js
@@ -481,6 +481,22 @@ class ReaderTab extends ReaderInstance {
 		}
 	}
 	
+	_toggleNoteSidebar(isToggled) {
+		let itemPane = this._window.document.getElementById('zotero-item-pane');
+		var noteEditor = this._window.document.getElementById('zotero-note-editor');
+		let item = noteEditor.item;
+		let zp = Zotero.getActiveZoteroPane();
+		if (itemPane.hidden) {
+			if (item) {
+				zp.selectItem(item.id);
+				itemPane.hidden = false;
+			}
+		}
+		else {
+			itemPane.hidden = true;
+		}
+	}
+	
 	_setTitleValue(title) {
 		this._window.Zotero_Tabs.rename(this.tabID, title);
 	}
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index b7af1d897c..97f51c9231 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -131,6 +131,29 @@ var ZoteroPane = new function()
 		
 		// continue loading pane
 		_loadPane();
+		
+		Zotero_Tabs.onTabSelect = (type) => {
+			let toolbar = document.getElementById('zotero-pane-horizontal-space');
+			let extendedToolbar = document.getElementById('zotero-reader-toolbar-extension');
+			let itemPane = document.getElementById('zotero-item-pane');
+			if (type == 'library') {
+				toolbar.hidden = false;
+				extendedToolbar.hidden = true;
+				itemPane.hidden = false;
+			}
+			else {
+				toolbar.hidden = true;
+				extendedToolbar.hidden = false;
+				let items = ZoteroPane_Local.itemsView.getSelectedItems();
+				
+				if (items.length == 1 && items[0].isNote()) {
+					itemPane.hidden = false;
+				}
+				else {
+				itemPane.hidden = true;
+				}
+			}
+		}
 	};
 	
 	/**
diff --git a/chrome/content/zotero/zoteroPane.xul b/chrome/content/zotero/zoteroPane.xul
index e6c9d11007..d2bb5da07f 100644
--- a/chrome/content/zotero/zoteroPane.xul
+++ b/chrome/content/zotero/zoteroPane.xul
@@ -74,13 +74,8 @@
 	</commandset>
 	
 	<stack id="zotero-pane-stack">
-		<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;">
-				
+		<vbox>
+			<vbox id="zotero-pane-horizontal-space">
 				<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"/>
@@ -194,10 +189,10 @@
 								</tooltip>
 							</hbox>
 						</hbox>
-	
+		
 						<hbox id="zotero-pq-buttons">
 						</hbox>
-	
+		
 						<toolbarbutton id="zotero-tb-sync-error" hidden="true"/>
 						
 						<!--
@@ -221,7 +216,7 @@
 						</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"/>
@@ -229,353 +224,368 @@
 						<div id="retracted-items-close">×</div>
 					</div>
 				</vbox>
-				
-				<popupset>
-					<!-- Allows iframes to show a tooltip popup for nodes with titles. `tooltip="iframeTooltip"` attribute has to be set for the iframe -->
-					<tooltip id="iframeTooltip" onpopupshowing="if (tooltipTitleNode = document.tooltipNode.closest('*[title]')) {this.setAttribute('label', tooltipTitleNode.getAttribute('title')); return true; } return false"/>
-					<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()"/>
-					</menupopup>
-					
-					<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>
-					
-					<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>
-					
-					<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>
 		
+			<hbox flex="1">
+				<deck flex="1" 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;">
+						<popupset>
+							<!-- Allows iframes to show a tooltip popup for nodes with titles. `tooltip="iframeTooltip"` attribute has to be set for the iframe -->
+							<tooltip id="iframeTooltip" onpopupshowing="if (tooltipTitleNode = document.tooltipNode.closest('*[title]')) {this.setAttribute('label', tooltipTitleNode.getAttribute('title')); return true; } return false"/>
+							<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()"/>
+							</menupopup>
+							
+							<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>
+							
+							<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>
+							
+							<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>
+							</box>
+						</hbox>
+					</vbox>
+				</deck>
+				
+				<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>
+		
+				<vbox>
+					<hbox id="zotero-reader-toolbar-extension" height="32" hidden="true"></hbox>
+					<!-- itemPane.xul -->
+					<vbox id="zotero-item-pane"/>
+				</vbox>
+			</hbox>
+		</vbox>
+
+
 		<!-- 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">
 			<checkbox/>