From d2088fe0e034ddde94c0f34fbe17d6af34f56eea Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 16 Dec 2022 11:48:54 +0000 Subject: [PATCH] Bug 32482: Reindent holds awaiting pickup template This patch reindents the holds awaiting pickup template so that it has consistent indentation. This patch also corrects a markup error that was causing a layout issue. Incorrectly closed
s caused the circulation sidebar menu to disappear. To test, apply the patch and test all aspects of the page, including: - Correctly functioning tabs and DataTables - Cancel selected holds waiting - Cancel selected holds waiting past ReservesMaxPickUpDelay - Cancel all holds waiting past ReservesMaxPickUpDelay - Cancel individual holds with cancellation requests (Cancellations of waiting holds via the OPAC. See "Default waiting hold cancellation policy" in Circulation and Fine rules). Signed-off-by: David Nind Signed-off-by: Katrin Fischer --- .../prog/en/modules/circ/waitingreserves.tt | 240 +++++++++--------- 1 file changed, 121 insertions(+), 119 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt index 6f628e3957..e8d2e551f7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt @@ -38,129 +38,131 @@
- [% IF Koha.Preference('CircSidebar') %] -
- [% ELSE %] -
- [% END %] - -

Holds awaiting pickup for your library on: [% show_date | $KohaDates %]

-

- [% IF ( all_branches_link ) %] - - View all libraries - [% END %] -

- [% IF reject_result_error %] -
- [% IF reject_result_error.invalid_status %] -

There was a problem rejecting the cancellation request. Cannot reject an already completed cancellation request.

- [% ELSE %] -

Some error occurred while rejecting the cancellation request. Please check the logs

- [% END %] -
- [% END %] - [% IF ( cancel_result ) %] - [% FOREACH cancel_result %] - [% IF ( messagetransfert ) %] -
-

This item is on hold for pick-up at [% Branches.GetName( branchname ) | html %]

-

[% nextreservtitle | html %] is on hold for [% nextreservsurname | html %], [% nextreservfirstname | html %]. - Please retain this item and check it in to process the hold. -

-
- -
-
- [% END %] - [% IF ( waiting ) %] -
-

This item is on hold for pick-up at your library

-

[% nextreservtitle | html %] is on hold for [% nextreservsurname | html %], [% nextreservfirstname | html %]. - Please retain this item and check it in to process the hold. -

-
- -
-
- [% END %] - [% END %] - [% ELSE %] - [% IF enqueued %] -
-

The job has been enqueued! It will be processed as soon as possible.

-

View detail of the enqueued job

-
- [% END %] -
- -
-
- [% IF ( reserveloop ) %] -
- -
- [% INCLUDE waiting_holds.inc table_name='holdst' reserveloop=reserveloop tab='holdwaiting' %] - [% ELSE %] -
No holds found.
- [% END %] -
-
- [% IF ( ReservesMaxPickUpDelay ) %]

Holds listed here have been awaiting pickup for more than [% ReservesMaxPickUpDelay | html %] days.

[% END %] - [% IF ( overloop ) %] - - -
- - - - [% IF TransferWhenCancelAllWaitingHolds %] - - [% ELSE %] - - [% END %] -
- [% UNLESS TransferWhenCancelAllWaitingHolds %] - Only items that need not be transferred will be cancelled (TransferWhenCancelAllWaitingHolds syspref) - [% END %] + [% IF Koha.Preference('CircSidebar') %] +
+ [% ELSE %] +
+ [% END %] - - [% INCLUDE waiting_holds.inc table_name='holdso' reserveloop=overloop tab='holdsover' %] - [% ELSE %] -
No holds found.
- [% END %] -
-
- [% IF cancel_reqs_count %] - [% INCLUDE waiting_holds.inc select_column='1' table_name='holdscr' reserveloop=cancel_reqs tab='holdscr' %] - [% ELSE %] -
No holds found.
- [% END %] -
-
- [% END %] +

Holds awaiting pickup for your library on: [% show_date | $KohaDates %]

+

+ [% IF ( all_branches_link ) %] + + View all libraries + [% END %] +

+ [% IF reject_result_error %] +
+ [% IF reject_result_error.invalid_status %] +

There was a problem rejecting the cancellation request. Cannot reject an already completed cancellation request.

+ [% ELSE %] +

Some error occurred while rejecting the cancellation request. Please check the logs

+ [% END %] +
+ [% END %] + [% IF ( cancel_result ) %] + [% FOREACH cancel_result %] + [% IF ( messagetransfert ) %] +
+

This item is on hold for pick-up at [% Branches.GetName( branchname ) | html %]

+

[% nextreservtitle | html %] is on hold for [% nextreservsurname | html %], [% nextreservfirstname | html %]. + Please retain this item and check it in to process the hold. +

+
+ +
+
+ [% END %] + [% IF ( waiting ) %] +
+

This item is on hold for pick-up at your library

+

[% nextreservtitle | html %] is on hold for [% nextreservsurname | html %], [% nextreservfirstname | html %]. + Please retain this item and check it in to process the hold. +

+
+ +
+
+ [% END %] + [% END %] + [% ELSE %] + [% IF enqueued %] +
+

The job has been enqueued! It will be processed as soon as possible.

+

View detail of the enqueued job

+
+ [% END %] +
+ +
+
+ [% IF ( reserveloop ) %] +
+ +
+ [% INCLUDE waiting_holds.inc table_name='holdst' reserveloop=reserveloop tab='holdwaiting' %] + [% ELSE %] +
No holds found.
+ [% END %] +
+
+ [% IF ( ReservesMaxPickUpDelay ) %] +

Holds listed here have been awaiting pickup for more than [% ReservesMaxPickUpDelay | html %] days.

+ [% END %] + [% IF ( overloop ) %] + + +
+ + + + [% IF TransferWhenCancelAllWaitingHolds %] + + [% ELSE %] + + [% END %] +
+ [% UNLESS TransferWhenCancelAllWaitingHolds %] + Only items that need not be transferred will be cancelled (TransferWhenCancelAllWaitingHolds syspref) + [% END %] + + [% INCLUDE waiting_holds.inc table_name='holdso' reserveloop=overloop tab='holdsover' %] + [% ELSE %] +
No holds found.
+ [% END %] +
+
+ [% IF cancel_reqs_count %] + [% INCLUDE waiting_holds.inc select_column='1' table_name='holdscr' reserveloop=cancel_reqs tab='holdscr' %] + [% ELSE %] +
No holds found.
+ [% END %] +
+
+
+ [% END %] +
[% IF Koha.Preference('CircSidebar') %] -
-
- -
-
+
+ +
[% END %] +
-- 2.30.2