From 746d70c6ef88f981d05ddb54f49ed769e35c12a5 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 24 Apr 2023 11:22:32 +0000 Subject: [PATCH] Bug 33601: Use template wrapper for breadcrumbs: Tools, part 8 This patch updates several templates in the tools directory 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. - Tools -> - Tools home page - Log viewer - Search result - Uploads - Upload results - Cataloging -> - Upload local cover image - Upload result - Test uploading an biblio-level image from the bibliographic detail page - Test uploading an item-level image from the bibliograhpic detail page's holdings table Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 2553dcef237877625643d8f1fd74bf1d8f30056d) Signed-off-by: Matt Blenkinsop --- .../prog/en/modules/tools/tools-home.tt | 20 ++---- .../prog/en/modules/tools/upload-images.tt | 65 +++++++------------ .../prog/en/modules/tools/upload.tt | 52 +++++++-------- .../prog/en/modules/tools/viewlog.tt | 35 ++++------ 4 files changed, 67 insertions(+), 105 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt index 73508b2c64..c2638ace0b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt @@ -1,3 +1,4 @@ +[% USE raw %] [% USE Koha %] [% USE Branches %] [% USE Registers %] @@ -12,19 +13,12 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Tools + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt index 0faecc1c4b..c66a23a910 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt @@ -82,59 +82,44 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt index 8f4952148f..b0a2902bdb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt @@ -21,33 +21,6 @@ [% END %] [% END %] -[% BLOCK breadcrumbs %] - [% WRAPPER 'sub-header.inc' %] - - [% END %] -[% END %] - [% BLOCK form_new %]

[% PROCESS plugin_pars %] @@ -268,9 +241,28 @@

[% ELSE %] - [% INCLUDE 'header.inc' %] - [% INCLUDE 'cat-search.inc' %] - [% PROCESS breadcrumbs %] + [% WRAPPER 'header.inc' %] + [% INCLUDE 'cat-search.inc' %] + [% END %] + [% WRAPPER 'sub-header.inc' %] + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item %] + Tools + [% END %] + [% WRAPPER breadcrumb_item %] + Upload + [% END %] + [% WRAPPER breadcrumb_item %] + + [% IF mode=='new' || mode =='deleted'%] + Add new upload or search + [% ELSE %] + Results + [% END %] + + [% END %] + [% END #/ WRAPPER breadcrumbs %] + [% END #/ WRAPPER sub-header.inc %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt index 76281191b4..e29b712517 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt @@ -167,33 +167,24 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]

-- 2.39.5