@@ -, +, @@ 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 %] -