Bug 170213 - make static HTML files into page.cgi pages. This does votehelp.html (-> id=voting.html), bug_status.html (-> id=fields.html) and bugwritinghelp.html (-> id=bug-writing.html). Patch by gerv; r=kiko, a=justdave.

5 files changed, 16 insertions, 12 deletions

diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 700994130..7156d052a 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -176,7 +176,7 @@ function set_assign_to() {
   <tr>
     <td align="right">
       <strong>
-        <a href="bug_status.html#assigned_to">Assign To</a>:
+        <a href="page.cgi?id=fields.html#assigned_to">Assign To</a>:
       </strong>
     </td>
     <td colspan="3">
@@ -333,7 +333,8 @@ function set_assign_to() {
   [% IF sel.description %]
   <td align="right">
     <strong>
-      <a href="bug_status.html#[% sel.name %]">[% sel.description %]</a>:
+      <a href="page.cgi?id=fields.html#[% sel.name %]">
+        [% sel.description %]</a>:
     </strong>
   </td>
   [% END %]
diff --git a/template/en/default/bug/create/user-message.html.tmpl b/template/en/default/bug/create/user-message.html.tmpl
index 7a3678853..dbbd114e4 100644
--- a/template/en/default/bug/create/user-message.html.tmpl
+++ b/template/en/default/bug/create/user-message.html.tmpl
@@ -30,7 +30,8 @@
 
 [% PROCESS global/variables.none.tmpl %]
 
-Before reporting [% terms.abug %], please read the <a href="bugwritinghelp.html">
+Before reporting [% terms.abug %], please read the 
+<a href="page.cgi?id=bug-writing.html">
 [% terms.bug %] writing guidelines</a>, please look at the list of
 <a href="duplicates.cgi">most frequently reported [% terms.bugs %]</a>, and please
 <a href="query.cgi">search</a> for the [% terms.bug %].
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index f24dce62f..ef6b551fa 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -205,14 +205,14 @@
     <tr>
       <td align="right">
         <b>
-          <a href="bug_status.html">Status</a>:
+          <a href="page.cgi?id=fields.html#status">Status</a>:
         </b>
       </td>
       <td>[% bug.bug_status FILTER html %]</td>
       <td>&nbsp;</td>
 
       <td align="right">
-        <b><a href="bug_status.html#priority">Pr<u>i</u>ority</a>:</b>
+        <b><a href="page.cgi?id=fields.html#priority">Pr<u>i</u>ority</a>:</b>
       </td>
       [% PROCESS select selname => "priority" accesskey => "i" %]
     </tr>
@@ -220,7 +220,7 @@
     <tr>
       <td align="right">
         <b>
-          <a href="bug_status.html">Resolution</a>:
+          <a href="page.cgi?id=fields.html#resolution">Resolution</a>:
         </b>
       </td>
       <td>
@@ -232,7 +232,7 @@
       <td>&nbsp;</td>
 
       <td align="right">
-        <b><a href="bug_status.html#severity">S<u>e</u>verity</a>:</b>
+        <b><a href="page.cgi?id=fields.html#severity">S<u>e</u>verity</a>:</b>
       </td>
       [% PROCESS select selname = "bug_severity" accesskey => "e" %]
 
@@ -241,7 +241,7 @@
     <tr>
       <td align="right">
         <b>
-          <a href="bug_status.html#assigned_to">Assigned&nbsp;To</a>:
+          <a href="page.cgi?id=fields.html#assigned_to">Assigned&nbsp;To</a>:
         </b>
       </td>
       <td>[% bug.assigned_to.identity FILTER html %]</td>
@@ -428,7 +428,7 @@
   <table>
     <tr>
       <th>
-        <a href="votehelp.html">Votes</a>:
+        <a href="page.cgi?id=voting.html">Votes</a>:
       </th>
       <td>
         [% bug.votes %]&nbsp;&nbsp;&nbsp;
diff --git a/template/en/default/bug/knob.html.tmpl b/template/en/default/bug/knob.html.tmpl
index 1e922c112..f8f60c354 100644
--- a/template/en/default/bug/knob.html.tmpl
+++ b/template/en/default/bug/knob.html.tmpl
@@ -59,7 +59,8 @@
       [% END %]
 
       <input type="radio" name="knob" value="resolve">
-      Resolve [% terms.bug %], changing <a href="bug_status.html">resolution</a> to
+      Resolve [% terms.bug %], changing 
+      <a href="page.cgi?id=fields.html#resolution">resolution</a> to
       <select name="resolution"
               onchange="document.changeform.knob[[% knum %]].checked=true">
       [% FOREACH r = bug.choices.resolution %]
@@ -78,7 +79,8 @@
       [% knum = knum + 1 %]
 
       <input type="radio" name="knob" value="reassign">
-      <a href="bug_status.html#assigned_to">Reassign</a> [% terms.bug %] to
+      <a href="page.cgi?id=fields.html#assigned_to">Reassign</a> 
+      [% terms.bug %] to
       <input name="assigned_to" size="32"
              onchange="if ((this.value != '[% bug.assigned_to.email FILTER js %]') &&
                             (this.value != '')) {
diff --git a/template/en/default/bug/votes/list-for-user.html.tmpl b/template/en/default/bug/votes/list-for-user.html.tmpl
index abbf3f49c..25c83c519 100644
--- a/template/en/default/bug/votes/list-for-user.html.tmpl
+++ b/template/en/default/bug/votes/list-for-user.html.tmpl
@@ -141,7 +141,7 @@
 [% END %]
 
 <p>
-  <a href="votehelp.html">Help with voting</a>.
+  <a href="page.cgi?id=voting.html">Help with voting</a>.
 </p>
 
 [% PROCESS global/footer.html.tmpl %]