From 8e0b7aa5e9fb3920d4283b9582d8cf5a35d51ab1 Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Wed, 12 Feb 2014 15:11:36 +0100 Subject: Bug 969881: All "Help" links in the header and footer of pages point to inexistent files r=gerv a=justdave --- chart.cgi | 2 +- createaccount.cgi | 2 +- docs/en/rst/using.rst | 4 ++-- editclassifications.cgi | 2 +- editcomponents.cgi | 2 +- editmilestones.cgi | 2 +- editproducts.cgi | 2 +- editvalues.cgi | 2 +- editversions.cgi | 2 +- enter_bug.cgi | 2 +- report.cgi | 2 +- template/en/default/account/prefs/prefs.html.tmpl | 23 +++++++++++++--------- .../admin/custom_fields/confirm-delete.html.tmpl | 2 +- .../default/admin/custom_fields/create.html.tmpl | 2 +- .../en/default/admin/custom_fields/edit.html.tmpl | 2 +- .../en/default/admin/custom_fields/list.html.tmpl | 2 +- .../admin/flag-type/confirm-delete.html.tmpl | 2 +- template/en/default/admin/flag-type/edit.html.tmpl | 4 +--- template/en/default/admin/flag-type/list.html.tmpl | 2 +- .../default/admin/groups/confirm-remove.html.tmpl | 2 +- template/en/default/admin/groups/create.html.tmpl | 2 +- template/en/default/admin/groups/delete.html.tmpl | 2 +- template/en/default/admin/groups/edit.html.tmpl | 2 +- template/en/default/admin/groups/list.html.tmpl | 2 +- .../en/default/admin/params/editparams.html.tmpl | 2 +- template/en/default/admin/sudo.html.tmpl | 2 +- .../default/admin/users/confirm-delete.html.tmpl | 2 +- template/en/default/admin/users/create.html.tmpl | 2 +- template/en/default/admin/users/edit.html.tmpl | 2 +- template/en/default/admin/users/list.html.tmpl | 2 +- template/en/default/admin/users/search.html.tmpl | 2 +- .../en/default/attachment/confirm-delete.html.tmpl | 2 +- template/en/default/attachment/create.html.tmpl | 2 +- .../en/default/attachment/diff-header.html.tmpl | 2 +- template/en/default/attachment/edit.html.tmpl | 2 +- template/en/default/bug/dependency-tree.html.tmpl | 2 +- template/en/default/bug/show-header.html.tmpl | 2 +- template/en/default/bug/show-multiple.html.tmpl | 2 +- template/en/default/bug/summarize-time.html.tmpl | 2 +- template/en/default/list/list.html.tmpl | 2 +- template/en/default/reports/menu.html.tmpl | 2 +- template/en/default/reports/old-charts.html.tmpl | 2 +- .../en/default/search/search-advanced.html.tmpl | 2 +- .../default/search/search-create-series.html.tmpl | 2 +- .../default/search/search-report-graph.html.tmpl | 2 +- .../default/search/search-report-table.html.tmpl | 2 +- template/en/default/whine/schedule.html.tmpl | 2 +- 47 files changed, 61 insertions(+), 58 deletions(-) diff --git a/chart.cgi b/chart.cgi index d6f090afe..015077650 100755 --- a/chart.cgi +++ b/chart.cgi @@ -65,7 +65,7 @@ if (grep(/^cmd-/, $cgi->param())) { my $action = $cgi->param('action'); my $series_id = $cgi->param('series_id'); -$vars->{'doc_section'} = 'reporting.html#charts'; +$vars->{'doc_section'} = 'using.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 e2dbbf62f..c9516ab00 100755 --- a/createaccount.cgi +++ b/createaccount.cgi @@ -21,7 +21,7 @@ use Bugzilla::Token; my $user = Bugzilla->login(LOGIN_OPTIONAL); my $cgi = Bugzilla->cgi; my $template = Bugzilla->template; -my $vars = { doc_section => 'myaccount.html' }; +my $vars = { doc_section => 'using.html#create-a-bugzilla-account' }; print $cgi->header(); diff --git a/docs/en/rst/using.rst b/docs/en/rst/using.rst index 0fe1da3fc..5be1a2582 100644 --- a/docs/en/rst/using.rst +++ b/docs/en/rst/using.rst @@ -993,8 +993,8 @@ the Search show up in the footer of the group's direct members by default. .. _accountpreferences: -Name and Password -================= +Account Information +=================== On this tab, you can change your basic account information, including your password, email address and real name. For security diff --git a/editclassifications.cgi b/editclassifications.cgi index d47853133..149433b25 100755 --- a/editclassifications.cgi +++ b/editclassifications.cgi @@ -32,7 +32,7 @@ sub LoadTemplate { if ($action eq 'select'); # There is currently only one section about classifications, # so all pages point to it. Let's define it here. - $vars->{'doc_section'} = 'classifications.html'; + $vars->{'doc_section'} = 'administration.html#classifications'; $action =~ /(\w+)/; $action = $1; diff --git a/editcomponents.cgi b/editcomponents.cgi index 12a449fd4..4423931fe 100755 --- a/editcomponents.cgi +++ b/editcomponents.cgi @@ -23,7 +23,7 @@ my $template = Bugzilla->template; my $vars = {}; # There is only one section about components in the documentation, # so all actions point to the same page. -$vars->{'doc_section'} = 'components.html'; +$vars->{'doc_section'} = 'administration.html#components'; # # Preliminary checks: diff --git a/editmilestones.cgi b/editmilestones.cgi index 3eeb300ab..927c1a9d1 100755 --- a/editmilestones.cgi +++ b/editmilestones.cgi @@ -23,7 +23,7 @@ my $template = Bugzilla->template; my $vars = {}; # There is only one section about milestones in the documentation, # so all actions point to the same page. -$vars->{'doc_section'} = 'milestones.html'; +$vars->{'doc_section'} = 'administration.html#milestones'; # # Preliminary checks: diff --git a/editproducts.cgi b/editproducts.cgi index 137f14285..77d112f46 100755 --- a/editproducts.cgi +++ b/editproducts.cgi @@ -33,7 +33,7 @@ my $template = Bugzilla->template; my $vars = {}; # Remove this as soon as the documentation about products has been # improved and each action has its own section. -$vars->{'doc_section'} = 'products.html'; +$vars->{'doc_section'} = 'administration.html#products'; print $cgi->header(); diff --git a/editvalues.cgi b/editvalues.cgi index 61fe24723..5bceed761 100755 --- a/editvalues.cgi +++ b/editvalues.cgi @@ -49,7 +49,7 @@ my $vars = {}; # Replace this entry by separate entries in templates when # the documentation about legal values becomes bigger. -$vars->{'doc_section'} = 'edit-values.html'; +$vars->{'doc_section'} = 'administration.html#legal-values'; print $cgi->header(); diff --git a/editversions.cgi b/editversions.cgi index 06f2f580c..2dce7bd0a 100755 --- a/editversions.cgi +++ b/editversions.cgi @@ -23,7 +23,7 @@ my $template = Bugzilla->template; my $vars = {}; # There is only one section about versions in the documentation, # so all actions point to the same page. -$vars->{'doc_section'} = 'versions.html'; +$vars->{'doc_section'} = 'administration.html#versions'; # # Preliminary checks: diff --git a/enter_bug.cgi b/enter_bug.cgi index 617fdde67..da80e9d15 100755 --- a/enter_bug.cgi +++ b/enter_bug.cgi @@ -45,7 +45,7 @@ my $template = Bugzilla->template; my $vars = {}; # All pages point to the same part of the documentation. -$vars->{'doc_section'} = 'bugreports.html'; +$vars->{'doc_section'} = 'using.html#filing-bugs'; my $product_name = trim($cgi->param('product') || ''); # Will contain the product object the bug is created in. diff --git a/report.cgi b/report.cgi index cefe96d5a..4cfa6a6a4 100755 --- a/report.cgi +++ b/report.cgi @@ -373,7 +373,7 @@ if ($cgi->param('debug')) { } # All formats point to the same section of the documentation. -$vars->{'doc_section'} = 'reporting.html#reports'; +$vars->{'doc_section'} = 'using.html#reports-and-charts'; disable_utf8() if ($format->{'ctype'} =~ /^image\//); diff --git a/template/en/default/account/prefs/prefs.html.tmpl b/template/en/default/account/prefs/prefs.html.tmpl index 4681299dd..faa18d581 100644 --- a/template/en/default/account/prefs/prefs.html.tmpl +++ b/template/en/default/account/prefs/prefs.html.tmpl @@ -25,15 +25,20 @@ [% filtered_login = user.login FILTER html %] [% tabs = [{ name => "settings", label => "General Preferences", - link => "userprefs.cgi?tab=settings", saveable => "1" }, - { name => "email", label => "Email Preferences", - link => "userprefs.cgi?tab=email", saveable => "1" }, - { name => "saved-searches", label => "Saved Searches", - link => "userprefs.cgi?tab=saved-searches", saveable => "1" }, + link => "userprefs.cgi?tab=settings", saveable => "1", + doc_section => "using.html#general-preferences" }, + { name => "email", label => "Email Preferences", + link => "userprefs.cgi?tab=email", saveable => "1", + doc_section => "using.html#email-preferences" }, + { name => "saved-searches", label => "Saved Searches", + link => "userprefs.cgi?tab=saved-searches", saveable => "1", + doc_section => "using.html#saved-searches" }, { name => "account", label => "Account Information", - link => "userprefs.cgi?tab=account", saveable => "1" }, - { name => "permissions", label => "Permissions", - link => "userprefs.cgi?tab=permissions", saveable => "0" } ] %] + link => "userprefs.cgi?tab=account", saveable => "1", + doc_section => "using.html#account-information" }, + { name => "permissions", label => "Permissions", + link => "userprefs.cgi?tab=permissions", saveable => "0", + doc_section => "using.html#permissions" } ] %] [% Hook.process('tabs') %] @@ -49,7 +54,7 @@ subheader = filtered_login style_urls = ['skins/standard/admin.css'] javascript_urls = ['js/util.js', 'js/field.js'] - doc_section = "userpreferences.html" + doc_section = current_tab.doc_section yui = ['autocomplete'] %] diff --git a/template/en/default/admin/custom_fields/confirm-delete.html.tmpl b/template/en/default/admin/custom_fields/confirm-delete.html.tmpl index 471d7a1c4..43f33512a 100644 --- a/template/en/default/admin/custom_fields/confirm-delete.html.tmpl +++ b/template/en/default/admin/custom_fields/confirm-delete.html.tmpl @@ -20,7 +20,7 @@ [% PROCESS global/header.html.tmpl title = title style_urls = ['skins/standard/admin.css'] - doc_section = "custom-fields.html#delete-custom-fields" + doc_section = "administration.html#deleting-custom-fields" %] diff --git a/template/en/default/admin/custom_fields/create.html.tmpl b/template/en/default/admin/custom_fields/create.html.tmpl index d610a68dc..1f6f71360 100644 --- a/template/en/default/admin/custom_fields/create.html.tmpl +++ b/template/en/default/admin/custom_fields/create.html.tmpl @@ -18,7 +18,7 @@ title = "Add a new Custom Field" onload = "document.getElementById('new_bugmail').disabled = true;" javascript_urls = [ 'js/util.js' ] - doc_section = "custom-fields.html#add-custom-fields" + doc_section = "administration.html#adding-custom-fields" style_urls = ['skins/standard/admin.css'] %] diff --git a/template/en/default/admin/custom_fields/edit.html.tmpl b/template/en/default/admin/custom_fields/edit.html.tmpl index 7cc09e6ec..b8365b300 100644 --- a/template/en/default/admin/custom_fields/edit.html.tmpl +++ b/template/en/default/admin/custom_fields/edit.html.tmpl @@ -22,7 +22,7 @@ title = title onload = "toggleCheckbox(document.getElementById('enter_bug'), 'new_bugmail');" javascript_urls = [ 'js/util.js' ] - doc_section = "custom-fields.html#edit-custom-fields" + doc_section = "administration.html#editing-custom-fields" style_urls = ['skins/standard/admin.css'] %] diff --git a/template/en/default/admin/custom_fields/list.html.tmpl b/template/en/default/admin/custom_fields/list.html.tmpl index 7d54926b0..918b440ad 100644 --- a/template/en/default/admin/custom_fields/list.html.tmpl +++ b/template/en/default/admin/custom_fields/list.html.tmpl @@ -15,7 +15,7 @@ [% PROCESS global/header.html.tmpl title = "Custom Fields" style_urls = ['skins/standard/admin.css'] - doc_section = "custom-fields.html" + doc_section = "administration.html#custom-fields" %] [% delete_contentlink = BLOCK %]editfields.cgi?action=del&name=%%name%%[% END %] diff --git a/template/en/default/admin/flag-type/confirm-delete.html.tmpl b/template/en/default/admin/flag-type/confirm-delete.html.tmpl index 72a928b42..4cc5890ed 100644 --- a/template/en/default/admin/flag-type/confirm-delete.html.tmpl +++ b/template/en/default/admin/flag-type/confirm-delete.html.tmpl @@ -11,7 +11,7 @@ [% PROCESS global/header.html.tmpl title = title style_urls = ['skins/standard/admin.css'] - doc_section = "flags-overview.html#flags-delete" + doc_section = "administration.html#deleting-a-flag" %]

diff --git a/template/en/default/admin/flag-type/edit.html.tmpl b/template/en/default/admin/flag-type/edit.html.tmpl index 2c71180f3..e52d58a9a 100644 --- a/template/en/default/admin/flag-type/edit.html.tmpl +++ b/template/en/default/admin/flag-type/edit.html.tmpl @@ -15,10 +15,8 @@ Based on [% type.name FILTER html %] [% END %] [% END %] - [% doc_section = "flags-overview.html#flags-create" %] [% ELSE %] [% title = BLOCK %]Edit Flag Type [% type.name FILTER html %][% END %] - [% doc_section = "flags-overview.html#flags-edit" %] [% END %] [% PROCESS global/header.html.tmpl @@ -27,7 +25,7 @@ onload="var f = document.forms['flagtype_properties']; selectProduct(f.product, f.component, null, null, '__Any__');" javascript_urls=["js/productform.js"] - doc_section = doc_section + doc_section = "administration.html#administering-flags" %]
diff --git a/template/en/default/admin/flag-type/list.html.tmpl b/template/en/default/admin/flag-type/list.html.tmpl index 375f62978..3783cade8 100644 --- a/template/en/default/admin/flag-type/list.html.tmpl +++ b/template/en/default/admin/flag-type/list.html.tmpl @@ -13,7 +13,7 @@ style_urls = ['skins/standard/admin.css'] onload="var f = document.flagtype_form; selectProduct(f.product, f.component, null, null, '__All__');" javascript_urls=["js/productform.js"] - doc_section = "flags-overview.html#flag-types" + doc_section = "administration.html#two-types-of-flags" %]

