From a33fdb691e6788209a32e9b58391071c5078253d Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 14 Sep 2018 22:29:38 +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. Signed-off-by: Josef Moravec --- .../intranet-tmpl/prog/css/src/staff-global.scss | 28 +++- .../prog/en/modules/circ/circulation.tt | 16 +- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 178 +++++++++++---------- .../intranet-tmpl/prog/js/pages/circulation.js | 28 ++-- 4 files changed, 134 insertions(+), 116 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 2fc5b84..64ee5a9 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -483,11 +483,6 @@ input { } } - &.alert { - background-color: #FFFF99; - border-color: #900; - } - &.submit { @include default-button; @@ -506,6 +501,11 @@ input { } } +.input-warning { + background-color: #FFFF99; + border-color: #900; +} + label, .label { color: #000; @@ -1909,7 +1909,7 @@ i { } } -.checkout-setting { +.circ-setting { font-size: 85%; padding-top: .3em; @@ -1923,7 +1923,7 @@ i { } } -.checkout-settings { +.circ-settings { background-color: #F4F8F9; border-radius: 0; border-top: 2px solid #B9D8D9; @@ -1934,10 +1934,22 @@ i { 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); +} + +.form-control-group { + white-space: nowrap; +} + .blocker { color: #990000; } 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 dbf3e2d..7e8a3a8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -527,15 +527,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 ) %] @@ -554,7 +554,7 @@ No patron matched [% message | html %] [% END %] [% UNLESS ( noissues ) %] -
+
[% IF NEEDSCONFIRMATION %] [% ELSE %] @@ -564,7 +564,7 @@ No patron matched [% message | html %]
[% IF Koha.Preference('decreaseLoanHighHolds') %] -
+
[% IF NEEDSCONFIRMATION %] [% IF override_high_holds %] @@ -584,7 +584,7 @@ No patron matched [% message | html %] [% END %] [% IF Koha.Preference('OnSiteCheckouts') %] -
+
[% IF noissues %]
@@ -597,7 +597,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 74b24f6..127f555 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -594,30 +594,45 @@
[% 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') %]
@@ -631,54 +646,43 @@ [% 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 %] - [% 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

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