From b9e0c7ecad6996c0ce1ab7650c8196eb59ec1faa Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 6 Jan 2023 11:50:00 +0000 Subject: [PATCH] Bug 33005: Use template wrapper for breadcrumbs: Acquisitions part 3 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 -> -> All available funds table -> Ordered -> Spent -> Vendor -> Vendor details -> Uncertain prices -> Receive shipments (must have at least one open basket) -> If necessary, receive a new shipment. Or click an invoice number to reach the "receive orders" page. -> Click "Receive" in the table listing baskets. -> Basket -> Add to basket -> From a suggestion -> From an external source Signed-off-by: Andrew Auld --- .../en/modules/acqui/newordersuggestion.tt | 31 +++++-------- .../prog/en/modules/acqui/ordered.tt | 24 ++++------ .../prog/en/modules/acqui/orderreceive.tt | 31 +++++-------- .../prog/en/modules/acqui/parcel.tt | 28 +++++------- .../prog/en/modules/acqui/parcels.tt | 27 +++++------ .../prog/en/modules/acqui/spent.tt | 24 ++++------ .../prog/en/modules/acqui/supplier.tt | 45 +++++++------------ .../prog/en/modules/acqui/uncertainprice.tt | 33 +++++--------- .../prog/en/modules/acqui/z3950_search.tt | 45 ++++++++----------- 9 files changed, 108 insertions(+), 180 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt index 3b1cc6e5f9..6dfaadc510 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt @@ -15,28 +15,21 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Add order from a suggestion + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt index a324b42db7..ade84344d5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt @@ -15,24 +15,16 @@ [% INCLUDE 'acquisitions-search.inc' %] [% END %] - [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Ordered - [% fund_code | html %] + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt index 5315d99ead..80136acb7b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -18,27 +18,20 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Receive items from : [% name | html %] [% IF ( invoice ) %] + [[% invoice | html %]] + [% END %] (order #[% order.ordernumber | html %]) + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt index ebda2f0014..268c309a04 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -23,33 +23,27 @@ [% 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/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt index 06271286d6..f0a6e0356b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt @@ -13,25 +13,18 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Receive shipment from vendor [% name | html %] + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt index 3e9b043603..9c64849bc6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt @@ -15,24 +15,16 @@ [% INCLUDE 'acquisitions-search.inc' %] [% END %] - [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Spent - [% fund_code | html %] + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt index 9dd49954e9..6b98eb307b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt @@ -100,41 +100,30 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + [% name | html %] + [% END %] + [% END # /IF (enter) %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt index 64d7076fce..fc8ce39773 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt @@ -14,33 +14,24 @@ [% 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/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt index 774e452fdd..94e068518e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt @@ -45,39 +45,30 @@ tr.selected td { [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Search results + [% END %] + [% END # /IF opsearch %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
[% IF ( opsearch ) %] -- 2.30.2