Some polish to the reporter tool. No bug r+a=ben

2005-06-10 00:42:07 +00:00 · 2005-06-10 00:42:07 +00:00 · e5be9bbeec
--- a/extensions/reporter/locales/en-US/chrome/reportResults.dtd
+++ b/extensions/reporter/locales/en-US/chrome/reportResults.dtd
@ -9,6 +9,6 @@
 <!ENTITY reportUseragent             "Useragent">
 <!ENTITY reportLanguage              "Language">
 <!ENTITY reportEmail                 "Email">
-<!ENTITY error                       "Error">
+<!ENTITY error                       "Error Details">
 <!ENTITY faultCode                   "Code">
 <!ENTITY faultMessage                "Message">
--- a/extensions/reporter/locales/en-US/chrome/reportWizard.properties
+++ b/extensions/reporter/locales/en-US/chrome/reportWizard.properties
@ -1,5 +1,7 @@
 sendingReport=Sending Report...
 reportSent=Report Sent

+finishError=Error Sending Report
+
 successfullyCreatedReport=Successfully Transmitted Report
-failedCreatingReport=Error Creating Report
+failedCreatingReport=There was an error creating the report, and so no information was sent to mozilla.org
--- a/extensions/reporter/resources/content/reporter/error.xhtml
+++ b/extensions/reporter/resources/content/reporter/error.xhtml
@ -50,15 +50,6 @@
 </head>
 <body>
 	<h3>&error;</h3>
-	<table>
-		<tr>
-			<th>&faultCode;:</th>
-			<td><span id="faultCode"/></td>
-		</tr>
-		<tr>
-			<th>&faultMessage;:</th>
-			<td><span id="faultMessage"/></td>
-		</tr>
-	</table>
+	<div id="messagediv"><span id="faultMessage"/></div>
 </body>
 </html>
