From 04ef92def3e48ba6038d880e1f6b38e96c9d32dd Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 24 Feb 2023 17:23:46 +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 | 2 +- .../prog/en/modules/admin/columns_settings.tt | 2 +- .../prog/en/modules/admin/credit_types.tt | 6 ++--- .../prog/en/modules/admin/curbside_pickup.tt | 2 +- .../prog/en/modules/admin/currency.tt | 8 +++---- .../prog/en/modules/admin/debit_types.tt | 2 +- .../prog/en/modules/admin/desks.tt | 22 +++++++++--------- .../prog/en/modules/admin/didyoumean.tt | 2 +- .../prog/en/modules/admin/edi_accounts.tt | 23 +++++++++---------- 9 files changed, 34 insertions(+), 35 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 94313335d7..909ff774e3 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 @@ -20,7 +20,7 @@ Circulation and fine rules [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Clone circulation and fine rules + 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 dabbcba22c..bd8c826f27 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 @@ -184,7 +184,7 @@ Administration [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Table settings + 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 1851357af3..c232a4a17b 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 @@ -35,15 +35,15 @@ [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] [% IF credit_type.code %] - Modify credit type + Modify credit type [% ELSE %] - New credit type + New credit type [% END %] [% END %] [% ELSE %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Credit types + Credit types [% END %] [% END %] [% END #/ WRAPPER breadcrumbs %] 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 221abd39fb..5d345ddc25 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 @@ -33,7 +33,7 @@ Administration [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Curbside pickup + 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 1bd54aaa76..c98872a0c5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt @@ -29,21 +29,21 @@ [% IF op == 'add_form' %] [% WRAPPER breadcrumb_item bc_active= 1 %] [% IF currency %] - Modify currency '[% currency.currency | html %]' + Modify currency '[% currency.currency | html %]' [% ELSE %] - New currency + New currency [% END %] [% END %] [% END %] [% IF op == 'delete_confirm' %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Confirm deletion of currency [% currency.currency | $HtmlTags tag='span' attributes=>'class="ex"' %] + Confirm deletion of currency [% currency.currency | $HtmlTags tag='span' attributes=>'class="ex"' %] [% END %] [% ELSIF op == 'list' %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Currencies + Currencies [% END %] [% END %] [% END #/ WRAPPER breadcrumbs %] 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 3c4a016e35..a91c46a7ba 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 @@ -41,7 +41,7 @@ [% ELSE %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Debit types + Debit types [% END %] [% END %] [% END #/ WRAPPER breadcrumbs %] 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 065d541ab2..fd78a11301 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt @@ -29,30 +29,30 @@ Administration [% END %] - [% IF op == 'add_form' %] + [% IF op == 'add_form' || op == 'delete_confirm' %] [% WRAPPER breadcrumb_item %] Desks [% END %] + [% ELSE %] + [% WRAPPER breadcrumb_item bc_active = 1 %] + Desks + [% END %] + [% END %] + + [% IF op == 'add_form' %] [% WRAPPER breadcrumb_item bc_active = 1 %] [% IF desk.desk_id %] - Modify desk + Modify desk [% ELSE %] - New desk + New desk [% END %] [% END %] [% ELSIF op == 'delete_confirm' %] - [% WRAPPER breadcrumb_item %] - Desks - [% END %] [% WRAPPER breadcrumb_item bc_active = 1 %] - Confirm deletion of desk + Confirm deletion of desk [% END %] - [% ELSE %] - [% WRAPPER breadcrumb_item bc_active = 1 %] - Desks - [% END %] [% 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 7897917b69..ae0b86856e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt @@ -38,7 +38,7 @@ Administration [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Did you mean? + 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 d355ee4257..cf86293452 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 @@ -27,31 +27,30 @@ EDI accounts › Administration › Koha Administration [% END %] - [% IF acct_form %] + [% IF acct_form || delete_confirm %] [% WRAPPER breadcrumb_item %] EDI accounts [% END %] + [% ELSE %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + EDI accounts + [% END %] + [% END %] + + [% IF acct_form %] [% IF account %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Modify account + Modify account [% END %] [% ELSE %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Add new account + Add new account [% END %] [% END %] [% ELSIF delete_confirm %] - [% WRAPPER breadcrumb_item %] - EDI accounts - [% END %] - [% WRAPPER breadcrumb_item bc_active= 1 %] - Confirm deletion of account - [% END %] - - [% ELSE %] [% WRAPPER breadcrumb_item bc_active= 1 %] - EDI accounts + Confirm deletion of account [% END %] [% END %] [% END #/ WRAPPER breadcrumbs %] -- 2.30.2