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

diff --git a/chart.cgi b/chart.cgi
index 97bf9e77d279c26c7bd337c2585e29859fd4afaf..70eeb814a3c11504df511c4f8abf0f0a24a44ad1 100755 (executable)
--- 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 c10c9b378c3fbe1fc205ba11dfc2ce74397f2f0b..c2941bc4c0077269c03ab88dd90b54d808724a53 100755 (executable)
--- 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 3c200a30ab2140dae3f822220d4201ff50bd5487..1da23dfe44caadce6b4370c24a9540870b972bdf 100644 (file)
--- 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 dc2680473867cb883e915d187ea0fcb02e82318e..cce5a431e58ba430e03bdf945317969a62ccc295 100755 (executable)
--- 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 9ee5df287e97ed6094320ee828461cc671522ef1..2b9cb61ad00d6056367523bcf689ab8d5db59979 100755 (executable)
--- 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 82cff7ed27985d178b4030e66ef05c05c90ec7e9..4bd69e5650030b641433a282fc424a64a7515d1d 100644 (file)
--- 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 781674a960dc0669666ff22e51e1da5f8bdc4e4f..3a5353577d2c2c4f34d90b50720a71d9c155ffc4 100644 (file)
--- 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 58822b89b8c3e72cd0e7a296bbaef03821ee7cb5..039cc897702f4e1ee379f21a4192b2d5c34f30b1 100644 (file)
--- 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 46db332c65ba340d30fae0a9cf8ddda8890dbb1f..57afc799f59aea1d8a00f54a9fae097ad5a05e58 100644 (file)
--- 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 ffa53493d4485893c9f08caa097bb8bd6c44ed73..23e104d864f81eb5d1aea57816ac6671460970be 100644 (file)
--- 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 2cfb217ea70f70f07754b8f9014b4e2188659ca1..011435a16a7a9dccd578dd8b0070e32dd4be7953 100644 (file)
--- 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 5eb370838107397d3d464765b7e0857b74feb11d..9fcbebbd55bf6037f55d60d5e22f70971c85d5bd 100644 (file)
--- 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 26dce7a4d7609a9c26cedafd4671e3ef91a118a3..2104c90a49e25a3a96160279c1d539a2ce07a151 100644 (file)
--- 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 c3f4d4b1927d3dd8765f72d4bb888130ac5b139f..4c82ad59b2692ed46d455d5974408a57883f30fe 100644 (file)
--- 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 a7f90d0a7407f6f160a8e77dc8df60984e0c72c6..b7eaa797d7293f5ba26faf611c205f768d8da6e7 100644 (file)
--- 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 23c1b6e14d0af0b13838dd396fd096f34cb29243..0a1fc7ceb161774e0061ad96ae48e7e2d0258606 100644 (file)
--- 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 38dd3d4ee4d79b5146f36a820da3522831123e70..db5b192939f8fd7de4d631043234ec0fef982fa5 100644 (file)
--- 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 ed5b708efcba06189e6b892e3687dd7b48c65d71..ca3ba6c7d1ed3d329dd5233650a1fd3951411ec2 100644 (file)
--- 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 d489ea8ed6aa60286ecd86bdc349cb15149f06a3..1f1fd50ab8aeccdad8eab62b1cba79c65869bfd3 100644 (file)
--- 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 f35270382b8a8a9eed73c37d81ef0ddb5df23f76..da1011e10c39f015ec117471c3eecb09e405ab1a 100644 (file)
--- 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 791fd02c52f6640890cdb0a5d473c42f0e335e4b..83b916631c1bad2d0dccf3ef12ad6e396fb54aea 100644 (file)
--- 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 757ecbad12f87b55959fe3f346989c91b04cd60f..8c9f2512fb7996df3161c6e9d6c91d8d1ccee8a2 100644 (file)
--- 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" %]