From f4d67cef65e3248e81a5cfb3458c981934b81619 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 18 Jun 2018 14:07:11 +0000 Subject: [PATCH] Bug 20959: Style checkin form more like the checkout form, with collapsed settings panel This patch modifies the structure of the checkin form so that settings (Specify return date, book drop mode, forgive overdue charges) are in a collapsed panel when inactive. The style of the barcode field and the mode notification messages has been changed to reduce the vertical motion of the form when selecting options. Some class names have been changed in circulation.tt and circulation.js to make them appropriate for use on both forms. To test, apply the patch and clear your browser cache if necessary. - View the checkin page. The "checkin settings" panel should be collapsed by default. - Confirm that the settings panel collapses and expands as it should. - Confirm that selecting "Forgive overdue charges" or "Book drop mode" trigger the display of the correct message and that the style of the barcode field is changed. - Confirm that after submitting a barcode for check-in, the settings panel stays open and your selected settings are still selected. --- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 35 ++-- .../prog/en/modules/circ/circulation.tt | 16 +- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 187 +++++++++++---------- .../intranet-tmpl/prog/js/pages/circulation.js | 28 +-- 4 files changed, 140 insertions(+), 126 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css index 57d3622..7bdff97 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css @@ -606,12 +606,7 @@ fieldset.brief ol, fieldset.brief li { .hint { color : #666; font-size : 95%; -} - -fieldset.brief div.hint, -fieldset.rows div.hint, -div.yui-u div.hint { - margin-bottom : .4em; + margin-bottom: .4em; } fieldset.rows div.hint { @@ -995,9 +990,9 @@ div.error { margin : 1em; } -input.alert { - background-color : #FFFF99; - border-color: #900; +.input-warning { + background-color : #FFFF99; + border-color: #900; } ol.bibliodetails { @@ -1065,21 +1060,21 @@ label.circ_barcode { font-weight : bold; } -.checkout-setting { +.circ-setting { font-size : 85%; padding-top : .3em; } -.checkout-setting label { +.circ-setting label { font-size : inherit; font-weight: normal; } -.checkout-setting input { +.circ-setting input { vertical-align: middle; } -.checkout-settings { +.circ-settings { background-color: #f4f8f9; border-radius: 0; border-top: 2px solid #b9d8d9; @@ -1090,10 +1085,18 @@ label.circ_barcode { padding: 1em 1em 0; } -#show-checkout-settings { +#show-circ-settings { margin-top: .5em; } +.checkin-active-setting { + background-color: #FFC; + border-radius: 3px; + margin: .5em; + padding: .5em; + box-shadow: 1px 1px 2px 0 rgba(102, 102, 102, .5); +} + tr.expired td { color : #999999; } @@ -3319,3 +3322,7 @@ span.name { margin: auto; margin-bottom: 2px; } + +.form-control-group { + white-space: nowrap; +} \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index a6e6ba0..d640c6e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -526,15 +526,15 @@ No patron matched [% message | html %] [% END %] -
- Checkout settings + -
+
[% UNLESS ( noissues && Koha.Preference('OnSiteCheckoutsForce') ) %] [% IF ( SpecifyDueDate ) %] -
+
Specify due date [% INCLUDE 'date-format.inc' %]:
[% IF ( duedatespec ) %] @@ -553,7 +553,7 @@ No patron matched [% message | html %] [% END %] [% UNLESS ( noissues ) %] -
+
[% IF NEEDSCONFIRMATION %] [% ELSE %] @@ -563,7 +563,7 @@ No patron matched [% message | html %]
[% IF Koha.Preference('decreaseLoanHighHolds') %] -
+
[% IF NEEDSCONFIRMATION %] [% IF override_high_holds %] @@ -583,7 +583,7 @@ No patron matched [% message | html %] [% END %] [% IF Koha.Preference('OnSiteCheckouts') %] -
+
[% IF noissues %]
@@ -596,7 +596,7 @@ No patron matched [% message | html %]
[% END %] -
+
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 051d66a..545c1b6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -537,91 +537,96 @@
[% END%] - - - +
-
-
-
-
- Check in - - [% IF ( exemptfine ) %] - - [% ELSIF ( dropboxmode ) %] - - [% ELSE %] - - [% END %] - + + +
+

Check in

+
+
+
Enter item barcode:
+
+ [% IF ( exemptfine ) %] + + [% ELSIF ( dropboxmode ) %] + + [% ELSE %] + + [% END %] + + [% FOREACH inputloo IN inputloop %] + + + + [% END %] +
+ +
+
+ + + +
+
+ +
[% IF Koha.Preference('SpecifyReturnDate') %]
Specify return date [% INCLUDE 'date-format.inc' %]:
- - [% IF ( return_date_override_remember ) %] [% ELSE %] [% END %] - - -
- [% END %] - [% FOREACH inputloo IN inputloop %] - - - + +
[% END %] - -
-
-
-
- Options - [% IF ( CAN_user_updatecharges_writeoff && overduecharges ) %] -

- [% IF ( exemptfine ) %] + [% IF ( CAN_user_updatecharges_writeoff && overduecharges ) %] +

+ [% IF ( exemptfine ) %] - [% ELSE %] + [% ELSE %] - [% END %] - -

- [% END %] -

- [% IF ( dropboxmode ) %] - - [% ELSE %] - - [% END %] - -

- [% IF Koha.Preference('ExpireReservesMaxPickUpDelayCharge') %] -

- [% IF ( forgivemanualholdsexpire ) %] + [% END %] + +

+ [% END %] + +
+ [% IF ( dropboxmode ) %] + + [% ELSE %] + + [% END %] + +
+ [% IF Koha.Preference('ExpireReservesMaxPickUpDelayCharge') %] +
+ [% IF ( forgivemanualholdsexpire ) %] - [% ELSE %] + [% ELSE %] - [% END %] - -

- [% END %] -
-
-
-
+ [% END %] + +
+ [% END %] + +
[%# /.circ-settings %] + [%# /#circ_returns_checkin %] + [%# /#checkin-form %] [% IF ( riloop ) %]

Checked-in items

@@ -692,13 +697,28 @@ [% INCLUDE 'columns_settings.inc' %] [% INCLUDE 'calendar.inc' %] [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") %] + [% Asset.js("js/pages/circulation.js") %] [% INCLUDE 'timepicker.inc' %] -