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

22 files changed, 34 insertions, 5 deletions

diff --git a/chart.cgi b/chart.cgi
index 97bf9e77d..70eeb814a 100755
--- a/chart.cgi
+++ b/chart.cgi
@@ -71,6 +71,7 @@ if (grep(/^cmd-/, $cgi->param())) {
 
 my $action = $cgi->param('action');
 my $series_id = $cgi->param('series_id');
+$vars->{'doc_section'} = 'reporting.html#charts';
 
 # Because some actions are chosen by buttons, we can't encode them as the value
 # of the action param, because that value is localization-dependent. So, we
diff --git a/createaccount.cgi b/createaccount.cgi
index c10c9b378..c2941bc4c 100755
--- a/createaccount.cgi
+++ b/createaccount.cgi
@@ -45,6 +45,8 @@ my $cgi = Bugzilla->cgi;
 my $template = Bugzilla->template;
 my $vars = {};
 
+$vars->{'doc_section'} = 'myaccount.html';
+
 print $cgi->header();
 
 # If we're using LDAP for login, then we can't create a new account here.
diff --git a/docs/xml/using.xml b/docs/xml/using.xml
index 3c200a30a..1da23dfe4 100644
--- a/docs/xml/using.xml
+++ b/docs/xml/using.xml
@@ -1426,7 +1426,7 @@
 
       </section>
       
-      <section>
+      <section id="charts-new-series">
         <title>Creating New Data Sets</title>
         
         <para>
diff --git a/enter_bug.cgi b/enter_bug.cgi
index dc2680473..cce5a431e 100755
--- a/enter_bug.cgi
+++ b/enter_bug.cgi
@@ -61,6 +61,9 @@ my $dbh = Bugzilla->dbh;
 my $template = Bugzilla->template;
 my $vars = {};
 
+# All pages point to the same part of the documentation.
+$vars->{'doc_section'} = 'bugreports.html';
+
 my $product_name = trim($cgi->param('product') || '');
 # Will contain the product object the bug is created in.
 my $product;
diff --git a/report.cgi b/report.cgi
index 9ee5df287..2b9cb61ad 100755
--- a/report.cgi
+++ b/report.cgi
@@ -316,6 +316,9 @@ if ($cgi->param('debug')) {
     print Data::Dumper::Dumper(@image_data) . "\n\n</pre>";
 }
 
+# All formats point to the same section of the documentation.
+$vars->{'doc_section'} = 'reporting.html#reports';
+
 $template->process("$format->{'template'}", $vars)
   || ThrowTemplateError($template->error());
 
diff --git a/template/en/default/attachment/confirm-delete.html.tmpl b/template/en/default/attachment/confirm-delete.html.tmpl
index 82cff7ed2..4bd69e565 100644
--- a/template/en/default/attachment/confirm-delete.html.tmpl
+++ b/template/en/default/attachment/confirm-delete.html.tmpl
@@ -25,7 +25,10 @@
   [%+ "$terms.Bug " _ a.bug_id FILTER bug_link(a.bug_id) FILTER none %]
 [% END %]
 
-[% PROCESS global/header.html.tmpl title = title %]
+[% PROCESS global/header.html.tmpl
+  title = title
+  doc_section = "attachments.html"
+%]
 
 <table border="1" cellpadding="4" cellspacing="0">
   <tr bgcolor="#6666FF">
diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl
index 781674a96..3a5353577 100644
--- a/template/en/default/attachment/create.html.tmpl
+++ b/template/en/default/attachment/create.html.tmpl
@@ -36,6 +36,7 @@
   onload="setContentTypeDisabledState(document.entryform);"
   style_urls = [ 'skins/standard/create_attachment.css' ]
   javascript_urls = [ "js/attachment.js" ]
+  doc_section = "attachments.html"
 %]
 
 <form name="entryform" method="post" action="attachment.cgi" enctype="multipart/form-data">
diff --git a/template/en/default/attachment/created.html.tmpl b/template/en/default/attachment/created.html.tmpl
index 58822b89b..039cc8977 100644
--- a/template/en/default/attachment/created.html.tmpl
+++ b/template/en/default/attachment/created.html.tmpl
@@ -28,6 +28,7 @@
 
 [% PROCESS global/header.html.tmpl
   title = "Attachment $attachment.id added to $terms.Bug $attachment.bug_id"
+  doc_section = "bug_page.html"
 %]
 
 <dl>
