Bugzilla – Attachment 68347 Details for
Bug 19469
Add ability to split view of holds view on record by pickup library and/or itemtype
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19469 - Clean up template whitespace
Bug-19469---Clean-up-template-whitespace.patch (text/plain), 26.22 KB, created by
Alex Buckley
on 2017-10-21 06:44:58 UTC
(
hide
)
Description:
Bug 19469 - Clean up template whitespace
Filename:
MIME Type:
Creator:
Alex Buckley
Created:
2017-10-21 06:44:58 UTC
Size:
26.22 KB
patch
obsolete
>From 2de800acd68de0ae3ef1f219e76db6f1249d31fb Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Sat, 30 Sep 2017 08:03:30 -0400 >Subject: [PATCH] Bug 19469 - Clean up template whitespace > >Sponsored-by: Stockholm University Library > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> > >Passed QA test tool >Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz> >--- > .../prog/en/modules/reserve/request.tt | 402 +++++++++++---------- > 1 file changed, 205 insertions(+), 197 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >index 02c50b9..73a82f7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -688,207 +688,215 @@ function checkMultiHold() { > [% END %] > > [% UNLESS ( borrowernumber ) %] >-[% IF ( reserveloop ) %] >-<form name="T[% time %]" action="modrequest.pl" method="post"> >- [% IF ( multi_hold ) %] >- <input type = "hidden" name="multi_hold" value="1"/> >- <input type = "hidden" name="biblionumbers" value="[% biblionumbers %]"/> >- [% END %] >- >-<fieldset class="rows left"> >-<legend>Existing holds</legend> >- >-[% FOREACH biblioloo IN biblioloop %] >- >- [% IF ( biblioloo.reserveloop ) %] >- <table> >- [% IF ( multi_hold ) %] >- <caption><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber %]">[% biblioloo.title |html %]</a></caption> >- [% END %] >- <tr> >- [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %] >- <th>Priority</th> >- <th> </th> >- [% ELSE %] >- <th>Delete?</th> >- [% END %] >- <th>Patron</th> >- <th>Notes</th> >- <th>Date</th> >- <th>Expiration</th> >- <th>Pickup library</th> >- <th>Details</th> >- [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %] >- <th><img src="[% interface %]/[% theme %]/img/go-bottom.png" alt="Toggle set to lowest priority" /></th> >- [% END %] >- <th> </th> >- [% IF SuspendHoldsIntranet %]<th> </th><!-- Suspend Holds Column Header -->[% END %] >- </tr> >- [% FOREACH reserveloo IN biblioloo.reserveloop %] >- <tr> >- <td> >- <input type="hidden" name="reserve_id" value="[% reserveloo.reserve_id %]" /> >- <input type="hidden" name="borrowernumber" value="[% reserveloo.borrowernumber %]" /> >- <input type="hidden" name="biblionumber" value="[% reserveloo.biblionumber %]" /> >- <select name="rank-request"> >- [% IF ( reserveloo.found ) %] >- [% IF ( reserveloo.intransit ) %] >- <option value="T" selected="selected">In transit</option> >- [% ELSE %] >- <option value="W" selected="selected">Waiting</option> >- [% END %] >- [% END %] >- >- [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %] >- [% FOREACH optionloo IN reserveloo.optionloop %] >- [% IF ( optionloo.selected ) %] >- <option value="[% optionloo.num %]" selected="selected">[% optionloo.num %]</option> >- [% ELSE %] >- <option value="[% optionloo.num %]">[% optionloo.num %]</option> >- [% END %] >- [% END %] >- [% ELSIF !reserveloo.found %] >- <option value="[% reserveloo.priority %]" selected="selected">[% reserveloo.priority %]</option> >- [% END %] >- <option value="del">del</option> >- </select> >- </td> >- >- [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %] >- <td style="white-space:nowrap;"> >- <a title="Move hold up" href="request.pl?action=move&where=up&borrowernumber=[% reserveloo.borrowernumber %]&biblionumber=[% reserveloo.biblionumber %]&reserve_id=[% reserveloo.reserve_id %]&date=[% reserveloo.date %]"> >- <img src="[% interface %]/[% theme %]/img/go-up.png" alt="Go up" /> >- </a> >- >- <a title="Move hold to top" href="request.pl?action=move&where=top&borrowernumber=[% reserveloo.borrowernumber %]&biblionumber=[% reserveloo.biblionumber %]&reserve_id=[% reserveloo.reserve_id %]&date=[% reserveloo.date %]"> >- <img src="[% interface %]/[% theme %]/img/go-top.png" alt="Go top" /> >- </a> >- >- <a title="Move hold to bottom" href="request.pl?action=move&where=bottom&borrowernumber=[% reserveloo.borrowernumber %]&biblionumber=[% reserveloo.biblionumber %]&reserve_id=[% reserveloo.reserve_id %]&date=[% reserveloo.date %]"> >- <img src="[% interface %]/[% theme %]/img/go-bottom.png" alt="Go bottom" /> >- </a> >- >- <a title="Move hold down" href="request.pl?action=move&where=down&borrowernumber=[% reserveloo.borrowernumber %]&biblionumber=[% reserveloo.biblionumber %]&reserve_id=[% reserveloo.reserve_id %]&date=[% reserveloo.date %]"> >- <img src="[% interface %]/[% theme %]/img/go-down.png" alt="Go down" /> >- </a> >- </td> >- [% END %] >- >- <td> >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrowernumber %]" > >- [% IF ( reserveloo.hidename ) %] >- [% reserveloo.cardnumber (reserveloo.borrowernumber) %] >- [% ELSE %] >- [% reserveloo.firstname %] [% reserveloo.surname %] >- [% END %] >- </a> >- </td> >- <td>[% reserveloo.notes %]</td> >- <td>[% reserveloo.date %]</td> >- <td>[% reserveloo.expirationdate %]</td> >- <td> >- [% IF ( reserveloo.found ) %] >- [% IF ( reserveloo.atdestination ) %] >- [% IF ( reserveloo.found ) %] >- Item waiting at <b> [% reserveloo.wbrname %]</b> <input type="hidden" name="pickup" value="[% reserveloo.wbrcode %]" /> since [% reserveloo.waiting_date | $KohaDates %] >- [% ELSE %] >- Waiting to be pulled <input type="hidden" name="pickup" value="[% reserveloo.wbrcode %]" /> >- [% END %] >- [% ELSE %] >- Item being transferred to <b> [% reserveloo.wbrname %]</b> <input type="hidden" name="pickup" value="[% reserveloo.wbrcode %]" /> >- [% END %] >- [% ELSE %] >- [% IF Koha.Preference('IndependentBranches') && Branches.all().size == 1 %] >- [% Branches.GetName(reserveloo.branchcode) %] <input type="hidden" name="pickup" value="[% reserveloo.branchcode %]" /> >- [% ELSE %] >- <select name="pickup"> >- [% PROCESS options_for_libraries libraries => Branches.all( selected => reserveloo.branchcode ) %] >- </select> >- [% END %] >- [% END %] >- </td> >- <td> >- [% IF ( reserveloo.found ) %] >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% reserveloo.biblionumber %]"> >- [% IF ( reserveloo.barcodenumber ) %] >- [% reserveloo.barcodenumber %] >- <input type="hidden" name="itemnumber" value="[% reserveloo.itemnumber %]" /> >- [% ELSE %] >- No barcode >- [% END %] >- </a> >- [% ELSE %] >- [% IF ( reserveloo.item_level_hold ) %] >- <i>Only item >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% reserveloo.biblionumber %]"> >- [% IF ( reserveloo.barcodenumber ) %] >- [% reserveloo.barcodenumber %] >- <input type="hidden" name="itemnumber" value="[% reserveloo.itemnumber %]" /> >- [% ELSE %] >- No barcode >- [% END %] >- </a> >- </i> >- [% ELSE %] >- [% IF reserveloo.itemtype %] >- <i>Next available [% ItemTypes.GetDescription( reserveloo.itemtype ) %] item</i> >- [% ELSE %] >- <i>Next available</i> >- [% END %] >- <input type="hidden" name="itemnumber" value="" /> >+ [% IF ( reserveloop ) %] >+ <form name="T[% time %]" action="modrequest.pl" method="post"> >+ [% IF ( multi_hold ) %] >+ <input type = "hidden" name="multi_hold" value="1"/> >+ <input type = "hidden" name="biblionumbers" value="[% biblionumbers %]"/> > [% END %] >- [% END %] >- </td> >- >- [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %] >- <td> >- <a title="Toggle lowest priority" href="request.pl?action=setLowestPriority&borrowernumber=[% reserveloo.borrowernumber %]&biblionumber=[% reserveloo.biblionumber %]&reserve_id=[% reserveloo.reserve_id %]&date=[% reserveloo.date %]"> >- [% IF ( reserveloo.lowestPriority ) %] >- <img src="[% interface %]/[% theme %]/img/go-bottom.png" alt="Unset lowest priority" /> >- [% ELSE %] >- <img src="[% interface %]/[% theme %]/img/go-down.png" alt="Set to lowest priority" /> >- [% END %] >- </a> >- </td> >- [% END %] > >- <td> >- <a class="cancel-hold" title="Cancel hold" href="request.pl?action=cancel&borrowernumber=[% reserveloo.borrowernumber %]&biblionumber=[% reserveloo.biblionumber %]&reserve_id=[% reserveloo.reserve_id %]&date=[% reserveloo.date %]"> >- <img src="[% interface %]/[% theme %]/img/x.png" alt="Cancel" /> >- </a> >- </td> >- >- [% IF SuspendHoldsIntranet %] >- <td> >- [% UNLESS ( reserveloo.found ) %] >- <input type="button" value="[% IF ( reserveloo.suspend ) %]Unsuspend[% ELSE %]Suspend[% END %]" onclick="window.location.href='request.pl?action=toggleSuspend&reserve_id=[% reserveloo.reserve_id %]&borrowernumber=[% reserveloo.borrowernumber %]&biblionumber=[% reserveloo.biblionumber %]&date=[% reserveloo.date %]&suspend_until=' + $('#suspend_until_[% reserveloo.reserve_id %]').val()" /> >- >- [% IF AutoResumeSuspendedHolds %] >- <label for="suspend_until_[% reserveloo.reserve_id %]">[% IF ( reserveloo.suspend ) %] on [% ELSE %] until [% END %]</label> >- <input name="suspend_until" id="suspend_until_[% reserveloo.reserve_id %]" size="10" value="[% reserveloo.suspend_until | $KohaDates %]" class="datepicker suspend_until_datepicker" /> >- <a href='#' onclick="document.getElementById('suspend_until_[% reserveloo.reserve_id %]').value='';">Clear date</a> >- [% ELSE %] >- <input type="hidden" name="suspend_until" id="suspend_until_[% reserveloo.reserve_id %]" value=""/> >- [% END %] >- [% ELSE %] >- <input type="hidden" name="suspend_until" value="" /> >- [% END %] >- </td> >- [% END # IF SuspendHoldsIntranet %] >- >- </tr> >+ <fieldset class="rows left"> >+ <legend>Existing holds</legend> > >- [% END %] <!-- existing reserveloop --> >- </table> >- [% END %]<!-- /reserveloop --> >-[% END %]<!-- /biblioloop --> >+ [% FOREACH biblioloo IN biblioloop %] >+ [% IF ( biblioloo.reserveloop ) %] >+ <table> >+ [% IF ( multi_hold ) %] >+ <caption><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber %]">[% biblioloo.title |html %]</a></caption> >+ [% END %] > >-<fieldset class="action"> >- <input type="submit" name="submit" value="Update hold(s)" /> >-</fieldset> >-</fieldset> >-</form> >-[% END %] >+ <tr> >+ [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %] >+ <th>Priority</th> >+ <th> </th> >+ [% ELSE %] >+ <th>Delete?</th> >+ [% END %] >+ <th>Patron</th> >+ <th>Notes</th> >+ <th>Date</th> >+ <th>Expiration</th> >+ <th>Pickup library</th> >+ <th>Details</th> >+ [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %] >+ <th><img src="[% interface %]/[% theme %]/img/go-bottom.png" alt="Toggle set to lowest priority" /></th> >+ [% END %] >+ <th> </th> >+ [% IF SuspendHoldsIntranet %]<th> </th><!-- Suspend Holds Column Header -->[% END %] >+ </tr> >+ >+ [% FOREACH reserveloo IN biblioloo.reserveloop %] >+ <tr> >+ <td> >+ <input type="hidden" name="reserve_id" value="[% reserveloo.reserve_id %]" /> >+ <input type="hidden" name="borrowernumber" value="[% reserveloo.borrowernumber %]" /> >+ <input type="hidden" name="biblionumber" value="[% reserveloo.biblionumber %]" /> >+ <select name="rank-request"> >+ [% IF ( reserveloo.found ) %] >+ [% IF ( reserveloo.intransit ) %] >+ <option value="T" selected="selected">In transit</option> >+ [% ELSE %] >+ <option value="W" selected="selected">Waiting</option> >+ [% END %] >+ [% END %] >+ >+ [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %] >+ [% FOREACH optionloo IN reserveloo.optionloop %] >+ [% IF ( optionloo.selected ) %] >+ <option value="[% optionloo.num %]" selected="selected">[% optionloo.num %]</option> >+ [% ELSE %] >+ <option value="[% optionloo.num %]">[% optionloo.num %]</option> >+ [% END %] >+ [% END %] >+ [% ELSIF !reserveloo.found %] >+ <option value="[% reserveloo.priority %]" selected="selected">[% reserveloo.priority %]</option> >+ [% END %] >+ >+ <option value="del">del</option> >+ </select> >+ </td> >+ >+ [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %] >+ <td style="white-space:nowrap;"> >+ <a title="Move hold up" href="request.pl?action=move&where=up&borrowernumber=[% reserveloo.borrowernumber %]&biblionumber=[% reserveloo.biblionumber %]&reserve_id=[% reserveloo.reserve_id %]&date=[% reserveloo.date %]"> >+ <img src="[% interface %]/[% theme %]/img/go-up.png" alt="Go up" /> >+ </a> >+ >+ <a title="Move hold to top" href="request.pl?action=move&where=top&borrowernumber=[% reserveloo.borrowernumber %]&biblionumber=[% reserveloo.biblionumber %]&reserve_id=[% reserveloo.reserve_id %]&date=[% reserveloo.date %]"> >+ <img src="[% interface %]/[% theme %]/img/go-top.png" alt="Go top" /> >+ </a> >+ >+ <a title="Move hold to bottom" href="request.pl?action=move&where=bottom&borrowernumber=[% reserveloo.borrowernumber %]&biblionumber=[% reserveloo.biblionumber %]&reserve_id=[% reserveloo.reserve_id %]&date=[% reserveloo.date %]"> >+ <img src="[% interface %]/[% theme %]/img/go-bottom.png" alt="Go bottom" /> >+ </a> >+ >+ <a title="Move hold down" href="request.pl?action=move&where=down&borrowernumber=[% reserveloo.borrowernumber %]&biblionumber=[% reserveloo.biblionumber %]&reserve_id=[% reserveloo.reserve_id %]&date=[% reserveloo.date %]"> >+ <img src="[% interface %]/[% theme %]/img/go-down.png" alt="Go down" /> >+ </a> >+ </td> >+ [% END %] >+ >+ <td> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrowernumber %]" > >+ [% IF ( reserveloo.hidename ) %] >+ [% reserveloo.cardnumber (reserveloo.borrowernumber) %] >+ [% ELSE %] >+ [% reserveloo.firstname %] [% reserveloo.surname %] >+ [% END %] >+ </a> >+ </td> >+ >+ <td>[% reserveloo.notes %]</td> >+ <td>[% reserveloo.date %]</td> >+ <td>[% reserveloo.expirationdate %]</td> >+ >+ <td> >+ [% IF ( reserveloo.found ) %] >+ [% IF ( reserveloo.atdestination ) %] >+ [% IF ( reserveloo.found ) %] >+ Item waiting at <b> [% reserveloo.wbrname %]</b> <input type="hidden" name="pickup" value="[% reserveloo.wbrcode %]" /> since [% reserveloo.waiting_date | $KohaDates %] >+ [% ELSE %] >+ Waiting to be pulled <input type="hidden" name="pickup" value="[% reserveloo.wbrcode %]" /> >+ [% END %] >+ [% ELSE %] >+ Item being transferred to <b> [% reserveloo.wbrname %]</b> <input type="hidden" name="pickup" value="[% reserveloo.wbrcode %]" /> >+ [% END %] >+ [% ELSE %] >+ [% IF Koha.Preference('IndependentBranches') && Branches.all().size == 1 %] >+ [% Branches.GetName(reserveloo.branchcode) %] <input type="hidden" name="pickup" value="[% reserveloo.branchcode %]" /> >+ [% ELSE %] >+ <select name="pickup"> >+ [% PROCESS options_for_libraries libraries => Branches.all( selected => reserveloo.branchcode ) %] >+ </select> >+ [% END %] >+ [% END %] >+ </td> >+ >+ <td> >+ [% IF ( reserveloo.found ) %] >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% reserveloo.biblionumber %]"> >+ [% IF ( reserveloo.barcodenumber ) %] >+ [% reserveloo.barcodenumber %] >+ <input type="hidden" name="itemnumber" value="[% reserveloo.itemnumber %]" /> >+ [% ELSE %] >+ No barcode >+ [% END %] >+ </a> >+ [% ELSE %] >+ [% IF ( reserveloo.item_level_hold ) %] >+ <i> >+ Only item >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% reserveloo.biblionumber %]"> >+ [% IF ( reserveloo.barcodenumber ) %] >+ [% reserveloo.barcodenumber %] >+ <input type="hidden" name="itemnumber" value="[% reserveloo.itemnumber %]" /> >+ [% ELSE %] >+ No barcode >+ [% END %] >+ </a> >+ </i> >+ [% ELSE %] >+ [% IF reserveloo.itemtype %] >+ <i>Next available [% ItemTypes.GetDescription( reserveloo.itemtype ) %] item</i> >+ [% ELSE %] >+ <i>Next available</i> >+ [% END %] >+ >+ <input type="hidden" name="itemnumber" value="" /> >+ [% END %] >+ [% END %] >+ </td> >+ >+ [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %] >+ <td> >+ <a title="Toggle lowest priority" href="request.pl?action=setLowestPriority&borrowernumber=[% reserveloo.borrowernumber %]&biblionumber=[% reserveloo.biblionumber %]&reserve_id=[% reserveloo.reserve_id %]&date=[% reserveloo.date %]"> >+ [% IF ( reserveloo.lowestPriority ) %] >+ <img src="[% interface %]/[% theme %]/img/go-bottom.png" alt="Unset lowest priority" /> >+ [% ELSE %] >+ <img src="[% interface %]/[% theme %]/img/go-down.png" alt="Set to lowest priority" /> >+ [% END %] >+ </a> >+ </td> >+ [% END %] >+ >+ <td> >+ <a class="cancel-hold" title="Cancel hold" href="request.pl?action=cancel&borrowernumber=[% reserveloo.borrowernumber %]&biblionumber=[% reserveloo.biblionumber %]&reserve_id=[% reserveloo.reserve_id %]&date=[% reserveloo.date %]"> >+ <img src="[% interface %]/[% theme %]/img/x.png" alt="Cancel" /> >+ </a> >+ </td> >+ >+ [% IF SuspendHoldsIntranet %] >+ <td> >+ [% UNLESS ( reserveloo.found ) %] >+ <input type="button" value="[% IF ( reserveloo.suspend ) %]Unsuspend[% ELSE %]Suspend[% END %]" onclick="window.location.href='request.pl?action=toggleSuspend&reserve_id=[% reserveloo.reserve_id %]&borrowernumber=[% reserveloo.borrowernumber %]&biblionumber=[% reserveloo.biblionumber %]&date=[% reserveloo.date %]&suspend_until=' + $('#suspend_until_[% reserveloo.reserve_id %]').val()" /> >+ >+ [% IF AutoResumeSuspendedHolds %] >+ <label for="suspend_until_[% reserveloo.reserve_id %]">[% IF ( reserveloo.suspend ) %] on [% ELSE %] until [% END %]</label> >+ <input name="suspend_until" id="suspend_until_[% reserveloo.reserve_id %]" size="10" value="[% reserveloo.suspend_until | $KohaDates %]" class="datepicker suspend_until_datepicker" /> >+ <a href='#' onclick="document.getElementById('suspend_until_[% reserveloo.reserve_id %]').value='';">Clear date</a> >+ [% ELSE %] >+ <input type="hidden" name="suspend_until" id="suspend_until_[% reserveloo.reserve_id %]" value=""/> >+ [% END %] >+ >+ [% ELSE %] >+ <input type="hidden" name="suspend_until" value="" /> >+ [% END %] >+ </td> >+ [% END # IF SuspendHoldsIntranet %] >+ >+ </tr> >+ >+ [% END %] <!-- existing reserveloop --> >+ </table> >+ [% END %]<!-- /reserveloop --> >+ [% END %]<!-- /biblioloop --> >+ >+ <fieldset class="action"> >+ <input type="submit" name="submit" value="Update hold(s)" /> >+ </fieldset> >+ </fieldset> >+ </form> >+ [% END %] > [% END %] > </div> > </div> >-- >2.1.4
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=68347">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 19469
:
68166
|
68167
|
68168
|
68169
|
68347
|
68348
|
68609
|
72304
|
72305
|
72441
|
72442
|
72443
|
72501
|
74260
|
74328
|
74329
|
74330
|
74331
|
74332
|
74333
|
74334
|
74909
|
78506
|
78507
|
78508
|
78509
|
78510
|
78511
|
78512
|
78513
|
78526
|
78529
|
78707
|
81828
|
81829