Bug 979140: Remove remaining <tt> elements

r/a=glob

diff --git a/Bugzilla/Error.pm b/Bugzilla/Error.pm
index 03bf04f83aceabccdd1d90e329d09a6a7402d1b4..37b28095a40cb8e6e0ec73b505c3a9ea453d630f 100644 (file)
--- a/Bugzilla/Error.pm
+++ b/Bugzilla/Error.pm
@@ -192,24 +192,18 @@ sub ThrowTemplateError {
         my $maintainer = Bugzilla->params->{'maintainer'};
         my $error = html_quote($vars->{'template_error_msg'});
         my $error2 = html_quote($template->error());
+        my $url = html_quote(Bugzilla->cgi->self_url);
+
         print <<END;
-        <tt>
           <p>
             Bugzilla has suffered an internal error. Please save this page and 
             send it to $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>
+          <p>URL: $url</p>
           <p>Template->process() failed twice.<br>
           First error: $error<br>
           Second error: $error2</p>
-        </tt>
 END
     }
     exit;

diff --git a/extensions/Voting/template/en/default/hook/global/user-error-errors.html.tmpl b/extensions/Voting/template/en/default/hook/global/user-error-errors.html.tmpl
index 55c32d460a4cd089fb3a5290918a26053f7d1918..644c827a655862492cded41783486c410705b290 100644 (file)
--- a/extensions/Voting/template/en/default/hook/global/user-error-errors.html.tmpl
+++ b/extensions/Voting/template/en/default/hook/global/user-error-errors.html.tmpl
@@ -30,14 +30,14 @@
     [% admindocslinks = {'voting.html' => 'Setting up the voting feature'} %]
     You may only use at most [% max FILTER html %] votes for a single
     [%+ terms.bug %] in the
-    <tt>[% product FILTER html %]</tt> product, but you are trying to
+    <em>[% product FILTER html %]</em> product, but you are trying to
     use [% votes FILTER html %].
 
 [% ELSIF error == "voting_too_many_votes_for_product" %]
     [% title = "Illegal Vote" %]
     [% admindocslinks = {'voting.html' => 'Setting up the voting feature'} %]
     You tried to use [% votes FILTER html %] votes in the
-    <tt>[% product FILTER html %]</tt> product, which exceeds the maximum of
+    <em>[% product FILTER html %]</em> product, which exceeds the maximum of
     [%+ max FILTER html %] votes for this product.
 
 [% END %]