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

diff --git a/docs/xml/administration.xml b/docs/xml/administration.xml
index a0c7a7c8b64d4b4da8d939cb1941cefa9c20f897..f8c62913f383693c2a9b523b2d2ab819cf3582bc 100644 (file)
--- 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 f60ab634e56a8633639a0193c5475e4ebe3473a4..9be6b5440f044cee08b0f29b9d10476c9bc63882 100755 (executable)
--- 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 4feb57393f5e1524752f1721ad57e496b06bea9c..5dd50ce3b47682d69e5859c6fb76a7e89dcb054f 100644 (file)
--- 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 b983bbcc6f818c2dcf6632655f21471f53699ddd..596e7e704eb49be59cb7b8eb860bc54337b6dc9f 100644 (file)
--- 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 51575570c71a6d1e69bb16a827881b5b06fa6fc2..acb3f680d35a205c757a75772db4d07fdb69ace2 100644 (file)
--- 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 27d0ba5d840f13debde957d3440a3fb1e421e371..0c0e28501ef6150f1a45fdf452dec52be0331a2e 100644 (file)
--- 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 49cd550e97fd243c6cc69021a2222f4f0d126902..13b1a42540b109db6593b98af96567dc071afd24 100644 (file)
--- 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 d7809bca76514a7ccf07bf99ecf27e5d2682140b..0f7bdcd78385f37d5ed8651020652951dda9aa72 100644 (file)
--- 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 607ae4002400f728605bdc70d15ac95578940b3e..7cb989d994430e547356ad3a1719ab33ad96acb6 100644 (file)
--- 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 2acbdb1a469388043af34a495724ae72fb87da84..029e5f0b412b0018f314f7fc0d3c824953fddd0c 100644 (file)
--- 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&group=%%id%%" %]

diff --git a/template/en/default/whine/schedule.html.tmpl b/template/en/default/whine/schedule.html.tmpl
index d82c6813f8d4a934e52fd75d0db75d8737923d36..8cb120dfa23f602d945c5a167e37b0238665c6fb 100644 (file)
--- 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