From 8274c1c231c2a6147491e63e3ea70163ccda314e Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 14 May 2019 22:14:46 -0400
Subject: [PATCH] Tweaks to document import/export

Remove unused code and adjust text

Follow-up to 48778f28
---
 .../content/zotero-platform/mac/bibliography.css  |  3 ---
 chrome/content/zotero/bibliography.js             | 13 ++-----------
 .../zotero/integration/integrationDocPrefs.xul    |  8 --------
 chrome/locale/en-US/zotero/zotero.dtd             |  3 +--
 chrome/locale/en-US/zotero/zotero.properties      |  9 +++++----
 chrome/skin/default/zotero/bibliography.css       | 15 ---------------
 6 files changed, 8 insertions(+), 43 deletions(-)
 delete mode 100644 chrome/content/zotero-platform/mac/bibliography.css

diff --git a/chrome/content/zotero-platform/mac/bibliography.css b/chrome/content/zotero-platform/mac/bibliography.css
deleted file mode 100644
index 9a476e2b61..0000000000
--- a/chrome/content/zotero-platform/mac/bibliography.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.chevron {
-	font-size: 1.5em;
-}
\ No newline at end of file
diff --git a/chrome/content/zotero/bibliography.js b/chrome/content/zotero/bibliography.js
index cea8610800..86e3e25a46 100644
--- a/chrome/content/zotero/bibliography.js
+++ b/chrome/content/zotero/bibliography.js
@@ -243,27 +243,18 @@ var Zotero_File_Interface_Bibliography = new function() {
 		window.sizeToContent();
 	};
 	
