Bugzilla – Attachment 159779 Details for
Bug 35360
Inconsistent use/look of 'Cancel hold(s)' button on circ/waitingreserves.pl
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 35360: Make HTML/buttons consistent on waitingreserves.tt
Bug-35360-Make-HTMLbuttons-consistent-on-waitingre.patch (text/plain), 5.26 KB, created by
Lucas Gass (lukeg)
on 2023-12-12 22:53:08 UTC
(
hide
)
Description:
Bug 35360: Make HTML/buttons consistent on waitingreserves.tt
Filename:
MIME Type:
Creator:
Lucas Gass (lukeg)
Created:
2023-12-12 22:53:08 UTC
Size:
5.26 KB
patch
obsolete
>From 1a4721e26d46a900a782b2720a9e93fc364136e2 Mon Sep 17 00:00:00 2001 >From: Lucas Gass <lucas@bywatersolutions.com> >Date: Tue, 12 Dec 2023 22:48:22 +0000 >Subject: [PATCH] Bug 35360: Make HTML/buttons consistent on waitingreserves.tt > >To test: >1. Have some holds that are waiting, waiting over expiration date, and cancelled waiting holds. >2. Notice the differences between the 3 tables and their related buttons: >-Holds waiting >-Holds waiting past their expiration date >-Holds with cancellation requests > >-Holds waiting includes a 'Canceled selected' button at the top of the table. It is with in a #toolbar. > >-Holds waiting past their expiration date includes a 'Cancel selected' and a 'Cancel all' button. None are within a #toolbar. The 'Cancel selected' here lacks a Bootstrap .btn class. The 'Cancel all' button does have a .btn class. > >-Holds with cancellation requests has neither a 'Cancel selected' or a 'Cancel all' button. > >3. APPLY PATCH >4. Look again and the tables/buttons should be more consistent. >5. The 'Holds with cancellation requests: X' tab should now include a 'Cancel selected (X)' button. Make sure is works. >6. Turn on TransferWhenCancelAllWaitingHolds and make sure the hint displays well in the Holds over table. >--- > .../prog/en/modules/circ/waitingreserves.tt | 17 ++++++++++------- > 1 file changed, 10 insertions(+), 7 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 97e72730bf5..3d8f1929ed4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >@@ -110,7 +110,7 @@ > [% WRAPPER tab_panel tabname="holdswaiting" bt_active= 1 %] > [% IF ( reserveloop ) %] > <div id="toolbar" class="btn-toolbar"> >- <button class="btn btn-default cancel_selected_holds" data-bulk="true"></button> >+ <button class="btn cancel_selected_holds" data-bulk="true"></button> > </div> > [% INCLUDE waiting_holds.inc table_name='holdst' reserveloop=reserveloop tab='holdwaiting' %] > [% ELSE %] >@@ -120,8 +120,8 @@ > > [% WRAPPER tab_panel tabname="holdsover" %] > [% IF ( overloop ) %] >- <span id="holdsover-cancel-all"> >- <button class="cancel_selected_holds" data-bulk="true"></button> >+ <div id="toolbar" class="btn-toolbar"> >+ <button class="btn cancel_selected_holds" data-bulk="true"></button> > <form name="cancelAllReserve" action="waitingreserves.pl" method="post"> > <input type="hidden" name="cancelall" value="1" /> > <input type="hidden" name="allbranches" value="[% allbranches | html %]" /> >@@ -132,10 +132,10 @@ > <input type="submit" class="btn btn-primary" value="Cancel all" /> > [% END %] > </form> >- [% UNLESS TransferWhenCancelAllWaitingHolds %] >- Only items that need not be transferred will be cancelled (TransferWhenCancelAllWaitingHolds syspref) >- [% END %] >- </span> >+ </div> >+ [% UNLESS TransferWhenCancelAllWaitingHolds %] >+ <div class="hint">Only items that need not be transferred will be cancelled (TransferWhenCancelAllWaitingHolds syspref)</div> >+ [% END %] > [% INCLUDE waiting_holds.inc table_name='holdso' reserveloop=overloop tab='holdsover' %] > [% ELSE %] > <div class="dialog message">No holds found.</div> >@@ -144,6 +144,9 @@ > > [% WRAPPER tab_panel tabname="holdscancelled" %] > [% IF cancel_reqs_count %] >+ <div id="toolbar" class="btn-toolbar"> >+ <button class="btn cancel_selected_holds" data-bulk="true"></button> >+ </div> > [% INCLUDE waiting_holds.inc select_column='1' table_name='holdscr' reserveloop=cancel_reqs tab='holdscr' %] > [% ELSE %] > <div class="dialog message">No holds found.</div> >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 35360
:
159779
|
159833
|
159945
|
160010
|
161205