From a7b489f00cd7577ce31383968eeef16050198c1b Mon Sep 17 00:00:00 2001 From: Gervase Markham Date: Wed, 17 Dec 2014 10:37:25 +0000 Subject: Bug 1107874 - make Help links point to new documentation. r=dkl, a=justdave. --- chart.cgi | 2 +- createaccount.cgi | 2 +- 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 | 12 ++++++------ template/en/default/admin/admin.html.tmpl | 2 +- .../en/default/admin/custom_fields/confirm-delete.html.tmpl | 2 +- template/en/default/admin/custom_fields/create.html.tmpl | 2 +- template/en/default/admin/custom_fields/edit.html.tmpl | 2 +- template/en/default/admin/custom_fields/list.html.tmpl | 2 +- template/en/default/admin/flag-type/confirm-delete.html.tmpl | 2 +- template/en/default/admin/flag-type/edit.html.tmpl | 2 +- template/en/default/admin/flag-type/list.html.tmpl | 2 +- template/en/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 +- template/en/default/admin/params/editparams.html.tmpl | 2 +- template/en/default/admin/sudo.html.tmpl | 2 +- template/en/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 +- template/en/default/attachment/confirm-delete.html.tmpl | 2 +- template/en/default/attachment/create.html.tmpl | 2 +- template/en/default/attachment/diff-header.html.tmpl | 3 +-- 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 +- template/en/default/search/search-advanced.html.tmpl | 2 +- template/en/default/search/search-create-series.html.tmpl | 2 +- template/en/default/search/search-report-graph.html.tmpl | 2 +- template/en/default/search/search-report-table.html.tmpl | 2 +- template/en/default/search/search-specific.html.tmpl | 1 + template/en/default/whine/schedule.html.tmpl | 2 +- 48 files changed, 53 insertions(+), 53 deletions(-) diff --git a/chart.cgi b/chart.cgi index 96ac9e1cf..00b0b8ee5 100755 --- a/chart.cgi +++ b/chart.cgi @@ -67,7 +67,7 @@ if (grep(/^cmd-/, $cgi->param())) { my $action = $cgi->param('action'); my $series_id = $cgi->param('series_id'); -$vars->{'doc_section'} = 'using.html#charts'; +$vars->{'doc_section'} = 'using/reports-and-charts.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 21d6cc8db..a15396384 100755 --- a/createaccount.cgi +++ b/createaccount.cgi @@ -23,7 +23,7 @@ use Bugzilla::Token; my $user = Bugzilla->login(LOGIN_OPTIONAL); my $cgi = Bugzilla->cgi; my $template = Bugzilla->template; -my $vars = { doc_section => 'using.html#create-a-bugzilla-account' }; +my $vars = { doc_section => 'using/creating-an-account.html' }; print $cgi->header(); diff --git a/editclassifications.cgi b/editclassifications.cgi index b06ce27ad..ea4b139da 100755 --- a/editclassifications.cgi +++ b/editclassifications.cgi @@ -34,7 +34,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'} = 'administration.html#classifications'; + $vars->{'doc_section'} = 'administering/categorization.html#classifications'; $action =~ /(\w+)/; $action = $1; diff --git a/editcomponents.cgi b/editcomponents.cgi index 7442365f3..aebc0b647 100755 --- a/editcomponents.cgi +++ b/editcomponents.cgi @@ -25,7 +25,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'} = 'administration.html#components'; +$vars->{'doc_section'} = 'administering/categorization.html#components'; # # Preliminary checks: diff --git a/editmilestones.cgi b/editmilestones.cgi index e20e623fb..8052bd1ab 100755 --- a/editmilestones.cgi +++ b/editmilestones.cgi @@ -25,7 +25,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'} = 'administration.html#milestones'; +$vars->{'doc_section'} = 'administering/categorization.html#milestones'; # # Preliminary checks: diff --git a/editproducts.cgi b/editproducts.cgi index f2526575e..62aa1206d 100755 --- a/editproducts.cgi +++ b/editproducts.cgi @@ -35,7 +35,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'} = 'administration.html#products'; +$vars->{'doc_section'} = 'administering/categorization.html#products'; print $cgi->header(); diff --git a/editvalues.cgi b/editvalues.cgi index 48775fc52..75ebee0fc 100755 --- a/editvalues.cgi +++ b/editvalues.cgi @@ -47,7 +47,7 @@ my $vars = {}; # Replace this entry by separate entries in templates when # the documentation about legal values becomes bigger. -$vars->{'doc_section'} = 'administration.html#legal-values'; +$vars->{'doc_section'} = 'administering/field-values.html'; print $cgi->header(); diff --git a/editversions.cgi b/editversions.cgi index 674a20b7e..1d4e17d41 100755 --- a/editversions.cgi +++ b/editversions.cgi @@ -25,7 +25,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'} = 'administration.html#versions'; +$vars->{'doc_section'} = 'administering/categorization.html#versions'; # # Preliminary checks: diff --git a/enter_bug.cgi b/enter_bug.cgi index 3f22fe4b8..e03a88528 100755 --- a/enter_bug.cgi +++ b/enter_bug.cgi @@ -47,7 +47,7 @@ my $template = Bugzilla->template; my $vars = {}; # All pages point to the same part of the documentation. -$vars->{'doc_section'} = 'using.html#filing-bugs'; +$vars->{'doc_section'} = 'using/filing.html'; 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 a4d26f4d7..2a8317d7a 100755 --- a/report.cgi +++ b/report.cgi @@ -375,7 +375,7 @@ if ($cgi->param('debug')) { } # All formats point to the same section of the documentation. -$vars->{'doc_section'} = 'using.html#reports-and-charts'; +$vars->{'doc_section'} = 'using/reports-and-charts.html#reports'; 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 33c0b4224..461e43d09 100644 --- a/template/en/default/account/prefs/prefs.html.tmpl +++ b/template/en/default/account/prefs/prefs.html.tmpl @@ -26,22 +26,22 @@ [% tabs = [{ name => "settings", label => "General Preferences", link => "userprefs.cgi?tab=settings", saveable => "1", - doc_section => "using.html#general-preferences" }, + doc_section => "using/preferences.html#general-preferences" }, { name => "email", label => "Email Preferences", link => "userprefs.cgi?tab=email", saveable => "1", - doc_section => "using.html#email-preferences" }, + doc_section => "using/preferences.html#email-preferences" }, { name => "saved-searches", label => "Saved Searches", link => "userprefs.cgi?tab=saved-searches", saveable => "1", - doc_section => "using.html#saved-searches" }, + doc_section => "using/preferences.html#saved-searches" }, { name => "account", label => "Account Information", link => "userprefs.cgi?tab=account", saveable => "1", - doc_section => "using.html#account-information" }, + doc_section => "using/preferences.html#account-information" }, { name => "apikey", label => "API Keys", link => "userprefs.cgi?tab=apikey", saveable => "1", - doc_section => "using.html#apikey" }, + doc_section => "using/preferences.html#api-keys" }, { name => "permissions", label => "Permissions", link => "userprefs.cgi?tab=permissions", saveable => "0", - doc_section => "using.html#permissions" } ] %] + doc_section => "using/preferences.html#permissions" } ] %] [% Hook.process('tabs') %] diff --git a/template/en/default/admin/admin.html.tmpl b/template/en/default/admin/admin.html.tmpl index 01e9f309b..96aefae8b 100644 --- a/template/en/default/admin/admin.html.tmpl +++ b/template/en/default/admin/admin.html.tmpl @@ -13,7 +13,7 @@ [% PROCESS global/header.html.tmpl title = title style_urls = ['skins/standard/admin.css'] - doc_section = "administration.html" + doc_section = "administering/index.html" %]
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 43f33512a..1d2348a0f 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 = "administration.html#deleting-custom-fields" + doc_section = "administering/custom-fields.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 1f6f71360..71ba08f46 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 = "administration.html#adding-custom-fields" + doc_section = "administering/custom-fields.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 b8365b300..6f7389d05 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 = "administration.html#editing-custom-fields" + doc_section = "administering/custom-fields.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 918b440ad..5e9183e56 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 = "administration.html#custom-fields" + doc_section = "administering/custom-fields.html" %] [% 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 4cc5890ed..a05e857d2 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 = "administration.html#deleting-a-flag" + doc_section = "administering/flags.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 5f45b6b76..6c0e0cb78 100644 --- a/template/en/default/admin/flag-type/edit.html.tmpl +++ b/template/en/default/admin/flag-type/edit.html.tmpl @@ -25,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 = "administration.html#administering-flags" + doc_section = "administering/flags.html" %]
diff --git a/template/en/default/admin/flag-type/list.html.tmpl b/template/en/default/admin/flag-type/list.html.tmpl index 25b2e3390..f4836ca7d 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 = "administration.html#two-types-of-flags" + doc_section = "administering/flags.html" %]

