From f1ae055b184f5f78ecc74266d703874258031589 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 5 Jan 2023 18:40:06 +0000 Subject: [PATCH] Bug 33000: Use template wrapper for breadcrumbs: Acquisitions part 1 This patch updates several acquisitions-related 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. - Acquisitions home - Vendor search results - Basket details - Cancel order - Create EDIFACT order - Basket edit - Basket deletion confirmation - Add to basket - From a staged MARC file - From existing orders (copy) - Basket groups (create, edit) - EDIFACT messages Signed-off-by: Lucas Gass Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 3e3b27f87dc5c7be117f117113a75de0dad7fef6) Signed-off-by: Matt Blenkinsop --- .../prog/en/modules/acqui/acqui-home.tt | 15 ++---- .../prog/en/modules/acqui/addorderiso2709.tt | 29 +++++----- .../prog/en/modules/acqui/basket.tt | 53 ++++++++---------- .../prog/en/modules/acqui/basketgroup.tt | 54 ++++++++----------- .../prog/en/modules/acqui/basketheader.tt | 35 +++++------- .../prog/en/modules/acqui/booksellers.tt | 24 ++++----- .../prog/en/modules/acqui/cancelorder.tt | 29 +++++----- .../prog/en/modules/acqui/duplicate_orders.tt | 37 ++++++------- .../prog/en/modules/acqui/edi_ean.tt | 22 ++++---- .../prog/en/modules/acqui/edifactmsgs.tt | 22 ++++---- .../prog/en/modules/acqui/edimsg.tt | 24 ++++----- 11 files changed, 138 insertions(+), 206 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt index 3c7fbe92c9..a3b08063c6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -16,16 +16,11 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Acquisitions + [% END %] + [% END #/ WRAPPER breadcrumbs %] [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt index 1337f402b0..c1a4ce080a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -32,26 +32,21 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - - [% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Add orders from MARC file + [% END %] + [% END #/ WRAPPER breadcrumbs %] + [% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index 99f92d2f5f..12a910fc8b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -36,36 +36,29 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item %] + Acquisitions + [% END %] + [% WRAPPER breadcrumb_item %] + [% booksellername | html %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + [% UNLESS ( basketno ) %] + [% IF ( delete_confirmed ) %] + Deleted + [% ELSE %] + New + [% END %] + [% END %] + Basket [% basketname | html %] + [% IF ( basketno ) %] + ([% basketno | html %]) + [% END %] + for [% booksellername | html %] + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt index afca3199fb..7c9739063e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt @@ -99,42 +99,30 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] - + [% END %] + [% END # /IF grouping %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt index 01d7742b14..928c313c56 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt @@ -20,35 +20,26 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt index 1d808d8701..d3539629ef 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -1,3 +1,4 @@ + [% PROCESS 'i18n.inc' %] [% USE raw %] [% USE Asset %] @@ -20,22 +21,15 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Search for vendor [% supplier | html %] + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt index b97f64ecf3..e0138d0f10 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt @@ -1,3 +1,4 @@ +[% USE raw %] [% INCLUDE 'doc-head-open.inc' %] Cancel order › Acquisition › Koha [% INCLUDE 'doc-head-close.inc' %] @@ -7,25 +8,21 @@ [% INCLUDE 'header.inc' %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Cancel order + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt index 95861eefe6..e065d4c42a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt @@ -23,30 +23,23 @@ Acquisitions › Koha [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% END # /UNLESS blocking_error %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt index f12c8fbd04..58cef5c881 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt @@ -1,3 +1,4 @@ +[% USE raw %] [% INCLUDE 'doc-head-open.inc' %] Basket ([% basketno | html %]) › Acquisitions › Koha [% INCLUDE 'doc-head-close.inc' %] @@ -9,20 +10,15 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Basket ([% basketno | html %]) + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt index c53ed2133d..5276981a1f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt @@ -14,21 +14,17 @@ [% WRAPPER 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] [% END %] + [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + EDIFACT messages + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt index 7bef5d8c54..b139930adc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt @@ -1,4 +1,4 @@ - +[% USE raw %] [% INCLUDE 'doc-head-open.inc' %] EDIFACT message display › Acquisitions › Koha [% INCLUDE 'doc-head-close.inc' %] @@ -8,22 +8,16 @@ [% INCLUDE 'acquisitions-search.inc' %] [% END %] - [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + EDIFACT messages + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
-- 2.39.5