@@ -, +, @@ 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. - Test with CircSidebar enabled and disabled. --- .../intranet-tmpl/prog/css/src/staff-global.scss | 28 ++-- .../prog/en/modules/circ/circulation.tt | 16 +-- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 142 ++++++++++++--------- .../intranet-tmpl/prog/js/pages/circulation.js | 29 +++-- 4 files changed, 125 insertions(+), 90 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -480,11 +480,6 @@ input { } } - &.alert { - background-color: #FFFF99; - border-color: #900; - } - &.hasDatepicker { background-image: url("../img/famfamfam/silk/calendar.png"); background-position-x: right; @@ -513,6 +508,11 @@ input { } } +.input-warning { + background-color: #FFFF99; + border-color: #900; +} + label, .label { color: #000; @@ -1975,7 +1975,7 @@ i { } } -.checkout-setting { +.circ-setting { font-size: 85%; padding-top: .3em; @@ -1989,7 +1989,7 @@ i { } } -.checkout-settings { +.circ-settings { background-color: #F4F8F9; border-radius: 0; border-top: 2px solid #B9D8D9; @@ -2000,10 +2000,22 @@ i { padding: 1em 1em 0; } -#show-checkout-settings { +#show-circ-settings { margin-top: .5em; } +.checkin-active-setting { + background-color: #FFC; + border-radius: 3px; + box-shadow: 1px 1px 2px 0 rgba(102, 102, 102, .5); + margin: .5em; + padding: .5em; +} + +.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 @@ -531,15 +531,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 ) %] @@ -558,7 +558,7 @@ No patron matched [% message | html %] [% END %] [% UNLESS ( noissues ) %] -
+
[% IF NEEDSCONFIRMATION %] [% ELSE %] @@ -568,7 +568,7 @@ No patron matched [% message | html %]
[% IF Koha.Preference('decreaseLoanHighHolds') %] -
+
[% IF NEEDSCONFIRMATION %] [% IF override_high_holds %] @@ -588,7 +588,7 @@ No patron matched [% message | html %] [% END %] [% IF Koha.Preference('OnSiteCheckouts') %] -
+
[% IF noissues %]
@@ -601,7 +601,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 @@ -598,30 +598,59 @@
[% END%] - - - - -
+
+

Check in

+
-
- Check in - +
Enter item barcode:
+
[% IF ( exemptfine ) %] - + [% ELSIF ( dropboxmode ) %] - + + [% ELSE %] + + [% END %] + + [% FOREACH inputloo IN inputloop %] + + + + [% END %] +
+ +
+
+ [% IF ( exemptfine ) %] +
+ [% ELSE %] + + + [% IF ( forgivemanualholdsexpire ) %] +
[% ELSE %] - + + + [% IF ( dropboxmode ) %] +
+ [% ELSE %] + +
+
+ +
[% IF Koha.Preference('SpecifyReturnDate') %]
@@ -635,54 +664,43 @@ [% ELSE %] [% END %] - - +
[% END %] - [% FOREACH inputloo IN inputloop %] - - - - [% END %] - -
-
-
-
- Options [% IF ( CAN_user_updatecharges_writeoff && overduecharges ) %] -

+

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

- [% END %] -

+

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

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

+

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

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

Checked-in items

@@ -738,15 +756,18 @@ [% END %] - [% IF Koha.Preference('CircSidebar') %] -
-
- -
-
- [% END %] + [% IF Koha.Preference('CircSidebar') %] +
+
+ +
+
+ [% ELSE %] +
+ + [% END %] @@ -757,6 +778,7 @@ [% 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' %]