diff --git a/template/en/default/attachment/diff-header.html.tmpl b/template/en/default/attachment/diff-header.html.tmpl
index 46db332c6..57afc799f 100644
--- a/template/en/default/attachment/diff-header.html.tmpl
+++ b/template/en/default/attachment/diff-header.html.tmpl
@@ -224,7 +224,7 @@ tbody.file pre:empty {
   [% subheader = BLOCK %]
     [% bugsummary FILTER html %]
   [% END %]
-  [% PROCESS global/header.html.tmpl %]
+  [% PROCESS global/header.html.tmpl doc_section = "attachments.html#patchviewer" %]
 [% ELSE %]
   <html>
   <head>
diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl
index ffa53493d..23e104d86 100644
--- a/template/en/default/attachment/edit.html.tmpl
+++ b/template/en/default/attachment/edit.html.tmpl
@@ -35,6 +35,7 @@
   title = title
   header = header
   subheader = subheader
+  doc_section = "attachments.html"
   style = "
     table.attachment_info th { text-align: right; vertical-align: top; }
     table.attachment_info td { text-align: left; vertical-align: top; }
diff --git a/template/en/default/attachment/updated.html.tmpl b/template/en/default/attachment/updated.html.tmpl
index 2cfb217ea..011435a16 100644
--- a/template/en/default/attachment/updated.html.tmpl
+++ b/template/en/default/attachment/updated.html.tmpl
@@ -27,6 +27,7 @@
 
 [% PROCESS global/header.html.tmpl
   title = "Changes Submitted to Attachment $attachment.id of $terms.Bug $attachment.bug_id"
+  doc_section = "bug_page.html"
 %]
 
 <dl>
diff --git a/template/en/default/bug/dependency-tree.html.tmpl b/template/en/default/bug/dependency-tree.html.tmpl
index 5eb370838..9fcbebbd5 100644
--- a/template/en/default/bug/dependency-tree.html.tmpl
+++ b/template/en/default/bug/dependency-tree.html.tmpl
@@ -31,6 +31,7 @@
    javascript_urls = ["js/expanding-tree.js"]
    style_urls      = ["skins/standard/dependency-tree.css"]
    subheader      = filtered_desc
+   doc_section = "hintsandtips.html#dependencytree"
 %]
 
 [% PROCESS depthControlToolbar %]
diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl
index 26dce7a4d..2104c90a4 100644
--- a/template/en/default/bug/show-multiple.html.tmpl
+++ b/template/en/default/bug/show-multiple.html.tmpl
@@ -29,6 +29,7 @@
   h1 = ""
   style_urls = ["skins/standard/show_multiple.css",
                 "skins/standard/buglist.css"]
+  doc_section = "bug_page.html"
 %]
 [% PROCESS bug/time.html.tmpl %]
 [% IF bugs.first %]
diff --git a/template/en/default/bug/show.html.tmpl b/template/en/default/bug/show.html.tmpl
index c3f4d4b19..4c82ad59b 100644
--- a/template/en/default/bug/show.html.tmpl
+++ b/template/en/default/bug/show.html.tmpl
@@ -40,6 +40,7 @@
                    "bz_bug_$bug.bug_id"
                   ]
     javascript_urls = [ "js/util.js", "js/keyword-chooser.js" ]
+    doc_section = "bug_page.html"
   %]
 [% END %]
 
diff --git a/template/en/default/bug/summarize-time.html.tmpl b/template/en/default/bug/summarize-time.html.tmpl
index a7f90d0a7..b7eaa797d 100644
--- a/template/en/default/bug/summarize-time.html.tmpl
+++ b/template/en/default/bug/summarize-time.html.tmpl
@@ -33,6 +33,7 @@
     title = title 
     header = header 
     style_urls = ["skins/standard/summarize-time.css"]
+    doc_section = "timetracking.html"
     %]
 
 [% INCLUDE query_form %]
diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index 23c1b6e14..0a1fc7ceb 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -49,6 +49,7 @@
   style = style
   atomlink = "buglist.cgi?$urlquerypart&title=$title&ctype=atom" 
   javascript_urls = [ "js/util.js", "js/keyword-chooser.js" ]
+  doc_section = "query.html#list"
 %]
 
 <div class="bz_query_head" align="center">
diff --git a/template/en/default/reports/menu.html.tmpl b/template/en/default/reports/menu.html.tmpl
index 38dd3d4ee..db5b19293 100644
--- a/template/en/default/reports/menu.html.tmpl
+++ b/template/en/default/reports/menu.html.tmpl
@@ -27,6 +27,7 @@
 
 [% PROCESS global/header.html.tmpl
   title = "Reporting and Charting Kitchen"
+  doc_section = "reporting.html"
 %]
 
 <p>
diff --git a/template/en/default/reports/old-charts.html.tmpl b/template/en/default/reports/old-charts.html.tmpl
index ed5b708ef..ca3ba6c7d 100644
--- a/template/en/default/reports/old-charts.html.tmpl
+++ b/template/en/default/reports/old-charts.html.tmpl
@@ -21,8 +21,11 @@
 
 [% PROCESS "global/field-descs.none.tmpl" %]
 
-[% PROCESS global/header.html.tmpl title = "$terms.Bug Charts"
-                                   h1 = "Welcome to the $terms.Bugzilla Charting Kitchen" %]
+[% PROCESS global/header.html.tmpl
+  title = "$terms.Bug Charts"
+  h1 = "Welcome to the $terms.Bugzilla Charting Kitchen"
+  doc_section = "reporting.html#charts"
+%]
 
 <div align="center">
   [% IF url_image %]
diff --git a/template/en/default/search/search-advanced.html.tmpl b/template/en/default/search/search-advanced.html.tmpl
index d489ea8ed..1f1fd50ab 100644
--- a/template/en/default/search/search-advanced.html.tmpl
+++ b/template/en/default/search/search-advanced.html.tmpl
@@ -40,6 +40,7 @@ var queryform = "queryform"
   javascript = js_data
   javascript_urls = [ "js/productform.js" "js/util.js" "js/help.js" ]
   style_urls = [ "skins/standard/help.css" ]
+  doc_section = "query.html"
   style = "dl.bug_changes dt {
              margin-top: 15px;
            }"
diff --git a/template/en/default/search/search-create-series.html.tmpl b/template/en/default/search/search-create-series.html.tmpl
index f35270382..da1011e10 100644
--- a/template/en/default/search/search-create-series.html.tmpl
+++ b/template/en/default/search/search-create-series.html.tmpl
@@ -35,6 +35,7 @@
   onload = "doOnSelectProduct(0);"
   javascript = js_data 
   javascript_urls = [ "js/productform.js" ]
+  doc_section = "reporting.html#charts-new-series"
 %]
 
 <form method="get" action="chart.cgi" name="chartform">
diff --git a/template/en/default/search/search-report-graph.html.tmpl b/template/en/default/search/search-report-graph.html.tmpl
index 791fd02c5..83b916631 100644
--- a/template/en/default/search/search-report-graph.html.tmpl
+++ b/template/en/default/search/search-report-graph.html.tmpl
@@ -34,6 +34,7 @@ var queryform = "reportform"
   onload = "doOnSelectProduct(0); chartTypeChanged()"
   javascript = js_data
   javascript_urls = [ "js/productform.js" ]
+  doc_section = "reporting.html#reports"
 %]
 
 [% PROCESS "search/search-report-select.html.tmpl" %]
diff --git a/template/en/default/search/search-report-table.html.tmpl b/template/en/default/search/search-report-table.html.tmpl
index 757ecbad1..8c9f2512f 100644
--- a/template/en/default/search/search-report-table.html.tmpl
+++ b/template/en/default/search/search-report-table.html.tmpl
@@ -34,6 +34,7 @@ var queryform = "reportform"
   onload = "doOnSelectProduct(0)"
   javascript = js_data
   javascript_urls = [ "js/productform.js" ]
+  doc_section = "reporting.html#reports"
 %]
 
 [% PROCESS "search/search-report-select.html.tmpl" %]