@@ -, +, @@ hold item clearer - Confirm you can successfully place single or multiple items on hold - Confirm that when placing a single hold the next available options are grouped - Confirm pickup location, specific item type, and number of holds all work for next available - Confirm item level holds save pickup location correctly --- .../prog/css/src/staff-global.scss | 7 + .../prog/en/modules/reserve/request.tt | 190 +++++++++--------- 2 files changed, 103 insertions(+), 94 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -880,6 +880,13 @@ fieldset { font-size: 110%; font-weight: bold; margin-left: 1em; + + label { + display: inline-block; + float: none; + margin: .2em; + width: auto; + } } li { --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -437,9 +437,9 @@ [% UNLESS ( multi_hold ) %] -
+ + [% ELSE # Multi-hold %] - - - [% END %] - [% END %] + + + [% END # /UNLESS ( multi_hold ) %] + [% END # /UNLESS club OR patron... %] [% UNLESS ( patron ) %] [% UNLESS borrowers %] @@ -1253,15 +1259,8 @@ $( active_tab ).find("input.focus").focus(); }); - function ToggleHoldsToPlace() { - if ( $("#requestany").prop('checked') ) { - $("#holds_to_place_count,#pickup,#itemtype").prop('disabled', false); - } else { - $("#holds_to_place_count,#pickup,#itemtype").prop('disabled', true); - } - } ToggleHoldsToPlace(); - $("#requestany").on('change', function(){ + $(".requestany").on('change', function(){ ToggleHoldsToPlace(); }); @@ -1280,13 +1279,6 @@ "sDom": '<"top pager"ilf>t', })); - //Override fieldset styling for dataTables search box - $("div.top.pager").css("margin-left","1em"); - $(".dataTables_filter label").css({ - "width":"auto", - "margin-right":"0em" - }); - $("#club-request-form").on("submit", function() { let $t = $(this); $('.clubalert, .holdalert').addClass('hide'); @@ -1385,6 +1377,16 @@ }); }); + function ToggleHoldsToPlace() { + if ( $("#requestany").prop('checked') ) { + $("#holds_to_place_count, #pickup, #itemtype").prop('disabled', false); + $(".requestspecific").prop("disabled", true ); + } else { + $("#holds_to_place_count, #pickup, #itemtype").prop('disabled', true); + $(".requestspecific").prop("disabled", false ); + } + } + function check( table ) { var msg = ""; --