diff --git a/template/en/default/admin/groups/confirm-remove.html.tmpl b/template/en/default/admin/groups/confirm-remove.html.tmpl index bc9698aee..d626ca2ba 100644 --- a/template/en/default/admin/groups/confirm-remove.html.tmpl +++ b/template/en/default/admin/groups/confirm-remove.html.tmpl @@ -19,7 +19,7 @@ [% PROCESS global/header.html.tmpl title = title - doc_section = "groups.html" + doc_section = "administration.html#groups-and-group-security" %] [% IF regexp %] diff --git a/template/en/default/admin/groups/create.html.tmpl b/template/en/default/admin/groups/create.html.tmpl index ca95bab56..06396926c 100644 --- a/template/en/default/admin/groups/create.html.tmpl +++ b/template/en/default/admin/groups/create.html.tmpl @@ -14,7 +14,7 @@ title = "Add group" subheader = "This page allows you to define a new user group." style_urls = ['skins/standard/admin.css'] - doc_section = "groups.html#create-groups" + doc_section = "administration.html#creating-groups" %] diff --git a/template/en/default/admin/groups/delete.html.tmpl b/template/en/default/admin/groups/delete.html.tmpl index 915a88b72..78a1352d3 100644 --- a/template/en/default/admin/groups/delete.html.tmpl +++ b/template/en/default/admin/groups/delete.html.tmpl @@ -17,7 +17,7 @@ [% PROCESS global/header.html.tmpl title = title style_urls = ['skins/standard/admin.css'] - doc_section = "groups.html" + doc_section = "administration.html#groups-and-group-security" %]

