From 6101d7b13fcece3e26e996a4bffc76c0f5b41ba0 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 1 Mar 2023 20:06:31 +0000 Subject: [PATCH] Bug 33130: Use template wrapper for breadcrumbs: Authorities 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. - Authorities home page - Authority search results - Authority detail - Authority add/edit - Authority merge Signed-off-by: Phil Ringnalda Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 61114e032f74a6b688fed2ff49a6140dbeefff75) Signed-off-by: Jacob O'Mara --- .../modules/authorities/authorities-home.tt | 18 +++----- .../en/modules/authorities/authorities.tt | 43 ++++++++----------- .../prog/en/modules/authorities/detail.tt | 33 ++++++-------- .../prog/en/modules/authorities/merge.tt | 23 ++++------ .../modules/authorities/searchresultlist.tt | 23 ++++------ 5 files changed, 52 insertions(+), 88 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt index 0898c00299..9703ee9ecd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt @@ -1,3 +1,4 @@ +[% USE raw %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Authorities › Koha @@ -10,18 +11,11 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Authorities + [% END %] + [% END %] [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt index 947821c647..d91904c5e4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt @@ -252,34 +252,25 @@ [% INCLUDE 'header.inc' %] - [% WRAPPER 'sub-header.inc' %] - - [% END %] + + [% ELSE %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Adding authority [% authtypetext | html %] + [% END %] + + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt index f5b5861321..b4a53ea58e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt @@ -23,27 +23,20 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + + [% WRAPPER breadcrumb_item bc_active= 1 %] + [% IF ( unknownauthid ) %] + Unknown authority record + [% ELSE %] + Details for authority #[% authid | html %] ([% authtypetext | html %]) + [% END %] + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt index 1389e676c8..d2fb80baff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt @@ -18,22 +18,15 @@ div#result { margin-top: 1em; } [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Merging records + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt index ab8c19b986..42826d7928 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt @@ -24,22 +24,15 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Authority search results + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
-- 2.39.5