From ba6ee054fcfab3eea873e66ddca26d08d6d385cd Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 11 Mar 2019 17:57:41 +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. - Test with CircSidebar enabled and disabled. Signed-off-by: Jose-Mario Monteiro-Santos --- .../intranet-tmpl/prog/css/src/staff-global.scss | 28 ++-- .../prog/en/modules/circ/circulation.tt | 16 +-- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 144 ++++++++++++--------- .../intranet-tmpl/prog/js/pages/circulation.js | 29 +++-- 4 files changed, 126 insertions(+), 91 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 61b2605..0f4cc73 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/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; @@ -1955,7 +1955,7 @@ i { } } -.checkout-setting { +.circ-setting { font-size: 85%; padding-top: .3em; @@ -1969,7 +1969,7 @@ i { } } -.checkout-settings { +.circ-settings { background-color: #F4F8F9; border-radius: 0; border-top: 2px solid #B9D8D9; @@ -1980,10 +1980,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; } 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 da0712d..0aee09f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -531,15 +531,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 ) %] @@ -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 %] -
+
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 0ccd192..7d241f5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -596,32 +596,61 @@ [% END %]

[% checkinmsg | html_line_break %]

-[% END%] - - - - +[% 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' %]