--- a/extensions/reporter/resources/content/reporter/reportWizard.js
+++ b/extensions/reporter/resources/content/reporter/reportWizard.js
@ -161,6 +161,7 @@ function getSysID() {
 function sendReport() {
  // we control the user path from here.
  var reportWizard = document.getElementById('reportWizard');
+
  reportWizard.canRewind = false;
  reportWizard.canAdvance = false;
  // why would we need a cancel button?
@ -237,13 +238,17 @@ function sendReport() {
    // If there was an error from the server
    finishExtendedSuccess.setAttribute("class", "hide");

+    // Change the label on the page so users know we have an error
+    var finishPage = document.getElementById('finish');
+    finishPage.setAttribute("label",strbundle.getString("finishError"));
+
    reportWizard.canAdvance = true;
    reportWizard.advance();

    finishSummary.setAttribute("value",strbundle.getString("failedCreatingReport"));

    finishExtendedDoc = finishExtendedFailed.contentDocument;
-    finishExtendedDoc.getElementById('faultCode').textContent = gFaultCode;
+    //finishExtendedDoc.getElementById('faultCode').textContent = gFaultCode;
    finishExtendedDoc.getElementById('faultMessage').textContent = gFaultMessage;
  }
  document.getElementById('finishExtendedFrame').collapsed = true;
--- a/extensions/reporter/resources/content/reporter/reportWizard.xul
+++ b/extensions/reporter/resources/content/reporter/reportWizard.xul
@ -61,7 +61,9 @@
    </vbox>
    <description id="mustAgree">&reportWizardMustAgree.description;</description>
    <vbox>
-      <checkbox id="dontShowPrivacyStatement" label="&dontShowPrivacyStatement.label;" accesskey="&dontShowPrivacyStatement.accesskey;" oncommand="privacyPolicyCheckbox()" />
+      <hbox>
+        <checkbox id="dontShowPrivacyStatement" label="&dontShowPrivacyStatement.label;" accesskey="&dontShowPrivacyStatement.accesskey;" oncommand="privacyPolicyCheckbox()" />
+      </hbox>
    </vbox>
  </wizardpage>

@ -77,15 +79,15 @@
        <column flex="1"/>
      </columns>
      <rows>
-        <row>
+        <row align="center">
          <label control="url" value="&reportForm.url.title;"/>
          <textbox id="url" size="60" readonly="true" class="noborder"/>
        </row>
-        <row>
+        <row align="center">
          <spacer/>
          <checkbox id="behind_login" label="&reportForm.behind_login.title;" accesskey="&reportForm.behind_login.accesskey;"/>
        </row>
-        <row>
+        <row align="center">
          <label control="problem_type" value="&reportForm.problem_type.title;" accesskey="&reportForm.problem_type.accesskey;"/>
          <!-- XXX: Perhaps this should eventually/maybe come from somewhere else?  Eh, not sure so lets just hardcode this for now. -->
          <menulist label="problem_type" id="problem_type" oncommand="validateForm()">
@ -106,19 +108,21 @@
        </row>
        <row>
          <label control="description" value="&reportForm.describe.title;" accesskey="&reportForm.describe.accesskey;"/>
-          <textbox id="description" value="" cols="40" rows="7" multiline="true" size="40" class="noborder"/>
+          <textbox id="description" value="" cols="40" rows="5" multiline="true" size="40" class="noborder"/>
        </row>
-        <row>
+        <row align="center">
          <label control="email" value="&reportForm.email.title;" accesskey="&reportForm.email.accesskey;"/>
          <textbox id="email" size="60" class="noborder"/>
        </row>
-        <row>
+        <row align="center">
          <spacer/>
-          <label id="privacyPolicy"
-                 onclick="openPrivacyPolicy();"
-                 onkeypress="if (event.keyCode == event.DOM_VK_ENTER || event.keyCode == event.DOM_VK_RETURN) openPrivacyPolicy();"
-                 value="&reportForm.privacyPolicy.title;"
-                 tooltiptext="&reportForm.privacyPolicy.tooltip;"/>
+          <hbox>
+            <label id="privacyPolicy"
+                   onclick="openPrivacyPolicy();"
+                   onkeypress="if (event.keyCode == event.DOM_VK_ENTER || event.keyCode == event.DOM_VK_RETURN) openPrivacyPolicy();"
+                   value="&reportForm.privacyPolicy.title;"
+                   tooltiptext="&reportForm.privacyPolicy.tooltip;"/>
+          </hbox>
        </row>
      </rows>
    </grid>
@ -138,7 +142,9 @@
  <wizardpage id="finish"
              label="&finish.label;">
    <textbox id="finishSummary" size="60" readonly="true"/>
-   <checkbox id="showDetail" label="&reportResults.showDetail.title;" accesskey="&reportResults.showDetail.accesskey;" oncommand="showDetail()"/>
+   <hbox>
+     <checkbox id="showDetail" label="&reportResults.showDetail.title;" accesskey="&reportResults.showDetail.accesskey;" oncommand="showDetail()"/>
+    </hbox>
    <vbox id="finishExtendedFrame" flex="1">
      <iframe id="finishExtendedSuccess" type="content" src="report.xhtml" flex="1"/>
      <iframe id="finishExtendedFailed" type="content" src="error.xhtml" flex="1"/>
--- a/extensions/reporter/resources/skin/classic/reporter/reportWizard.css
+++ b/extensions/reporter/resources/skin/classic/reporter/reportWizard.css
@ -62,3 +62,7 @@
 #privacyPolicy:focus {
  outline: 1px dotted invert ! important;
 }
+
+wizard[description=""] .wizard-header-description { 
+  display: none;
+}
--- a/toolkit/themes/winstripe/global/wizard.css
+++ b/toolkit/themes/winstripe/global/wizard.css
@ -7,6 +7,10 @@
  color: WindowText;
 }

+wizard[description=""] .wizard-header-description {
+  display: none;
+}
+
 .wizard-header-label {
  -moz-margin-start: 23px;
  font-weight: bold;