diff --git a/template/en/default/admin/groups/confirm-remove.html.tmpl b/template/en/default/admin/groups/confirm-remove.html.tmpl index d626ca2ba..3249ee384 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 = "administration.html#groups-and-group-security" + doc_section = "administering/groups.html" %] [% IF regexp %] diff --git a/template/en/default/admin/groups/create.html.tmpl b/template/en/default/admin/groups/create.html.tmpl index 8f9be1c7a..3827fb0e3 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 = "administration.html#creating-groups" + doc_section = "administering/groups.html#creating-groups" %] diff --git a/template/en/default/admin/groups/delete.html.tmpl b/template/en/default/admin/groups/delete.html.tmpl index 78a1352d3..465860761 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 = "administration.html#groups-and-group-security" + doc_section = "administering/groups.html" %]

diff --git a/template/en/default/admin/groups/edit.html.tmpl b/template/en/default/admin/groups/edit.html.tmpl index 1cc948ea2..3e64fa7c4 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 = "administration.html#editing-groups-and-assigning-group-permissions" + doc_section = "administering/groups.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 29e39f65f..673c053cb 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 = "administration.html#groups-and-group-security" + doc_section = "administering/groups.html" %] [% 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 6a9248fcc..4e1946dd8 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/admin.css'] javascript_urls = ['js/params.js', 'js/util.js'] - doc_section = "administration.html#bugzilla-configuration" + doc_section = "administering/parameters.html" %]
diff --git a/template/en/default/admin/sudo.html.tmpl b/template/en/default/admin/sudo.html.tmpl index bf0cd7b6f..b3f748697 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 = "administration.html#impersonating-users" + doc_section = "administering/users.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 bc3f6cc3b..4dab8b471 100644 --- a/template/en/default/admin/users/confirm-delete.html.tmpl +++ b/template/en/default/admin/users/confirm-delete.html.tmpl @@ -39,7 +39,7 @@ [% PROCESS global/header.html.tmpl title = title style_urls = ['skins/standard/admin.css'] - doc_section = "administration.html#deleting-users" + doc_section = "administering/users.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 f85f416f4..6fbd1dc2f 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/admin.css'] - doc_section = "administration.html#creating-new-users" + doc_section = "administering/users.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 e6bc0f05d..41a013131 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'] - doc_section = "administration.html#modifying-users" + doc_section = "administering/users.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 bfe1be139..f90996882 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'] - doc_section = "administration.html#user-administration" + doc_section = "administering/users.html" %] [% 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 a23796cd6..17477a012 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/admin.css'] - doc_section = "administration.html#managing-other-users" + doc_section = "administering/users.html" %] [% 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 dfc95c8f8..5108692a8 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 = "using.html#attachments" + doc_section = "using/editing.html#attachments" %]
diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl index 18cc12640..13c13cdb9 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/bug.css'] yui = [ 'autocomplete' ] javascript_urls = [ "js/attachment.js", 'js/field.js', "js/util.js", "js/TUI.js" ] - doc_section = "using.html#attachments" + doc_section = "using/editing.html#attachments" %]