From 742d0b242eaeb21e88918334809e8284c232a50c Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 6 Jan 2023 16:43:38 +0000 Subject: [PATCH] Bug 33111: Use template wrapper for breadcrumbs: Administration part 4 This patch updates several administration templates so that they use the new WRAPPER for displaying breadcrumbs. To test, apply the patch and test each page and its variations. Breadcrumbs should look correct, and each link should be correct. Administration -> - Library EANs (list, new, edit, confirm delete) - Identity providers (list, new, edit) - Manage domains (list, new, edit) - Item circulation alerts - Item search fields (list, new, edit) - Item types (list, new, edit, delete confirm) - Koha to MARC mapping - Library groups - MARC frameworks -> -> Actions -> MARC structure (list, new, edit, delete confirm) -> View, edit, and delete confirm - Record matching rules (list, new, edit, delete confirm) Signed-off-by: Andrew Auld Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 0c5261f4f1fce30affc790142aaf9027199a84f0) Signed-off-by: Jacob O'Mara --- .../prog/en/modules/admin/edi_ean_accounts.tt | 55 +++++-------- .../admin/identity_provider_domains.tt | 51 +++++------- .../en/modules/admin/identity_providers.tt | 47 +++++------ .../modules/admin/item_circulation_alerts.tt | 23 ++---- .../en/modules/admin/items_search_field.tt | 43 ++++------ .../en/modules/admin/items_search_fields.tt | 28 +++---- .../prog/en/modules/admin/itemtypes.tt | 78 +++++++----------- .../prog/en/modules/admin/koha2marclinks.tt | 21 ++--- .../prog/en/modules/admin/library_groups.tt | 21 ++--- .../modules/admin/marc_subfields_structure.tt | 67 ++++++--------- .../prog/en/modules/admin/marctagstructure.tt | 82 +++++++++---------- .../prog/en/modules/admin/matching-rules.tt | 56 +++++-------- 12 files changed, 232 insertions(+), 340 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt index a6b27e7b63..d41d8319ba 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt @@ -21,49 +21,38 @@ Library EANs › Administration › Koha [% 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/identity_provider_domains.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt index ad1bd8735e..b5ec234fcd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt @@ -18,48 +18,39 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_providers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_providers.tt index 6dcb3b04e9..9150dfe02b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_providers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_providers.tt @@ -18,44 +18,35 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt index f97c98c41e..00330ffc34 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt @@ -50,22 +50,15 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Item circulation alerts + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt index 81f98ba7ce..8878657777 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt @@ -13,35 +13,26 @@ [% 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/items_search_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt index 95bf00979d..28b86492f7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt @@ -13,22 +13,18 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - - [% END %] + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item %] + Home + [% END %] + [% WRAPPER breadcrumb_item %] + Administration + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Item search fields + [% END %] + [% END #/ WRAPPER breadcrumbs %] + [% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt index a91de392aa..f206f8fee4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -52,74 +52,54 @@ Item types › Administration › Koha [% 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/koha2marclinks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt index ca545be15a..6b8aea71be 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt @@ -12,20 +12,15 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Koha to MARC mapping + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt index e7043e4c16..3536a92b4c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt @@ -14,20 +14,15 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Library groups + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %] [% FOR m IN messages %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt index 95df1dbfd6..1b1fe96547 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt @@ -41,18 +41,14 @@ [% 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/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt index 35695a81e2..17cd8f9a60 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -27,20 +27,16 @@ MARC frameworks › Administration › Koha [% END %] [% WRAPPER 'sub-header.inc' %] -