@@ -, +, @@ when not in use - Check out to a patron who is not blocked from checking out. - Click the "Checkout settings" link and confirm that the settings panel is displayed. - Test that the settings in the panel behave as expected. - Test with preferences on and off: decreaseLoanHighHolds, OnSiteCheckouts, SpecifyDueDate. --- .../intranet-tmpl/prog/en/css/staff-global.css | 37 +++++---- .../intranet-tmpl/prog/en/js/pages/circulation.js | 15 ++++ .../prog/en/modules/circ/circulation.tt | 93 ++++++++++++---------- 3 files changed, 87 insertions(+), 58 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -509,12 +509,11 @@ fieldset.brief ol, fieldset.brief li { } .hint { - color : #999999; + color : #666; font-size : 95%; } fieldset.brief div.hint, fieldset.rows div.hint, div.yui-u div.hint { - font-size : 95%; margin-bottom : .4em; } @@ -998,32 +997,40 @@ tr.highlight th[scope=row] { border-color : #BCBCBC; } -#circ_circulation_issue label { - font-size: 105%; - font-weight : bold; -} - -#circ_circulation_issue div.hint { - color : #666666; - margin: .2em 0; +label.circ_barcode { + font-size: 105%; + font-weight : bold; } -.date-select, -.onsite_checkout-select { +.checkout-setting { font-size : 85%; padding-top : .3em; } -#circ_circulation_issue .date-select label, -.date-select label { +.checkout-setting label { font-size : inherit; font-weight: normal; } -.date-select input { +.checkout-setting input { vertical-align: middle; } +.checkout-settings { + background-color: #f4f8f9; + border-radius: 0; + border-top: 2px solid #b9d8d9; + display: none; + margin-left: -1em; + margin-right: -1em; + margin-top: 1em; + padding: 1em 1em 0; +} + +#show-checkout-settings { + margin-top: .5em; +} + tr.expired td { color : #999999; } --- a/koha-tmpl/intranet-tmpl/prog/en/js/pages/circulation.js +++ a/koha-tmpl/intranet-tmpl/prog/en/js/pages/circulation.js @@ -45,6 +45,21 @@ $(document).ready(function() { export_checkouts(output_format); return false; }); + + var checkout_settings = $(".checkout-settings"); + var checkout_settings_icon = $(".checkout-settings-icon"); + + $("#show-checkout-settings a").on("click",function(){ + if( checkout_settings.is(":hidden")){ + checkout_settings.show(); + checkout_settings_icon.removeClass("fa-caret-right").addClass("fa-caret-down"); + } else { + $("#barcode").focus(); + checkout_settings.hide(); + checkout_settings_icon.removeClass("fa-caret-down").addClass("fa-caret-right"); + } + }); + }); function export_checkouts(format) { --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -644,7 +644,7 @@ No patron matched [% message %] [% IF (forceallow) %][% END %] - +