From 3c6e9afc2710637c065ba6642937c4bcbb454c5a Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sat, 26 Apr 2008 01:36:18 +0000
Subject: [PATCH] Closes # 986, Add text clarifying that Report Errors reports
 aren't viewed unless Report ID is posted

Removes middle pane in error reporting window (asking for more information) and changes message to instruct users to post to forums
---
 chrome/content/zotero/errorReport.xul | 34 +++++++--------------------
 chrome/locale/en-US/zotero/zotero.dtd |  9 +++----
 2 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/chrome/content/zotero/errorReport.xul b/chrome/content/zotero/errorReport.xul
index 556fba992..616ab9dd4 100644
--- a/chrome/content/zotero/errorReport.xul
+++ b/chrome/content/zotero/errorReport.xul
@@ -19,33 +19,29 @@
 			var data = obj.data;
 			var msg = data.msg;
 			var e = data.e;
-			var askForSteps = data.askForSteps;
 			var extraData = data.extraData ? data.extraData : '';
 			
 			function init() {
 				var wizard = document.getElementById('zotero-error-report');
 				
+				if (document.getElementById('zotero-failure-message').hasChildNodes()) {
+					var textNode = document.getElementById('zotero-failure-message').firstChild;
+					document.getElementById('zotero-failure-message').removeChild(textNode);
+				}
 				document.getElementById('zotero-failure-message').appendChild(document.createTextNode(msg));
 				document.getElementById('zotero-error-message').value = e;
 				
 				var continueButtonName = wizard.getButton('next').getAttribute('label');
 				var str = Zotero.getString('errorReport.advanceMessage', continueButtonName);
 				document.getElementById('zotero-advance-message').setAttribute('value', str);
-				
-				if (askForSteps) {
-					var str = Zotero.getString('errorReport.stepsToReproduce') + "\n\n1.\n2.\n3.\n\n"
-						+ Zotero.getString('errorReport.expectedResult') + "\n\n"
-						+ Zotero.getString('errorReport.actualResult') + "\n";
-					document.getElementById('zotero-error-steps').value = str;
-					document.getElementById('zotero-error-steps-box').setAttribute('hidden', false)
-				}
 			}
 			
 			function sendErrorReport() {
+				var wizard = document.getElementById('zotero-error-report');
+				var continueButtonName = wizard.getButton('next').disabled = true;
+				
 				var parts = {
 					error: "true",
-					email: document.getElementById('zotero-email-address').value,
-					errorSteps: document.getElementById('zotero-error-steps').value,
 					errorData: Zotero.getErrors(true).join('\n'),
 					extraData: extraData,
 					diagnostic: Zotero.getSystemInfo()
@@ -111,18 +107,6 @@
 		<description id="zotero-advance-message"/>
 	</wizardpage>
 	
-	<wizardpage label="&zotero.errorReport.additionalInfo; &zotero.general.optional;">
-		<hbox id="zotero-email-address-box">
-			<label value="&zotero.errorReport.emailAddress;" control="zotero-email-address"/>
-			<textbox id="zotero-email-address" flex="1"/>
-		</hbox>
-		
-		<vbox id="zotero-error-steps-box" hidden="true">
-			<description control="zotero-error-steps">&zotero.errorReport.errorSteps;</description>
-			<textbox id="zotero-error-steps" multiline="true" rows="6"/>
-		</vbox>
-	</wizardpage>
-	
 	<wizardpage onpageshow="Zotero_Error_Report.sendErrorReport()">
 		<description>&zotero.errorReport.submissionInProgress;</description>
 	</wizardpage>
@@ -133,7 +117,7 @@
 			&zotero.errorReport.reportID;
 			<textbox id="zotero-report-id" class="plain" readonly="true"/>
 		</description>
-		<description>&zotero.errorReport.includeReportID;</description>
-		<description>&zotero.errorReport.furtherAssistance;</description>
+		<description>&zotero.errorReport.postToForums;</description>
+		<description>&zotero.errorReport.notReviewed;</description>
 	</wizardpage>
 </wizard>
diff --git a/chrome/locale/en-US/zotero/zotero.dtd b/chrome/locale/en-US/zotero/zotero.dtd
index 9dbf082e7..73ecf48de 100644
--- a/chrome/locale/en-US/zotero/zotero.dtd
+++ b/chrome/locale/en-US/zotero/zotero.dtd
@@ -2,14 +2,11 @@
 <!ENTITY zotero.general.note								"Note:">
 
 <!ENTITY zotero.errorReport.unrelatedMessages				"The error log may include messages unrelated to Zotero.">
-<!ENTITY zotero.errorReport.additionalInfo					"Additional Information">
-<!ENTITY zotero.errorReport.emailAddress					"Your e-mail address:">
-<!ENTITY zotero.errorReport.errorSteps						"What were you doing when the error occurred? If possible, please include steps to reproduce the error.">
 <!ENTITY zotero.errorReport.submissionInProgress			"Please wait while the error report is submitted.">
-<!ENTITY zotero.errorReport.submitted						"The error report has been submitted.">
+<!ENTITY zotero.errorReport.submitted						"Your error report has been submitted.">
 <!ENTITY zotero.errorReport.reportID						"Report ID:">
-<!ENTITY zotero.errorReport.furtherAssistance				"See the Known Issues page and the forums for further assistance.">
-<!ENTITY zotero.errorReport.includeReportID				"Please include the Report ID in any correspondence with the Zotero developers regarding this issue.">
+<!ENTITY zotero.errorReport.postToForums					"Please post a message to the Zotero forums (forums.zotero.org) with this Report ID, a description of the problem, and any steps necessary to reproduce it.">
+<!ENTITY zotero.errorReport.notReviewed					"Error reports are generally not reviewed unless referred to in the forums.">
 
 <!ENTITY zotero.upgrade.newVersionInstalled				"You have installed a new version of Zotero.">
 <!ENTITY zotero.upgrade.upgradeRequired					"Your Zotero database must be upgraded to work with the new version.">