Vanilla 4.4.9 to 5.0 without history due to massive merge conflicts

1 files changed, 21 insertions, 28 deletions

diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index e4416326b..d73d75e13 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -50,8 +50,8 @@
     
   [% ELSIF error == "chart_data_not_generated" %]
     [% admindocslinks = {'extraconfig.html' => 'Setting up Charting'} %]
-    [% IF product %]
-      Charts for the <em>[% product FILTER html %]</em> product are not
+    [% IF product.id %]
+      Charts for the <em>[% product.name FILTER html %]</em> product are not
       available yet because no charting data has been collected for it since it
       was created.
     [% ELSE %]
@@ -64,13 +64,13 @@
 
   [% ELSIF error == "chart_datafile_corrupt" %]
     The chart data file [% file FILTER html %] is corrupt.
-        
+
   [% ELSIF error == "chart_dir_nonexistent" %]
-    One of the directories <tt>[% dir FILTER html %]</tt> and 
-    <tt>[% graph_dir FILTER html %]</tt> does not exist.
-  
+    One of the directories <kbd>[% dir FILTER html %]</kbd> and
+    <kbd>[% graph_dir FILTER html %]</kbd> does not exist.
+
   [% ELSIF error == "chart_file_open_fail" %]
-    Unable to open the chart datafile <tt>[% filename FILTER html %]</tt>.
+    Unable to open the chart datafile <kbd>[% filename FILTER html %]</kbd>.
  
   [% ELSIF error == "column_alter_nonexistent_fk" %]
     You attempted to modify the foreign key for 
@@ -112,7 +112,7 @@
     Every cookie must have a value.
 
   [% ELSIF error == "env_no_email" %]
-    [% terms.Bugzilla %] did not receive an email address from the 
+    Bugzilla did not receive an email address from the
     environment.
     [% IF Param("auth_env_email") %]
       This means that the '[% Param("auth_env_email") FILTER html %]'
@@ -386,7 +386,7 @@
 
   [% ELSIF error == "search_field_operator_unsupported" %]
     [% title = "Invalid Search Type" %]
-    [% terms.Bugzilla %] does not support the search type
+    Bugzilla does not support the search type
     "[% operator.truncate(30, "...") FILTER html %]".
 
   [% ELSE %]
@@ -394,7 +394,7 @@
     [% error_message = Hook.process("errors") %]
     [% IF NOT error_message %]
       [% title = "Internal error" %]
-      An internal error has occurred, but [% terms.Bugzilla %] doesn't know
+      An internal error has occurred, but Bugzilla doesn't know
       what <code>[% error FILTER html %]</code> means.
 
       If you are a [% terms.Bugzilla %] end-user seeing this message, please save
@@ -432,25 +432,18 @@
   with details of what you were doing at the time this message appeared.
 </p>
 
-<tt>
-  <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 id="error_msg" class="throw_error">
-      [% error_message FILTER none %]
-    </td>
-  </tr>
-</table>
+<p>
+  <samp>URL: [% Bugzilla.cgi.self_url FILTER html %]</samp>
+</p>
+
+<div id="error_msg" class="throw_error">
+  [% error_message FILTER none %]
+</div>
+
+<p id="post_err_msg">
+  Traceback:
+</p>
 
-<p>Traceback:</p>
 <pre>[% traceback FILTER html %]</pre>
 
 [% IF variables %]