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

d5adbc10 · lpsolit%gmail.com · 50cdda2d · d5adbc10 · d5adbc10 · d5adbc10
Commit d5adbc10 authored Nov 12, 2007 by lpsolit%gmail.com
22 changed files
--- 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

--- 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.

--- 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>

--- 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;

--- 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());


--- 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">

--- 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">

--- 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>

--- 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>

--- 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; }

--- 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>

--- 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 %]

--- 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 %]

--- 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 %]


--- 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 %]

--- 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">

--- 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>

--- 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 %]

--- 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;
           }"

--- 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">

--- 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" %]

--- 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" %]