From ad53b3b538d8763f2a22a76b826e13e893fe7b52 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 6 Jan 2023 15:44:55 +0000 Subject: [PATCH] Bug 33007: Use template wrapper for breadcrumbs: Administration part 2 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 -> - Authorized values - New category - View category - Add authorized value - Edit authorized value - Authority types - New authority type - Edit authority type - Confirm deletion of authority type - Manage jobs - Details of job - MARC bibliographic framework - New framework - Edit framework - Confirm deletion of framework - Library transfer limits - Libraries - New library - Edit library - Confirm deletion of library - Cash registers - New cash register - Edit cash register - Patron categories - New category - Edit category - Confirm deletion of category - MARC bibliographic framework test - Classification configuration - Modify classification source - Add classification source - Modify filing rule - Add filing rule - Modify splitting rule - Add splitting rule Signed-off-by: Andrew Auld Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- .../en/modules/admin/authorised_values.tt | 78 +++++++--------- .../prog/en/modules/admin/authtypes.tt | 59 ++++++------ .../prog/en/modules/admin/background_jobs.tt | 50 +++++------ .../prog/en/modules/admin/biblio_framework.tt | 55 +++++------- .../modules/admin/branch_transfer_limits.tt | 23 ++--- .../prog/en/modules/admin/branches.tt | 72 ++++++--------- .../prog/en/modules/admin/cash_registers.tt | 60 +++++-------- .../prog/en/modules/admin/categories.tt | 82 +++++++---------- .../prog/en/modules/admin/checkmarc.tt | 32 +++---- .../prog/en/modules/admin/classsources.tt | 89 ++++++++----------- 10 files changed, 235 insertions(+), 365 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt index 9a26c45a94..03a38104a8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt @@ -46,68 +46,50 @@ [% 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/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt index 5e7e18353a..6afbb9d8f1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt @@ -21,47 +21,38 @@ Authority 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/background_jobs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt index c482d0d74c..05bbb8ed85 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt @@ -21,36 +21,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/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt index ac75fff85a..0a709984e6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt @@ -21,53 +21,40 @@ MARC frameworks › 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/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt index aaa459d599..00f340f70a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt @@ -14,22 +14,15 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Set library checkin and transfer policy + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt index 218730f325..a6aa3fe5fd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -26,63 +26,45 @@ Libraries › 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/cash_registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt index f6ddab8b0d..00dfa35f4f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt @@ -23,52 +23,40 @@ Cash registers › 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/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt index 5f56479aec..b67341044a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt @@ -36,74 +36,52 @@ [% 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/checkmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt index 2ca6c01004..9c7ac05c9f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt @@ -12,27 +12,19 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + [% IF ( total ) %] + MARC check: [% total | html %] errors found + [% ELSE %] + MARC check: Configuration OK! + [% END %] + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt index cc25f25bdc..74dd4047ca 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt @@ -38,68 +38,51 @@ Classification sources › Administration › Koha [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
-- 2.39.5