diff --git a/template/en/default/admin/groups/edit.html.tmpl b/template/en/default/admin/groups/edit.html.tmpl index a14795be7..c9883ce42 100644 --- a/template/en/default/admin/groups/edit.html.tmpl +++ b/template/en/default/admin/groups/edit.html.tmpl @@ -19,7 +19,7 @@ [% PROCESS global/header.html.tmpl title = title style_urls = ['skins/standard/admin.css'] - doc_section = "groups.html#edit-groups" + doc_section = "administration.html#editing-groups-and-assigning-group-permissions" %] diff --git a/template/en/default/admin/groups/list.html.tmpl b/template/en/default/admin/groups/list.html.tmpl index ba61da3ee..7a15703df 100644 --- a/template/en/default/admin/groups/list.html.tmpl +++ b/template/en/default/admin/groups/list.html.tmpl @@ -20,7 +20,7 @@ title = "Edit Groups" subheader = "This lets you edit the groups available to put users in." style_urls = ['skins/standard/admin.css'] - doc_section = "groups.html" + doc_section = "administration.html#groups-and-group-security" %] [% edit_contentlink = "editgroups.cgi?action=changeform&group=%%id%%" %] diff --git a/template/en/default/admin/params/editparams.html.tmpl b/template/en/default/admin/params/editparams.html.tmpl index 2e7d2245a..4cc22da99 100644 --- a/template/en/default/admin/params/editparams.html.tmpl +++ b/template/en/default/admin/params/editparams.html.tmpl @@ -37,7 +37,7 @@ message = message style_urls = ['skins/standard/params.css'] javascript_urls = ['js/params.js', 'js/util.js'] - doc_section = "parameters.html" + doc_section = "administration.html#bugzilla-configuration" %]
diff --git a/template/en/default/admin/sudo.html.tmpl b/template/en/default/admin/sudo.html.tmpl index 9065206d5..a5f13a015 100644 --- a/template/en/default/admin/sudo.html.tmpl +++ b/template/en/default/admin/sudo.html.tmpl @@ -9,7 +9,7 @@ [% PROCESS global/header.html.tmpl title = "Begin sudo session" style_urls = ['skins/standard/admin.css'] - doc_section = "useradmin.html#impersonatingusers" + doc_section = "administration.html#impersonating-users" %] [% DEFAULT target_login = "" %] diff --git a/template/en/default/admin/users/confirm-delete.html.tmpl b/template/en/default/admin/users/confirm-delete.html.tmpl index 20100a86b..e59c01534 100644 --- a/template/en/default/admin/users/confirm-delete.html.tmpl +++ b/template/en/default/admin/users/confirm-delete.html.tmpl @@ -40,7 +40,7 @@ title = title style_urls = ['skins/standard/admin.css', 'skins/standard/editusers.css'] - doc_section = "useradmin.html#user-account-deletion" + doc_section = "administration.html#deleting-users" %] [% PROCESS admin/users/listselectvars.html.tmpl diff --git a/template/en/default/admin/users/create.html.tmpl b/template/en/default/admin/users/create.html.tmpl index 279c610a7..497616745 100644 --- a/template/en/default/admin/users/create.html.tmpl +++ b/template/en/default/admin/users/create.html.tmpl @@ -15,7 +15,7 @@ [% PROCESS global/header.html.tmpl title = "Add user" style_urls = ['skins/standard/editusers.css'] - doc_section = "useradmin.html#createnewusers" + doc_section = "administration.html#creating-new-users" %] [% PROCESS admin/users/listselectvars.html.tmpl diff --git a/template/en/default/admin/users/edit.html.tmpl b/template/en/default/admin/users/edit.html.tmpl index 3f4fb76b9..3e0eb3c34 100644 --- a/template/en/default/admin/users/edit.html.tmpl +++ b/template/en/default/admin/users/edit.html.tmpl @@ -23,7 +23,7 @@ title = title message = message style_urls = ['skins/standard/admin.css', 'skins/standard/editusers.css'] - doc_section = "useradmin.html#modifyusers" + doc_section = "administration.html#modifying-users" javascript_urls = [ 'js/field.js' ] %] diff --git a/template/en/default/admin/users/list.html.tmpl b/template/en/default/admin/users/list.html.tmpl index 38f36f57f..3fcb6ca81 100644 --- a/template/en/default/admin/users/list.html.tmpl +++ b/template/en/default/admin/users/list.html.tmpl @@ -17,7 +17,7 @@ [% PROCESS global/header.html.tmpl title = "Select user" style_urls = ['skins/standard/admin.css', 'skins/standard/editusers.css'] - doc_section = "useradmin.html" + doc_section = "administration.html#user-administration" %] [% PROCESS admin/users/listselectvars.html.tmpl diff --git a/template/en/default/admin/users/search.html.tmpl b/template/en/default/admin/users/search.html.tmpl index 97431bcad..2d3bb819a 100644 --- a/template/en/default/admin/users/search.html.tmpl +++ b/template/en/default/admin/users/search.html.tmpl @@ -18,7 +18,7 @@ [% PROCESS global/header.html.tmpl title = "Search users" style_urls = ['skins/standard/editusers.css'] - doc_section = "useradmin.html#user-account-search" + doc_section = "administration.html#managing-other-users" %] [% PROCESS admin/users/listselectvars.html.tmpl diff --git a/template/en/default/attachment/confirm-delete.html.tmpl b/template/en/default/attachment/confirm-delete.html.tmpl index fe6135679..dfc95c8f8 100644 --- a/template/en/default/attachment/confirm-delete.html.tmpl +++ b/template/en/default/attachment/confirm-delete.html.tmpl @@ -18,7 +18,7 @@ [% PROCESS global/header.html.tmpl title = title style_urls = ['skins/standard/admin.css'] - doc_section = "attachments.html" + doc_section = "using.html#attachments" %]
diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl index abc0f97bf..5c2384d51 100644 --- a/template/en/default/attachment/create.html.tmpl +++ b/template/en/default/attachment/create.html.tmpl @@ -19,7 +19,7 @@ style_urls = [ 'skins/standard/attachment.css' ] yui = [ 'autocomplete' ] javascript_urls = [ "js/attachment.js", 'js/field.js', "js/util.js", "js/TUI.js" ] - doc_section = "attachments.html" + doc_section = "using.html#attachments" %]