Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 32482: Reindent holds awaiting pickup template

Browse source 
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 <div>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 <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Owen Leonard 2022-12-16 11:48:54 +00:00 committed by Tomas Cohen Arazi
parent 06ff7cfc20
commit 1e49a9fa85
Signed by: tomascohen
GPG key ID: 0A272EA1B2F3C15F
1 changed files with 121 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
View file

@ -118,7 +118,9 @@
[% END %]
</div>
<div role="tabpanel" class="tab-pane" id="holdsover">
[% IF ( ReservesMaxPickUpDelay ) %]<p>Holds listed here have been awaiting pickup for more than [% ReservesMaxPickUpDelay | html %] days.</p>[% END %]
[% IF ( ReservesMaxPickUpDelay ) %]
<p>Holds listed here have been awaiting pickup for more than [% ReservesMaxPickUpDelay | html %] days.</p>
[% END %]
[% IF ( overloop ) %]
<span id="holdsover-cancel-all">
<button class="cancel_selected_holds" data-bulk="true"></button>
@ -135,7 +137,6 @@
[% UNLESS TransferWhenCancelAllWaitingHolds %]
Only items that need not be transferred will be cancelled (TransferWhenCancelAllWaitingHolds syspref)
[% END %]
</span>
[% INCLUDE waiting_holds.inc table_name='holdso' reserveloop=overloop tab='holdsover' %]
[% ELSE %]
@ -150,17 +151,18 @@
[% END %]
</div>
</div>
</div>
[% END %]
</div> <!-- /.col-sm-10.col-sm-push-2 -->
[% IF Koha.Preference('CircSidebar') %]
</div> <!-- /.col-sm-10.col-sm-push-2 -->
<div class="col-sm-2 col-sm-pull-10">
<aside>
[% INCLUDE 'circ-nav.inc' %]
</aside>
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
</div> <!-- /.row -->
[% END %]
</div> <!-- /.row -->
</main>
</div> <!-- /.col-sm-12 -->