Bugzilla – Attachment 78734 Details for
Bug 20959
Style checkin form more like the checkout form, with collapsed settings panel
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20959: (follow-up) Prevent checkin button from wrapping
Bug-20959-follow-up-Prevent-checkin-button-from-wr.patch (text/plain), 3.67 KB, created by
Owen Leonard
on 2018-09-14 21:24:25 UTC
(
hide
)
Description:
Bug 20959: (follow-up) Prevent checkin button from wrapping
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2018-09-14 21:24:25 UTC
Size:
3.67 KB
patch
obsolete
>From 285d315372278d97c1f64447ed93e64d7d37ba80 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/css/src/staff-global.scss | 4 ++++ > .../intranet-tmpl/prog/en/modules/circ/returns.tt | 28 ++++++++++++---------- > 2 files changed, 19 insertions(+), 13 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >index 969d5a6..8add243 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >@@ -2621,6 +2621,10 @@ li { > } > } > >+.form-control-group { >+ white-space: nowrap; >+} >+ > .importing { > position: relative; > >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 a156b42..b5601d0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -611,19 +611,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
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 20959
:
76136
|
76137
|
76139
|
76526
|
76560
|
76561
|
78733
|
78734
|
78810
|
78812
|
78831
|
78839
|
78840
|
78841
|
79757
|
82995
|
82996
|
82997
|
83180
|
83772
|
86477
|
86729
|
87422
|
87933
|
87934
|
91081
|
91123
|
91164