From bda0b03ef78190ac2b9cd8e4e48eb09bb4ac8d56 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 6 Jan 2023 16:09:42 +0000 Subject: [PATCH] Bug 33068: Use template wrapper for breadcrumbs: Administration part 3 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 -> - Circulation and fine rules -> Clone rules - Table settings - Credit types -> - New credit type - Edit credit type - Curbside pickup - Currencies and exchange rates -> - New currency - Edit currency - Confirm deletion - Debit types -> - New debt type - Edit debit type - Desks -> - New desk - Edit desk - Confirm deletion - Did you mean? - EDI accounts - New account - Edit account - Confirm deletion --- .../prog/en/modules/admin/clone-rules.tt | 27 +++----- .../prog/en/modules/admin/columns_settings.tt | 24 +++---- .../prog/en/modules/admin/credit_types.tt | 43 +++++-------- .../prog/en/modules/admin/curbside_pickup.tt | 25 +++----- .../prog/en/modules/admin/currency.tt | 51 ++++++--------- .../prog/en/modules/admin/debit_types.tt | 43 +++++-------- .../prog/en/modules/admin/desks.tt | 61 ++++++++---------- .../prog/en/modules/admin/didyoumean.tt | 23 +++---- .../prog/en/modules/admin/edi_accounts.tt | 62 +++++++------------ 9 files changed, 140 insertions(+), 219 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt index a640de6920e..909ff774e37 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt @@ -12,25 +12,18 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Clone circulation and fine rules + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt index 63b0f1299a3..bd8c826f274 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt @@ -177,23 +177,17 @@ [% WRAPPER 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] [% END %] + [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Table settings + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt index 55184158de9..c232a4a17b9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt @@ -24,39 +24,30 @@ [% 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/curbside_pickup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt index d26d4262772..5d345ddc25b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt @@ -26,22 +26,17 @@ [% USE format_minutes = format('%02d') %] [% MACRO minutes_format BLOCK %][% IF m != "" %][% format_minutes(m) | html %][% END %][% END %] - + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Curbside pickup + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt index 1d778e0ad87..c98872a0c53 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt @@ -18,47 +18,36 @@ [% 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/debit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt index 546e51e00ed..a91c46a7ba6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt @@ -22,39 +22,30 @@ [% 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/desks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt index d283a57e509..fd78a11301d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt @@ -24,49 +24,38 @@ [% 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/didyoumean.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt index 5efac8a06bf..ae0b86856e6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt @@ -33,22 +33,15 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Did you mean? + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt index a2ba4f05017..cf86293452b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt @@ -22,53 +22,39 @@ EDI accounts › Administration › Koha [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
-- 2.30.2