From 3fd0523b6e4d61d4328e4e6bc14818ba2aaad23b Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Wed, 9 Feb 2011 06:42:08 +0000
Subject: [PATCH] - fix preference links - fix tab mode tooltip -
 zotero://fullscreen opens standalone

---
 chrome/content/zotero/overlay.js                  | 2 +-
 chrome/content/zotero/preferences/preferences.xul | 2 +-
 chrome/content/zotero/zoteroPane.xul              | 2 +-
 chrome/locale/en-US/zotero/preferences.dtd        | 1 +
 chrome/locale/en-US/zotero/zotero.dtd             | 2 +-
 components/zotero-protocol-handler.js             | 8 ++++----
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/chrome/content/zotero/overlay.js b/chrome/content/zotero/overlay.js
index 8dffd00db..3071346c4 100644
--- a/chrome/content/zotero/overlay.js
+++ b/chrome/content/zotero/overlay.js
@@ -315,7 +315,7 @@ var ZoteroOverlay = new function()
 		} else {		// Zotero is running in the pane
 			if(setMode === false) return;
 			// close Zotero pane
-			this.toggleDisplay();
+			this.toggleDisplay(false);
 			
 			// open Zotero tab
 			this.isTab = true;
diff --git a/chrome/content/zotero/preferences/preferences.xul b/chrome/content/zotero/preferences/preferences.xul
index 5d916ef46..c67af25c8 100644
--- a/chrome/content/zotero/preferences/preferences.xul
+++ b/chrome/content/zotero/preferences/preferences.xul
@@ -572,7 +572,7 @@ To add a new preference:
 					<label id="wordProcessors-noWordProcessorPluginsInstalled" width="45em" hidden="true">
 							&zotero.preferences.cite.wordProcessors.noWordProcessorPluginsInstalled;
 					</label>
-					<label id="wordProcessors-getWordProcessorPlugins" class="text-link" href="http://www.zotero.org/support/word_processor_plugin_installation#word_processor_plugins_for_zotero_2.0" value="&zotero.preferences.cite.wordProcessors.getPlugins;"/>
+					<label id="wordProcessors-getWordProcessorPlugins" class="text-link" href="&zotero.preferences.cite.wordProcessor.getPlugins.url;" value="&zotero.preferences.cite.wordProcessors.getPlugins;"/>
 				</tabpanel>
 				<tabpanel orient="vertical" id="styles">
 					<groupbox flex="1">
diff --git a/chrome/content/zotero/zoteroPane.xul b/chrome/content/zotero/zoteroPane.xul
index 22b313fa4..ebf2336c5 100644
--- a/chrome/content/zotero/zoteroPane.xul
+++ b/chrome/content/zotero/zoteroPane.xul
@@ -389,7 +389,7 @@
 						</tooltip>
 					</toolbarbutton>
 					<toolbarseparator id="zotero-fullscreen-close-separator"/>
-					<toolbarbutton id="zotero-tb-fullscreen" tooltiptext="&zotero.toolbar.fullscreen.tooltip;" oncommand="ZoteroPane.toggleTab();" class="zotero-tb-button"/>
+					<toolbarbutton id="zotero-tb-fullscreen" tooltiptext="&zotero.toolbar.tab.tooltip;" oncommand="ZoteroPane.toggleTab();" class="zotero-tb-button"/>
 					<toolbarbutton id="zotero-close-button" class="tabs-closebutton" oncommand="ZoteroOverlay.toggleDisplay()"/>
 				</hbox>
 				<!-- TODO: localize -->
diff --git a/chrome/locale/en-US/zotero/preferences.dtd b/chrome/locale/en-US/zotero/preferences.dtd
index 13980a98a..083e1afe3 100644
--- a/chrome/locale/en-US/zotero/preferences.dtd
+++ b/chrome/locale/en-US/zotero/preferences.dtd
@@ -104,6 +104,7 @@
 <!ENTITY zotero.preferences.cite.wordProcessors	"Word Processors">
 <!ENTITY zotero.preferences.cite.wordProcessors.noWordProcessorPluginsInstalled "No word processor plug-ins are currently installed.">
 <!ENTITY zotero.preferences.cite.wordProcessors.getPlugins	"Get word processor plug-ins...">
+<!ENTITY zotero.preferences.cite.wordProcessors.getPlugins.url	"http://www.zotero.org/support/word_processor_plugin_installation">
 
 <!ENTITY zotero.preferences.cite.styles.styleManager				"Style Manager">
 <!ENTITY zotero.preferences.cite.styles.styleManager.title		"Title">
diff --git a/chrome/locale/en-US/zotero/zotero.dtd b/chrome/locale/en-US/zotero/zotero.dtd
index fac2d32fe..4b57c0d53 100644
--- a/chrome/locale/en-US/zotero/zotero.dtd
+++ b/chrome/locale/en-US/zotero/zotero.dtd
@@ -87,7 +87,7 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation		"Support and Documentation">
 <!ENTITY zotero.toolbar.about.label					"About Zotero">
 <!ENTITY zotero.toolbar.advancedSearch				"Advanced Search">
-<!ENTITY zotero.toolbar.fullscreen.tooltip				"Toggle Fullscreen Mode">
+<!ENTITY zotero.toolbar.tab.tooltip					"Toggle Tab Mode">
 <!ENTITY zotero.toolbar.openURL.label					"Locate">
 <!ENTITY zotero.toolbar.openURL.tooltip				"Find through your local library">
 
diff --git a/components/zotero-protocol-handler.js b/components/zotero-protocol-handler.js
index 188898d72..f0b84cc5f 100644
--- a/components/zotero-protocol-handler.js
+++ b/components/zotero-protocol-handler.js
@@ -880,10 +880,10 @@ function ChromeExtensionHandler() {
 				.wrappedJSObject;
 				
 			generateContent: try {
-				var win = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-					.getService(Components.interfaces.nsIWindowMediator)
-					.getMostRecentWindow("navigator:browser");
-				win.ZoteroOverlay.toggleTab(true);
+				var window = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
+					.getService(Components.interfaces.nsIWindowWatcher)
+					.openWindow(null, 'chrome://zotero/content/standalone.xul', '',
+						'chrome,centerscreen,resizable', null);
 			}
 			catch (e) {
 				Zotero.debug(e);