Bug 1237790 - The experimental user interface doesn't provide link to help of bug fields

4 files changed, 12 insertions, 263 deletions

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 2d0286292..164602ff2 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -142,7 +142,7 @@
             <tr>
               <td colspan="2">
                 <span style="float:left">
-                  <a href="page.cgi?id=fields.html">What do these fields mean?</a>
+                  <a href="https://wiki.mozilla.org/BMO/UserGuide/BugFields">What do these fields mean?</a>
                 </span>
                 [% PROCESS commit_button id="_top"%]
               </td>
@@ -384,7 +384,7 @@
 [% BLOCK section_status %]
   <tr>
     <th class="field_label">
-      <a href="page.cgi?id=fields.html#status">Status</a>:
+      <a href="https://wiki.mozilla.org/BMO/UserGuide/BugFields#bug_status">Status</a>:
     </th>
     <td id="bz_field_status">
       <span id="static_bug_status">
@@ -443,7 +443,7 @@
     <tr>
       <th class="field_label">
         <label for="priority" accesskey="i">
-          <a href="page.cgi?id=fields.html#importance"><u>I</u>mportance</a></label>:
+          <a href="https://wiki.mozilla.org/BMO/UserGuide/BugFields#importance"><u>I</u>mportance</a></label>
       </th>
       <td>
        [% INCLUDE bug/field.html.tmpl
@@ -462,7 +462,7 @@
       <tr>
         <th class="field_label">
           <label for="target_milestone">
-            <a href="page.cgi?id=fields.html#target_milestone">
+            <a href="https://wiki.mozilla.org/BMO/UserGuide/BugFields#target_milestone">
             Target&nbsp;Milestone</a></label>:
         </th>
         [% PROCESS select selname = "target_milestone" %]
@@ -479,7 +479,7 @@
 
     <tr>
       <th class="field_label">
-        <a href="page.cgi?id=fields.html#assigned_to">Assigned To</a>:
+        <a href="https://wiki.mozilla.org/BMO/UserGuide/BugFields#assigned_to">Assigned To</a>:
       </th>
       <td>
         [% IF bug.check_can_change_field("assigned_to", 0, 1) %]
@@ -579,7 +579,7 @@
     <tr>
       <th class="field_label">
         <label for="triage_owner">
-        <a href="page.cgi?id=fields.html#triage_owner">
+        <a href="https://wiki.mozilla.org/BMO/UserGuide/BugFields#triage_owner">
         Triage&nbsp;Owner</a></label>:
       </th>
       <td>
@@ -1218,7 +1218,7 @@
                class="status" cellspacing="0" cellpadding="0">
           <tr>
             <th class="field_label">
-              <a href="page.cgi?id=fields.html#status">Status</a>:
+              <a href="https://wiki.mozilla.org/BMO/UserGuide/BugFields#bug_status">Status</a>:
             </th>
             <td>
               [% PROCESS bug/knob.html.tmpl %]
diff --git a/template/en/default/bug/field-label.html.tmpl b/template/en/default/bug/field-label.html.tmpl
index ecb49318e..94180fabc 100644
--- a/template/en/default/bug/field-label.html.tmpl
+++ b/template/en/default/bug/field-label.html.tmpl
@@ -45,7 +45,7 @@
     [% IF desc_url %]
       href="[% desc_url FILTER html %]"
     [% ELSE %]
-      href="page.cgi?id=fields.html#[% field.name FILTER uri %]"
+      href="https://wiki.mozilla.org/BMO/UserGuide/BugFields#[% field.name FILTER uri %]"
     [% END %]
   >[%- field_descs.${field.name} FILTER html %]:</a>
 
diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index 8a1de5f2d..58d02839c 100644
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -84,7 +84,7 @@
 
     <th>
       <label for="priority">
-        <a href="page.cgi?id=fields.html#priority">Priority</a>:
+        <a href="https://wiki.mozilla.org/BMO/UserGuide/BugFields#priority">Priority</a>:
       </label>
     </th>
     <td>
@@ -97,7 +97,7 @@
 
     <th>
       <label for="rep_platform">
-        <a href="page.cgi?id=fields.html#rep_platform">Platform</a>:
+        <a href="https://wiki.mozilla.org/BMO/UserGuide/BugFields#rep_platform">Platform</a>:
       </label>
     </th>
     <td>
@@ -107,7 +107,7 @@
 
     <th>
       <label for="bug_severity">
-        <a href="page.cgi?id=fields.html#bug_severity">Severity</a>:
+        <a href="https://wiki.mozilla.org/BMO/UserGuide/BugFields#bug_severity">Severity</a>:
       </label>
     </th>
     <td>
@@ -120,7 +120,7 @@
   <tr>
     <th>
       <label for="op_sys">
-        <a href="page.cgi?id=fields.html#op_sys">OS</a>:
+        <a href="https://wiki.mozilla.org/BMO/UserGuide/BugFields#op_sys">OS</a>:
       </label>
     </th>
     <td [% " colspan=\"3\"" IF !Param("usetargetmilestone") %]>
diff --git a/template/en/default/pages/fields.html.tmpl b/template/en/default/pages/fields.html.tmpl
deleted file mode 100644
index 8c763d73f..000000000
--- a/template/en/default/pages/fields.html.tmpl
+++ /dev/null
@@ -1,251 +0,0 @@
-[%# The contents of this file are subject to the Mozilla Public
-  # License Version 1.1 (the "License"); you may not use this file
-  # except in compliance with the License. You may obtain a copy of
-  # the License at http://www.mozilla.org/MPL/
-  #
-  # Software distributed under the License is distributed on an "AS
-  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-  # implied. See the License for the specific language governing
-  # rights and limitations under the License.
-  #
-  # The Original Code is the Bugzilla Bug Tracking System.
-  #
-  # The Initial Developer of the Original Code is Netscape Communications
-  # Corporation. Portions created by Netscape are
-  # Copyright (C) 1998 Netscape Communications Corporation. All
-  # Rights Reserved.
-  #
-  # Contributor(s): Terry Weissman <terry@mozilla.org>
-  #                 Gervase Markham <gerv@gerv.net>
-  #%]
-
-[% PROCESS "global/field-descs.none.tmpl" %]
-[% PROCESS global/header.html.tmpl 
-  title = "$terms.Bug Fields" 
-  style_urls = ['skins/standard/page.css']
-%]
-
-<p>This page describes the various fields that you see 
-  on [% terms.abug %].</p>
-
-<table class="field_value_explanation">
-  <thead>
-  <tr>
-    <td id="bug_status">
-      <h2>[% field_descs.bug_status FILTER upper FILTER html %]</h2>
-    </td>
-
-    <td id="resolution">
-      <h2>[% field_descs.resolution FILTER upper FILTER html %]</h2>
-    </td>
-  </tr>
-
-  <tr>
-    <td>The [% field_descs.bug_status FILTER html %] field indicates the 
-      current state of a [% terms.bug %]. Only certain status transitions
-      are allowed.</td>
-
-    <td>The [% field_descs.resolution FILTER html %] field indicates what
-      happened to this [%+ terms.bug %].</td>
-  </tr>
-  </thead>
-
-  <tbody>
-  <tr class="header_row">
-    <td colspan="2">Open [% terms.Bugs %]</td>
-  </tr>
-  <tr>
-    <td>
-      <dl>
-        <dt class="unconfirmed">
-          [% display_value("bug_status", "UNCONFIRMED") FILTER html %]
-        </dt>
-        <dd class="unconfirmed">
-          This [% terms.bug %] has recently been added to the database. 
-          Nobody has validated that this [% terms.bug %] is true. Users
-          who have the "canconfirm" permission set may confirm
-          this [% terms.bug %], changing its state to [% display_value("bug_status", "NEW") FILTER html %]. Or, it may be
-          directly resolved and marked [% display_value("bug_status", "RESOLVED") FILTER html %].
-        </dd>
-        <dt>
-          <b>[% display_value("bug_status", "NEW") FILTER html %]</b>
-        </dt>
-        <dd>
-          This [% terms.bug %] has recently been added to the assignee's
-          list of [% terms.bugs %] and must be processed. [% terms.Bugs %] in
-          this state may be accepted, and become <b>[% display_value("bug_status", "ASSIGNED") FILTER html %]</b>, passed
-          on to someone else, and remain <b>[% display_value("bug_status", "NEW") FILTER html %]</b>, or resolved and marked
-          <b>[% display_value("bug_status", "RESOLVED") FILTER html %]</b>.
-        </dd>
-
-        <dt>
-          <b>[% display_value("bug_status", "ASSIGNED") FILTER html %]</b>
-        </dt>
-        <dd>
-          This [% terms.bug %] is not yet resolved, but is assigned to the 
-          proper person. From here [% terms.bugs %] can be given to another 
-          person and become <b>[% display_value("bug_status", "NEW") FILTER html %]</b>, or
-          resolved and become <b>[% display_value("bug_status", "RESOLVED") FILTER html %]</b>.
-        </dd>
-
-        <dt>
-          <b>[% display_value("bug_status", "REOPENED") FILTER html %]</b>
-        </dt>
-        <dd>
-          This [% terms.bug %] was once resolved, but the resolution was 
-          deemed incorrect. For example, a <b>[% display_value("resolution", "WORKSFORME") FILTER html %]</b> [% terms.bug %] is
-          <b>[% display_value("bug_status", "REOPENED") FILTER html %]</b> when more information shows up and
-          the [% terms.bug %] is now reproducible. From here [% terms.bugs %] are
-          either marked <b>[% display_value("bug_status", "ASSIGNED") FILTER html %]</b> or
-          <b>[% display_value("bug_status", "RESOLVED") FILTER html %]</b>.
-        </dd>
-        
-        [% Hook.process('open-status') %]
-      </dl>
-    </td>
-
-    <td>
-      No resolution yet. All [% terms.bugs %] which are in one of
-      these "open" states have no resolution set.
-    </td>
-  </tr>
-
-  <tr class="header_row">
-    <td colspan="2">Closed [% terms.Bugs %]</td>
-  </tr>
-
-  <tr>
-    <td>
-      <dl>
-        <dt class="resolved">
-          [% display_value("bug_status", "RESOLVED") FILTER html %]
-        </dt>
-        <dd class="resolved">
-          A resolution has been performed, and it is awaiting verification by
-          QA. From here [% terms.bugs %] are either reopened and given some
-          open status, or are verified by QA and marked
-          <b>[% display_value("bug_status", "VERIFIED") FILTER html %]</b>.
-        </dd>
-
-        <dt class="verified">
-          [% display_value("bug_status", "VERIFIED") FILTER html %]
-        </dt>
-        <dd class="verified">
-          QA has looked at the [% terms.bug %] and the resolution and 
-          agrees that the appropriate resolution has been taken.
-          Any zombie [% terms.bugs %] who choose to walk the earth again must 
-          do so by becoming <b>[% display_value("bug_status", "REOPENED") FILTER html %]</b>.
-        </dd>
-        
-        [% Hook.process('closed-status') %]
-      </dl>
-    </td>
-
-    <td>
-      <dl>
-        <dt class="fixed">
-          [% display_value("resolution", "FIXED") FILTER html %]
-        </dt>
-        <dd class="fixed">
-          A fix for this [% terms.bug %] is checked into the tree and 
-          tested.
-        </dd>
-
-        <dt class="invalid">
-          [% display_value("resolution", "INVALID") FILTER html %]
-        </dt>
-        <dd class="invalid">
-          The problem described is not [% terms.abug %].
-        </dd>
-
-        <dt class="wontfix">
-          [% display_value("resolution", "WONTFIX") FILTER html %]
-        </dt>
-        <dd class="wontfix">
-          The problem described is [% terms.abug %] which will never be 
-          fixed.
-        </dd>
-
-        <dt class="duplicate">
-         [% display_value("resolution", "DUPLICATE") FILTER html %]
-        </dt>
-        <dd class="duplicate">
-          The problem is a duplicate of an existing [% terms.bug %].
-          Marking [% terms.abug %] duplicate requires the [% terms.bug %]#
-          of the duplicating [% terms.bug %] and will at least put
-          that [% terms.bug %] number in the description field.
-        </dd>
-
-        <dt class="worksforme">
-          [% display_value("resolution", "WORKSFORME") FILTER html %]
-        </dt>
-        <dd class="worksforme">
-          All attempts at reproducing this [% terms.bug %] were futile, 
-          and reading the code produces no clues as to why the described
-          behavior would occur. If more information appears later,
-          the [% terms.bug %] can be reopened.
-        </dd>
-        
-        [% Hook.process('resolution') %]
-      </dl>
-    </td>
-  </tr>
-  </tbody>
-</table>
-
-<h2>Other Fields</h2>
-
-[% SET field_help_map = {} %]
-[% FOREACH field = bug_fields.keys %]
-  [% SET field_desc = field_descs.$field %]
-  [% field_help_map.$field_desc = { help  => help_html.$field, 
-                                    field => field } %]
-[% END %]
-
-[%# This field is not a real one, but its label is visible in bugs. %]
-
-[% field_help_map.Importance = { help  => help_html.importance,
-                                 field => "importance" } %]
-
-[%# These are fields that don't need to be documented, either because
-  # they have docs somewhere else in the UI, or they don't show up on bugs. 
-  # %]
-[% SET skip_fields = [ 
-  'days_elapsed', 
-  'everconfirmed',
-  'reporter_accessible',
-  'cclist_accessible',
-  'bug_group',
-  'commenter',
-  'owner_idle_time',
-  'bug_status',
-  'resolution',
-  'assignee_last_login',
-] %]
-
-<dl class="field_descriptions">
-[% FOREACH field_desc = field_help_map.keys.sort %]
-  [% SET field = field_help_map.${field_desc}.field %]
-  [% SET field_object = bug_fields.$field %]
-
-  [% NEXT IF field_object.obsolete %]
-  [% NEXT IF !user.is_timetracker AND field_object.is_timetracking %]
-
-  [% NEXT IF field == 'status_whiteboard' AND !Param('usestatuswhiteboard') %]
-  [% NEXT IF field == 'target_milestone' AND !Param('usetargetmilestone') %]
-  [% NEXT IF field == 'alias' AND !Param('usebugaliases') %]
-
-  [%# For now we don't have help for attachment fields and so on. %]
-  [% NEXT IF field.match('\.') %]
-
-  [% NEXT IF skip_fields.contains(field) %]
-
-  <dt id="[% field FILTER html %]">[% field_desc FILTER html %]</dt>
-    <dd>
-      [% SET help_text = field_help_map.${field_desc}.help %]
-      [% help_text FILTER none %]
-    </dd>
-[% END %]
-</dl>
-
-[% PROCESS global/footer.html.tmpl %]