summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
authorByron Jones <bjones@mozilla.com>2012-02-27 16:31:45 +0100
committerByron Jones <bjones@mozilla.com>2012-02-27 16:31:45 +0100
commit4d9e3d0c87ff6a118e94952b1c9ff475d2f023fc (patch)
tree668720bef3f039bc6e685b4dd29e78fc6de27de3 /template/en
parentcc48d74d241b98157c80c666c3402b73be6157d1 (diff)
downloadbugzilla-4d9e3d0c87ff6a118e94952b1c9ff475d2f023fc.tar.gz
bugzilla-4d9e3d0c87ff6a118e94952b1c9ff475d2f023fc.tar.xz
Bug 698345: report errors and warnings to arecibo
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/admin/params/advanced.html.tmpl5
-rw-r--r--template/en/default/global/code-error.html.tmpl44
2 files changed, 22 insertions, 27 deletions
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>