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 @@ - - - - - - - &zotero.errorReport.submissionInProgress; @@ -133,7 +117,7 @@ &zotero.errorReport.reportID; - &zotero.errorReport.includeReportID; - &zotero.errorReport.furtherAssistance; + &zotero.errorReport.postToForums; + &zotero.errorReport.notReviewed; 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 @@ - - - - + - - + +