From a3a9761ca891b00473731ef4ca9c3677a42c7fe4 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 24 Apr 2023 11:21:42 +0000 Subject: [PATCH] Bug 33598: Use template wrapper for breadcrumbs: Tools, part 5 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 -> - Pages -> - View a page in the staff interface - Upload patron images - Upload results - Quote editor - Quotes upload - OPAC problem reports (must have OPACReportProblem enabled) Signed-off-by: Barbara Johnson Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 18137030ffe5d2187121e311a4394ff2f1a6e94e) Signed-off-by: Martin Renvoize --- .../prog/en/modules/tools/page.tt | 30 ++++++++------- .../prog/en/modules/tools/picture-upload.tt | 37 +++++++------------ .../prog/en/modules/tools/problem-reports.tt | 23 ++++-------- .../prog/en/modules/tools/quotes-upload.tt | 27 +++++--------- .../prog/en/modules/tools/quotes.tt | 26 +++++-------- 5 files changed, 57 insertions(+), 86 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/page.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/page.tt index 93d5d7d2eb..634ce415a4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/page.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/page.tt @@ -7,22 +7,24 @@ - [% INCLUDE 'header.inc' %] +[% WRAPPER 'header.inc' %] [% INCLUDE 'cat-search.inc' %] +[% END %] - +[% WRAPPER 'sub-header.inc' %] + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item %] + Tools + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + [% IF page %] + [% page.title | html %] + [% ELSE %] + Page error + [% END %] + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt index 8533d932ee..91d7264f02 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt @@ -13,33 +13,24 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Upload patron images + [% END %] + [% END # /IF TOTAL %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %] [% INCLUDE 'blocking_errors.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt index 25577c63df..10947347ac 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt @@ -15,22 +15,15 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + OPAC problem reports + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt index 8a49b0acc9..6beffac461 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt @@ -14,25 +14,18 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Quote uploader + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt index b96a596ecd..160ed40ef7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt @@ -1,6 +1,5 @@ [% USE raw %] [% USE Asset %] -[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Quote editor › Tools › Koha @@ -14,22 +13,15 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Quote editor + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
@@ -105,7 +97,7 @@ [% END %] [% IF op == 'list' %] -

[% tp('citations', 'Quotes') | html %]

+

Quotes

[% IF quotes_count > 0 %]
-- 2.39.5