From 0d2d32e6116bcfc5c5808f20ed98603b03831005 Mon Sep 17 00:00:00 2001 From: Owen Leonard <oleonard@myacpl.org> Date: Fri, 29 Jun 2018 12:50:01 +0000 Subject: [PATCH] Bug 20959: (follow-up) Prevent checkin button from wrapping This follow-up wraps the checkin form in a div to prevent the button from wrapping to the line below the input. To test, apply the patch and clear your browser cache if necessary. View the checkin page to confirm that there isn't a layout problem. --- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 28 ++++++++++++---------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index 127f555..1220687 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -602,19 +602,21 @@ <div class="row"> <div class="col-sm-6"> <div class="hint">Enter item barcode:</div> - [% IF ( exemptfine ) %] - <input name="barcode" id="barcode" size="14" class="barcode focus input-warning" /> - [% ELSIF ( dropboxmode ) %] - <input name="barcode" id="barcode" size="14" class="barcode focus input-warning" /> - [% ELSE %] - <input name="barcode" id="barcode" size="14" class="barcode focus" /> - [% END %] - <button type="submit" class="btn btn-default">Check in</button> - [% FOREACH inputloo IN inputloop %] - <input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" /> - <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" /> - <input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" /> - [% END %] + <div class="form-control-group"> + [% IF ( exemptfine ) %] + <input name="barcode" id="barcode" size="14" class="barcode focus input-warning" /> + [% ELSIF ( dropboxmode ) %] + <input name="barcode" id="barcode" size="14" class="barcode focus input-warning" /> + [% ELSE %] + <input name="barcode" id="barcode" size="14" class="barcode focus" /> + [% END %] + <button type="submit" class="btn btn-default">Check in</button> + [% FOREACH inputloo IN inputloop %] + <input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" /> + <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" /> + <input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" /> + [% END %] + </div> <div id="show-circ-settings"> <a href="#"><i class="fa circ-settings-icon fa-caret-down"></i> Checkin settings</a> </div> -- 2.1.4