Bug 365521 and bug 365056: remove Netscape-specific parts of form, fix encodings of &, and update OS list. r=justdave, a=lpsolit.

1 files changed, 5 insertions, 39 deletions

diff --git a/template/en/default/bug/create/create-guided.html.tmpl b/template/en/default/bug/create/create-guided.html.tmpl
index 923442860..9f2a21b71 100644
--- a/template/en/default/bug/create/create-guided.html.tmpl
+++ b/template/en/default/bug/create/create-guided.html.tmpl
@@ -67,40 +67,6 @@ function PutDescription() {
 }
 </script>
 
-[%# Browser sniff to try and reduce the incidence of Netscape 6/7 bugs %]
-
-[% IF cgi.user_agent('Netscape(\d)') %]
-  [% matches = cgi.user_agent().match('Netscape(\d)') %]
-  <div style="background-color: lightgrey;
-              border: 1px solid black;
-              padding: 2px">
-    <font color="#990000">
-      <b>
-        You are using Netscape [% matches.0 %].
-        Report [% terms.bugs %] with this browser to the
-        <a href="http://home.netscape.com/browsers/[% matches.0 %]/feedback/index.html">
-         Netscape [% matches.0 %] Feedback Center.</a>
-      </b>
-    </font>
-    This form is only for reporting [% terms.bugs %] in the Mozilla web browser
-    and other products from mozilla.org. To report [% terms.abug %] you find 
-    in Netscape [% matches.0 %] with this form, you must reproduce it first in 
-    a recent build of
-    <a href="http://ftp.mozilla.org/pub/mozilla.org/mozilla/nightly/latest/">Mozilla</a>,
-    <a href="http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/">Firefox</a>,
-<a href="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/latest-trunk/">Thunderbird</a> or
-    <a href="http://ftp.mozilla.org/pub/mozilla.org/camino/nightly/latest/">Camino</a>
-    to make sure the problem hasn't been fixed already.
-  </div>
-[% END %]
-
-[% IF cgi.user_agent('Gecko/') %]
-  [% matches = cgi.user_agent().match('Gecko/(\d+)') %]
-  
-[% END %]
-
-<!-- @@@ Need UA checking here -->
-
 <a name="step1"></a>
 <h3>Step 1 of 3 - has your [% terms.bug %] already been reported?</h3>
 
@@ -121,13 +87,13 @@ function PutDescription() {
 [% END %]
 
 <p>
-    <a href="duplicates.cgi?[% productstring %]&format=simple" target="somebugs">All-time Top 100</a> (loaded initially) |
-    <a href="duplicates.cgi?[% productstring %]&format=simple&sortby=delta&reverse=1&maxrows=100&changedsince=14" target="somebugs">Hot in the last two weeks</a>  
+    <a href="duplicates.cgi?[% productstring %]&amp;format=simple" target="somebugs">All-time Top 100</a> (loaded initially) |
+    <a href="duplicates.cgi?[% productstring %]&amp;format=simple&amp;sortby=delta&amp;reverse=1&amp;maxrows=100&amp;changedsince=14" target="somebugs">Hot in the last two weeks</a>  
 </p>
 
 <iframe name="somebugs" id="somebugs"
   style="border: 2px black solid"
-  src="duplicates.cgi?[% productstring %]&format=simple">
+  src="duplicates.cgi?[% productstring %]&amp;format=simple">
 </iframe>
 
 <p>
@@ -260,8 +226,8 @@ function PutDescription() {
     </td>
   </tr>
 
-  [% op_sys = [ "Windows 2000", "Windows XP", "Windows Vista",
-                "Mac OS X", "Linux", "All", "other" ] %]
+  [% op_sys = [ "Windows 2000", "Windows XP", "Windows Vista", "Windows 7",
+                "Mac OS X", "Linux", "All", "Other" ] %]
 
   <tr>
     <td align="right" valign="top">