Attachment 175063 Details for Bug 38347 – Bug 38347: Fix style of sidebar form submit button on bookings to collect page

[patch] Bug 38347: Fix style of sidebar form submit button on bookings to collect page

Bug-38347-Fix-style-of-sidebar-form-submit-button-.patch (text/plain), 8.36 KB, created by David Nind on 2024-12-02 23:13:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Nind

Created: 2024-12-02 23:13:11 UTC

Size: 8.36 KB

patch

obsolete

>From 4f60b09e04c2a0489f8721ff7ea5782e0d5770b3 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Mon, 2 Dec 2024 12:53:05 +0000
>Subject: [PATCH] Bug 38347: Fix style of sidebar form submit button on
> bookings to collect page
>
>This patch fixes the markup of the sidebar form on the bookings to
>collect page, and adds the correct "btn btn-primary" class to the submit
>button.
>
>NOTE: This patch contains indentation changes, so please ignore
>whitespace when viewing the diff.
>
>To test, apply the patch and go to Circulation -> Bookings to collect.
>
>In the sidebar form, confirm that the submit button has the same yellow
>"primary" style as other submit buttons, and that it fills the width of
>the sidebar.
>
>Sponsored-by: Athens County Public Libraries
>Signed-off-by: David Nind <david@davidnind.com>
>---
> .../prog/en/modules/circ/pendingbookings.tt   | 98 +++++++++----------
> 1 file changed, 48 insertions(+), 50 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingbookings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingbookings.tt
>index 593d7e190c..073ef57e68 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingbookings.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingbookings.tt
>@@ -52,59 +52,57 @@
>             
>             <div class="col-md-2 order-sm-2 order-md-1">
>                 <aside>
>-                    <div id="filters">
>-                        <form id="bookingsf">
>-                            <fieldset class="brief">
>-                                <h4>Refine results</h4>
>-                                <ol>
>-                                    <li>
>-                                        <label for="holding_library">Holding library:</label>
>-                                        <select name="holding_library" id="holding_library">
>-                                            [% SET libraries = Branches.all( only_from_group => 1 ) %]
>-                                            [% IF libraries.size != 1 %]
>-                                                <option value="">Any</option>
>+                    <form id="bookingsf">
>+                        <fieldset class="brief">
>+                            <h4>Refine results</h4>
>+                            <ol>
>+                                <li>
>+                                    <label for="holding_library">Holding library:</label>
>+                                    <select name="holding_library" id="holding_library">
>+                                        [% SET libraries = Branches.all( only_from_group => 1 ) %]
>+                                        [% IF libraries.size != 1 %]
>+                                            <option value="">Any</option>
>+                                        [% END %]
>+                                        [% FOREACH l IN libraries %]
>+                                            [% IF (l.branchcode == branchcode) %]
>+                                                <option value="[% l.branchcode | html %]" selected="selected">[% l.branchname | html %]</option>
>+                                            [% ELSE %]
>+                                                <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option>
>                                             [% END %]
>-                                            [% FOREACH l IN libraries %]
>-                                                [% IF (l.branchcode == branchcode) %]
>-                                                    <option value="[% l.branchcode | html %]" selected="selected">[% l.branchname | html %]</option>
>-                                                [% ELSE %]
>-                                                    <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option>
>-                                                [% END %]
>+                                        [% END %]
>+                                    </select>
>+                                </li>
>+                                <li>
>+                                    <label for="pickup_library">Pickup library:</label>
>+                                    <select name="pickup_library" id="pickup_library">
>+                                        [% SET libraries = Branches.all( only_from_group => 1 ) %]
>+                                        [% IF libraries.size != 1 %]
>+                                            <option value="">Any</option>
>+                                        [% END %]
>+                                        [% FOREACH l IN libraries %]
>+                                            [% IF (l.branchcode == branchcode) %]
>+                                                <option value="[% l.branchcode | html %]" selected="selected">[% l.branchname | html %]</option>
>+                                            [% ELSE %]
>+                                                <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option>
>                                             [% END %]
>-                                        </select>
>-                                    </li>
>-                                    <li>
>-                                        <label for="pickup_library">Pickup library:</label>
>-                                        <select name="pickup_library" id="pickup_library">
>-                                            [% SET libraries = Branches.all( only_from_group => 1 ) %]
>-                                            [% IF libraries.size != 1 %]
>-                                                <option value="">Any</option>
>-                                            [% END %]
>-                                            [% FOREACH l IN libraries %]
>-                                                [% IF (l.branchcode == branchcode) %]
>-                                                    <option value="[% l.branchcode | html %]" selected="selected">[% l.branchname | html %]</option>
>-                                                [% ELSE %]
>-                                                    <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option>
>-                                                [% END %]
>-                                            [% END %]
>-                                        </select>
>-                                    </li>
>-                                    <li>
>-                                        <label for="from">Starts after: </label>
>-                                        <input type="text" size="10" id="from" name="from" value="[% from | html %]" class="flatpickr" data-date_to="to"/>
>-                                    </li>
>-                                    <li>
>-                                        <label for="to">Starts before: </label>
>-                                        <input type="text" size="10" id="to" name="to" value="[% to | html %]" class="flatpickr"/>
>-                                    </li>
>-                                </ol>
>+                                        [% END %]
>+                                    </select>
>+                                </li>
>+                                <li>
>+                                    <label for="from">Starts after: </label>
>+                                    <input type="text" size="10" id="from" name="from" value="[% from | html %]" class="flatpickr" data-date_to="to"/>
>+                                </li>
>+                                <li>
>+                                    <label for="to">Starts before: </label>
>+                                    <input type="text" size="10" id="to" name="to" value="[% to | html %]" class="flatpickr"/>
>+                                </li>
>+                            </ol>
>+                        </fieldset>
>+                        <fieldset class="action">
>+                            <input type="submit" name="run_report" value="Submit" class="btn btn-primary" />
>+                        </fieldset>
>+                    </form>
> 
>-                                <fieldset class="action">
>-                                    <input type="submit" name="run_report" value="Submit" class="submit"/>
>-                                </fieldset>
>-                            </fieldset>
>-                        </form>
>-                    </div>
>                     [% INCLUDE 'circ-nav.inc' %]
>                 </aside>
>             </div>
>-- 
>2.39.5

Actions: View | Diff | Splinter Review

Attachments on bug 38347: 173928 | 175053 | 175063 | 175268