From 4d9e3d0c87ff6a118e94952b1c9ff475d2f023fc Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Mon, 27 Feb 2012 23:31:45 +0800
Subject: Bug 698345: report errors and warnings to arecibo

---
 .../en/default/admin/params/advanced.html.tmpl     |  5 +++
 template/en/default/global/code-error.html.tmpl    | 44 +++++++++-------------
 2 files changed, 22 insertions(+), 27 deletions(-)

(limited to 'template/en/default')

diff --git a/template/en/default/admin/params/advanced.html.tmpl b/template/en/default/admin/params/advanced.html.tmpl
index 0ba40b375..1cf0c344f 100644
--- a/template/en/default/admin/params/advanced.html.tmpl
+++ b/template/en/default/admin/params/advanced.html.tmpl
@@ -81,4 +81,9 @@
 
   disable_bug_updates =>
     "When enabled, all updates to $terms.bugs will be blocked.",
+
+  arecibo_server =>
+    "When set, important errors and warnings will be sent to the"
+    _ " specified Arecibo server. Enter the Arecibo server's full URL;"
+    _ " eg <code>https://arecibo.example.com/v/1/</code>.",
 } %]
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index f100df994..8a4252a7e 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -503,33 +503,23 @@
    admindocslinks = admindocslinks
 %]
 
-<tt>
-  <p>
-    [% terms.Bugzilla %] has suffered an internal error. Please save this page and send
-    it to [% Param("maintainer") %] with details of what you were doing at
-    the time this message appeared.
-  </p>
-  <script type="text/javascript"> <!--
-    document.write("<p>URL: " + 
-                    document.location.href.replace(/&/g,"&amp;")
-                                          .replace(/</g,"&lt;")
-                                          .replace(/>/g,"&gt;") + "</p>");
-  // -->
-  </script>
-</tt>
-
-<table cellpadding="20">
-  <tr>
-    <td bgcolor="#ff0000">
-      <font size="+2">
-        [% error_message FILTER none %]
-      </font>
-    </td>
-  </tr>
-</table>
-
-<p>Traceback:</p>
-<pre>[% traceback FILTER html %]</pre>
+[%# return the generated error_message for arecibo %]
+[% processed.error_message = error_message %]
+
+<p>
+  [% terms.Bugzilla %] has suffered an internal error:
+</p>
+
+<p class="throw_error">
+  [% error_message FILTER none %]
+</p>
+
+[% IF maintainers_notified %]
+<p>
+  The [% terms.Bugzilla %] maintainers have been notified of this error
+  [#[% uid FILTER html %]].
+</p>
+[% END %]
 
 [% IF variables %]
   <pre>
-- 
cgit v1.2.3-24-g4f1b