@@ -, +, @@ 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. --- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 31 ++-- .../prog/en/modules/circ/circulation.tt | 16 +- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 185 +++++++++++---------- .../intranet-tmpl/prog/js/pages/circulation.js | 28 ++-- 4 files changed, 134 insertions(+), 126 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css +++ a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css @@ -606,12 +606,7 @@ fieldset.brief ol, fieldset.brief li { .hint { color : #666; font-size : 95%; -} - -fieldset.brief div.hint, -fieldset.rows div.hint, -div.yui-u div.hint { - margin-bottom : .4em; + margin-bottom: .4em; } fieldset.rows div.hint { @@ -995,9 +990,9 @@ div.error { margin : 1em; } -input.alert { - background-color : #FFFF99; - border-color: #900; +.input-warning { + background-color : #FFFF99; + border-color: #900; } ol.bibliodetails { @@ -1065,21 +1060,21 @@ label.circ_barcode { font-weight : bold; } -.checkout-setting { +.circ-setting { font-size : 85%; padding-top : .3em; } -.checkout-setting label { +.circ-setting label { font-size : inherit; font-weight: normal; } -.checkout-setting input { +.circ-setting input { vertical-align: middle; } -.checkout-settings { +.circ-settings { background-color: #f4f8f9; border-radius: 0; border-top: 2px solid #b9d8d9; @@ -1090,10 +1085,18 @@ label.circ_barcode { 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); +} + tr.expired td { color : #999999; } --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -526,15 +526,15 @@ No patron matched [% message | html %] [% END %] -