@@ -, +, @@ with collapsed settings panel - 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. --- .../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(-) --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ a/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; } --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -527,15 +527,15 @@ No patron matched [% message | html %] [% END %] -
- Checkout settings +
+ 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 %] -
+
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ a/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' %] -