-	this.toggleAdvanced = function() {
-		var advancedSettings = document.querySelector("#advanced-settings");
-		advancedSettings.hidden = !advancedSettings.hidden;
-		var chevron = document.querySelector('.chevron');
-		chevron.classList.toggle('chevron-down');
-		chevron.classList.toggle('chevron-up');
-		window.sizeToContent();
-	};
-	
 	this.exportDocument = function() {
 		const importExportWikiURL = "https://www.zotero.org/support/kb/export_import_document";
 		
 		var ps = Services.prompt;
-		var buttonFlags = (ps.BUTTON_POS_0) * (ps.BUTTON_TITLE_OK)
+		var buttonFlags = (ps.BUTTON_POS_0) * (ps.BUTTON_TITLE_IS_STRING)
 			+ (ps.BUTTON_POS_1) * (ps.BUTTON_TITLE_CANCEL)
 			+ (ps.BUTTON_POS_2) * (ps.BUTTON_TITLE_IS_STRING);
 		var result = ps.confirmEx(null,
 			Zotero.getString('integration.exportDocument'),
 			Zotero.getString('integration.exportDocument.description'),
 			buttonFlags,
-			null,
+			Zotero.getString('general.export'),
 			null,
 			Zotero.getString('general.moreInformation'), null, {});
 		if (result == 0) {
diff --git a/chrome/content/zotero/integration/integrationDocPrefs.xul b/chrome/content/zotero/integration/integrationDocPrefs.xul
index c6c069b0a9..2b55148fde 100644
--- a/chrome/content/zotero/integration/integrationDocPrefs.xul
+++ b/chrome/content/zotero/integration/integrationDocPrefs.xul
@@ -26,7 +26,6 @@
 <?xml-stylesheet href="chrome://global/skin/global.css"?>
 <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
 <?xml-stylesheet href="chrome://zotero/skin/bibliography.css"?>
-<?xml-stylesheet href="chrome://zotero-platform/content/bibliography.css"?>
 <!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd">
 
 <dialog
@@ -87,13 +86,6 @@
 			<description class="radioDescription">&zotero.integration.prefs.automaticJournalAbbeviations.caption;</description>
 		</vbox>
 		
-		<!--<vbox id="advanced-separator" align="center">-->
-			<!--<hbox align="center" onclick="Zotero_File_Interface_Bibliography.toggleAdvanced()">-->
-                <!--<label>&zotero.general.advancedOptions.label;</label>-->
-				<!--<label class="chevron chevron-down">➤</label>-->
-			<!--</hbox>-->
-		<!--</vbox>	-->
-		
 		<vbox id="advanced-settings" hidden="false">
 			<vbox id="automaticCitationUpdates-vbox">
 				<checkbox id="automaticCitationUpdates-checkbox" label="&zotero.integration.prefs.automaticCitationUpdates.label;" tooltiptext="&zotero.integration.prefs.automaticCitationUpdates.tooltip;"/>
diff --git a/chrome/locale/en-US/zotero/zotero.dtd b/chrome/locale/en-US/zotero/zotero.dtd
index b9983a5885..204fcb6f2c 100644
--- a/chrome/locale/en-US/zotero/zotero.dtd
+++ b/chrome/locale/en-US/zotero/zotero.dtd
@@ -246,8 +246,7 @@
 <!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label 		"Use MEDLINE journal abbreviations">
 <!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption	"The “Journal Abbr” field will be ignored.">
 
-<!ENTITY zotero.integration.prefs.exportDocument 		"Export document…">
-<!ENTITY zotero.integration.prefs.importDocument 		"Import document…">
+<!ENTITY zotero.integration.prefs.exportDocument 		"Export Document…">
 
 <!ENTITY zotero.integration.showEditor.label			"Show Editor">
 <!ENTITY zotero.integration.classicView.label			"Classic View">
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
index f12e0ad30e..35f2bfe3a1 100644
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@@ -41,6 +41,7 @@ general.character.plural			= characters
 general.create						= Create
 general.delete						= Delete
 general.remove = Remove
+general.export = Export
 general.moreInformation            = More Information
 general.seeForMoreInformation		= See %S for more information.
 general.open                       = Open %S
@@ -897,11 +898,11 @@ integration.delayCitationUpdates.alert.text2.tab = You will need to click Refres
 integration.delayCitationUpdates.alert.text3 = You can change this setting later in the document preferences.
 integration.delayCitationUpdates.bibliography.toolbar	= Automatic citation updates are disabled. To see the bibliography, click Refresh in the Zotero toolbar.
 integration.delayCitationUpdates.bibliography.tab	= Automatic citation updates are disabled. To see the bibliography, click Refresh in the Zotero tab.
-integration.importDocument                          = Import Document?
+integration.importDocument                          = Import Document
 integration.importDocument.description              = Would you like to import this document for use with Zotero?
-integration.exportDocument                          = Export Document?
-integration.exportDocument.description              = Exporting the document will allow you to import it in a different Zotero supported word processor and retain citation links. You should make a backup of your document before exporting. Do you want to proceed?
-integration.importInstructions = This document contains exported Zotero citations. Open it with a Zotero supported document editor and press "Refresh" in the Zotero plugin to import it. NOTE: Do not copy and paste the contents of the document from one processor to the other.
+integration.exportDocument                          = Export Document
+integration.exportDocument.description              = Exporting the document will allow you to open it in a different Zotero-supported word processor and retain citation links.\n\nYou should make a backup of the document before proceeding.
+integration.importInstructions = This document contains exported Zotero citations. Open it with a Zotero-supported word processor and press Refresh in the Zotero plugin to import it.
 
 styles.install.title				= Install Style
 styles.install.unexpectedError		= An unexpected error occurred while installing "%1$S"
diff --git a/chrome/skin/default/zotero/bibliography.css b/chrome/skin/default/zotero/bibliography.css
index 2352bec77b..84b6e5796c 100644
--- a/chrome/skin/default/zotero/bibliography.css
+++ b/chrome/skin/default/zotero/bibliography.css
@@ -29,21 +29,6 @@ radio:not(:first-child)
 	padding: 0 14px;
 }
 
-#advanced-separator * {
-	cursor: pointer;
-}
-
-.chevron {
-	color: #444;
-}
-
-.chevron.chevron-down {
-	transform: rotate(90deg);
-}
-.chevron.chevron-up {
-	transform: rotate(-90deg);
-}
-
 #advanced-settings > * {
 	margin-bottom: 10px;
 }