Part 3 of bug 182083: add Help for more admin pages - Patch by me, r=Colin

11 files changed, 29 insertions, 7 deletions

diff --git a/docs/xml/administration.xml b/docs/xml/administration.xml
index a0c7a7c8b..f8c62913f 100644
--- a/docs/xml/administration.xml
+++ b/docs/xml/administration.xml
@@ -1692,7 +1692,7 @@ foo: ENTRY, MANDATORY/MANDATORY, CANEDIT
         and un-checking the box next to either 'Reporter' or 'CC List' (or both).
       </para>
     </note>
-    <section>
+    <section id="create-groups">
       <title>Creating Groups</title>
       <para>To create Groups:</para>
   
@@ -1748,7 +1748,7 @@ foo: ENTRY, MANDATORY/MANDATORY, CANEDIT
       </orderedlist>
   
     </section>
-    <section>
+    <section id="edit-groups">
       <title>Assigning Users to Groups</title>
       <para>Users can become a member of a group in several ways.</para>
       <orderedlist>
diff --git a/editvalues.cgi b/editvalues.cgi
index f60ab634e..9be6b5440 100755
--- a/editvalues.cgi
+++ b/editvalues.cgi
@@ -112,6 +112,10 @@ my $cgi      = Bugzilla->cgi;
 my $template = Bugzilla->template;
 my $vars = {};
 
+# Replace this entry by separate entries in templates when
+# the documentation about legal values becomes bigger.
+$vars->{'doc_section'} = 'edit-values.html';
+
 print $cgi->header();
 
 exists Bugzilla->user->groups->{'admin'} ||
diff --git a/template/en/default/admin/custom_fields/create.html.tmpl b/template/en/default/admin/custom_fields/create.html.tmpl
index 4feb57393..5dd50ce3b 100644
--- a/template/en/default/admin/custom_fields/create.html.tmpl
+++ b/template/en/default/admin/custom_fields/create.html.tmpl
@@ -21,7 +21,9 @@
 
 [% PROCESS global/header.html.tmpl
            title = "Add a new Custom Field"
-           onload = "document.getElementById('new_bugmail').disabled = true;" %]
+           onload = "document.getElementById('new_bugmail').disabled = true;"
+           doc_section = "custom-fields.html#add-custom-fields"
+%]
 
 <script type="text/javascript">
   <!--
diff --git a/template/en/default/admin/custom_fields/edit.html.tmpl b/template/en/default/admin/custom_fields/edit.html.tmpl
index b983bbcc6..596e7e704 100644
--- a/template/en/default/admin/custom_fields/edit.html.tmpl
+++ b/template/en/default/admin/custom_fields/edit.html.tmpl
@@ -25,7 +25,9 @@
 
 [% PROCESS global/header.html.tmpl
            title = title
-           onload = "toggleCheckbox(document.getElementById('enter_bug'), 'new_bugmail');" %]
+           onload = "toggleCheckbox(document.getElementById('enter_bug'), 'new_bugmail');"
+           doc_section = "custom-fields.html#edit-custom-fields"
+%]
 
 <script type="text/javascript">
   <!--
diff --git a/template/en/default/admin/custom_fields/list.html.tmpl b/template/en/default/admin/custom_fields/list.html.tmpl
index 51575570c..acb3f680d 100644
--- a/template/en/default/admin/custom_fields/list.html.tmpl
+++ b/template/en/default/admin/custom_fields/list.html.tmpl
@@ -19,7 +19,10 @@
 
 [% PROCESS "global/field-descs.none.tmpl" %]
 
-[% PROCESS global/header.html.tmpl title = "Custom Fields" %]
+[% PROCESS global/header.html.tmpl
+  title = "Custom Fields"
+  doc_section = "custom-fields.html"
+%]
 
 [% columns = [
      {
diff --git a/template/en/default/admin/groups/confirm-remove.html.tmpl b/template/en/default/admin/groups/confirm-remove.html.tmpl
index 27d0ba5d8..0c0e28501 100644
--- a/template/en/default/admin/groups/confirm-remove.html.tmpl
+++ b/template/en/default/admin/groups/confirm-remove.html.tmpl
@@ -33,7 +33,10 @@
   [% title = "Confirm: Remove All Explicit Members?" %]
 [% END %]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+  title = title
+  doc_section = "groups.html"
+%]
 
 [% IF regexp %]
   <p>This option will remove all users from '[% group.name FILTER html %]'
diff --git a/template/en/default/admin/groups/create.html.tmpl b/template/en/default/admin/groups/create.html.tmpl
index 49cd550e9..13b1a4254 100644
--- a/template/en/default/admin/groups/create.html.tmpl
+++ b/template/en/default/admin/groups/create.html.tmpl
@@ -28,6 +28,7 @@
 [% PROCESS global/header.html.tmpl
   title = "Add group"
   subheader = "This page allows you to define a new user group."
+  doc_section = "groups.html#create-groups"
 %]
 
 <form method="post" action="editgroups.cgi">
diff --git a/template/en/default/admin/groups/delete.html.tmpl b/template/en/default/admin/groups/delete.html.tmpl
index d7809bca7..0f7bdcd78 100644
--- a/template/en/default/admin/groups/delete.html.tmpl
+++ b/template/en/default/admin/groups/delete.html.tmpl
@@ -36,6 +36,7 @@
 
 [% PROCESS global/header.html.tmpl
   title = "Delete group"
+  doc_section = "groups.html"
 %]
 
 <table border="1">
diff --git a/template/en/default/admin/groups/edit.html.tmpl b/template/en/default/admin/groups/edit.html.tmpl
index 607ae4002..7cb989d99 100644
--- a/template/en/default/admin/groups/edit.html.tmpl
+++ b/template/en/default/admin/groups/edit.html.tmpl
@@ -33,6 +33,8 @@
 [% title = BLOCK %]Change Group: [% group.name FILTER html %][% END %]
 
 [% PROCESS global/header.html.tmpl
+  title = title
+  doc_section = "groups.html#edit-groups"
   style = "
     .grant_table { border-collapse: collapse; }
     .grant_table td, .grant_table th {
diff --git a/template/en/default/admin/groups/list.html.tmpl b/template/en/default/admin/groups/list.html.tmpl
index 2acbdb1a4..029e5f0b4 100644
--- a/template/en/default/admin/groups/list.html.tmpl
+++ b/template/en/default/admin/groups/list.html.tmpl
@@ -34,6 +34,7 @@
 [% PROCESS global/header.html.tmpl
   title = "Edit Groups"
   subheader = "This lets you edit the groups available to put users in."
+  doc_section = "groups.html"
 %]
 
 [% edit_contentlink = "editgroups.cgi?action=changeform&amp;group=%%id%%" %]
diff --git a/template/en/default/whine/schedule.html.tmpl b/template/en/default/whine/schedule.html.tmpl
index d82c6813f..8cb120dfa 100644
--- a/template/en/default/whine/schedule.html.tmpl
+++ b/template/en/default/whine/schedule.html.tmpl
@@ -35,7 +35,10 @@
 [% PROCESS global/variables.none.tmpl %]
 
 [% title = "Set up whining" %]
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+  title = title
+  doc_section = "whining.html"
+%]
 
 <p>
   "Whining" is when [% terms.Bugzilla %] executes a saved query at a regular interval