From a4d12f7cdebd46b2fb95c83dec22de2a7f24b60e Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Sat, 18 Feb 2023 15:54:24 +0000 Subject: [PATCH] Bug 33006: Use template wrapper for breadcrumbs: Administration part 1 This patch updates several administration templates so that they use the new WRAPPER for displaying breadcrumbs. Note: The patch includes indentation changes, so ignore whitespace when viewing the diff. To test, apply the patch and test each page and its variations. Breadcrumbs should look correct, and each link should be correct. Administration -> Administration home page - Under "Additional parameters" -> Additional fields -> View, create, edit -> Advanced editor shortcuts -> Audio alerts - Under "Acquisition parameters" -> Budgets -> Add fund -> Close fund -> Budget details -> Planning -> Create, edit, duplicate - Under "Catalog" -> Authority types -> MARC structure -> New, edit, delete -> "Actions" -> Subfields -> Edit, delete Acquisitions -> Vendor -> Contracts - View, edit, delete Signed-off-by: Lucas Gass Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 695b0aaa618908fc3017077faf3c6d6d13252156) Signed-off-by: Jacob O'Mara --- .../en/modules/admin/additional-fields.tt | 77 +++++------- .../prog/en/modules/admin/admin-home.tt | 21 ++-- .../en/modules/admin/adveditorshortcuts.tt | 21 ++-- .../prog/en/modules/admin/aqbudgetperiods.tt | 99 ++++++--------- .../prog/en/modules/admin/aqbudgets.tt | 90 ++++++-------- .../prog/en/modules/admin/aqcontract.tt | 81 +++++------- .../prog/en/modules/admin/aqplan.tt | 29 ++--- .../prog/en/modules/admin/audio_alerts.tt | 23 ++-- .../modules/admin/auth_subfields_structure.tt | 64 ++++------ .../en/modules/admin/auth_tag_structure.tt | 115 ++++++++---------- 10 files changed, 253 insertions(+), 367 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt index b856827209..58cbff59eb 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt @@ -21,55 +21,42 @@ [% INCLUDE 'cat-search.inc' %] [% END %] - [% WRAPPER 'sub-header.inc' %] - - [% END %] + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt index 0e83b36721..d27a03250e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt @@ -1,3 +1,5 @@ + +[% USE raw %] [% USE Koha %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] @@ -10,19 +12,12 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Administration + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt index 3b27d3c017..dea5c51ac6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt @@ -13,20 +13,15 @@ [% PROCESS 'keyboard_shortcuts.inc' %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Advanced editor shortcuts + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt index 4c4c3aad78..d648b832df 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -77,96 +77,75 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt index c8ee656ba8..d2e68e9747 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -17,67 +17,55 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt index 5b26ac2da8..0c3b06d680 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt @@ -23,80 +23,63 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt index 29992d1436..a65b9a3b09 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt @@ -15,26 +15,21 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Planning + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt index 2019ff2830..253eafd5f2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt @@ -13,22 +13,15 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Audio alerts + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt index 9db4d0c8b7..4061006a67 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt @@ -12,68 +12,58 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt index 3083c15c2b..b40eac911e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt @@ -43,125 +43,106 @@ Authority MARC framework › Administration › Koha [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
-- 2.39.5