View | Details | Raw Unified | Return to bug 20959
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (-8 / +21 lines)
Lines 490-500 input { Link Here
490
        }
490
        }
491
    }
491
    }
492
492
493
    &.alert {
494
        background-color: #FFFF99;
495
        border-color: #900;
496
    }
497
498
    &.hasDatepicker {
493
    &.hasDatepicker {
499
        background-image: url("../img/famfamfam/silk/calendar.png");
494
        background-image: url("../img/famfamfam/silk/calendar.png");
500
        background-position-x: right;
495
        background-position-x: right;
Lines 523-528 input { Link Here
523
    }
518
    }
524
}
519
}
525
520
521
.input-warning {
522
    background-color: #FF9;
523
    border-color: #900;
524
}
525
526
label,
526
label,
527
.label {
527
.label {
528
    color: #000;
528
    color: #000;
Lines 1981-1987 i { Link Here
1981
    }
1981
    }
1982
}
1982
}
1983
1983
1984
.checkout-setting {
1984
.circ-setting {
1985
    font-size: 85%;
1985
    font-size: 85%;
1986
    padding-top: .3em;
1986
    padding-top: .3em;
1987
1987
Lines 1995-2001 i { Link Here
1995
    }
1995
    }
1996
}
1996
}
1997
1997
1998
.checkout-settings {
1998
.circ-settings {
1999
    background-color: #F4F8F9;
1999
    background-color: #F4F8F9;
2000
    border-radius: 0;
2000
    border-radius: 0;
2001
    border-top: 2px solid #B9D8D9;
2001
    border-top: 2px solid #B9D8D9;
Lines 2006-2015 i { Link Here
2006
    padding: 1em 1em 0;
2006
    padding: 1em 1em 0;
2007
}
2007
}
2008
2008
2009
#show-checkout-settings {
2009
#show-circ-settings {
2010
    margin-top: .5em;
2010
    margin-top: .5em;
2011
}
2011
}
2012
2012
2013
.checkin-active-setting {
2014
    background-color: #FFC;
2015
    border-radius: 3px;
2016
    box-shadow: 1px 1px 2px 0 rgba(102, 102, 102, .5);
2017
    margin: .5em;
2018
    padding: .5em;
2019
}
2020
2021
.form-control-group {
2022
    white-space: nowrap;
2023
}
2024
2025
2013
.blocker {
2026
.blocker {
2014
    color: #990000;
2027
    color: #990000;
2015
}
2028
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-8 / +8 lines)
Lines 546-560 Link Here
546
546
547
                                                <button type="submit" class="btn btn-default">Check out</button>
547
                                                <button type="submit" class="btn btn-default">Check out</button>
548
548
549
                                                <div id="show-checkout-settings">
549
                                                <div id="show-circ-settings">
550
                                                    <a href="#"><i class="fa fa-caret-right checkout-settings-icon"></i> Checkout settings</a>
550
                                                    <a href="#"><i class="fa fa-caret-right circ-settings-icon"></i> Checkout settings</a>
551
                                                </div>
551
                                                </div>
552
552
553
                                                <div class="checkout-settings">
553
                                                <div class="circ-settings">
554
554
555
                                                    [% UNLESS ( noissues && Koha.Preference('OnSiteCheckoutsForce') ) %]
555
                                                    [% UNLESS ( noissues && Koha.Preference('OnSiteCheckoutsForce') ) %]
556
                                                        [% IF ( SpecifyDueDate ) %]
556
                                                        [% IF ( SpecifyDueDate ) %]
557
                                                            <div id="specify-due-date" class="checkout-setting">
557
                                                            <div id="specify-due-date" class="circ-setting">
558
                                                                <div class="hint">Specify due date [% INCLUDE 'date-format.inc' %]: </div>
558
                                                                <div class="hint">Specify due date [% INCLUDE 'date-format.inc' %]: </div>
559
                                                                [% IF ( duedatespec ) %]
559
                                                                [% IF ( duedatespec ) %]
560
                                                                    <input type="text" size="13" id="duedatespec" name="duedatespec" value="[% duedatespec | html %]" />
560
                                                                    <input type="text" size="13" id="duedatespec" name="duedatespec" value="[% duedatespec | html %]" />
Lines 573-579 Link Here
573
                                                    [% END %]
573
                                                    [% END %]
574
574
575
                                                    [% UNLESS ( noissues ) %]
575
                                                    [% UNLESS ( noissues ) %]
576
                                                        <div id="set-automatic-renewal" class="checkout-setting">
576
                                                        <div id="set-automatic-renewal" class="circ-setting">
577
                                                            [% IF NEEDSCONFIRMATION %]
577
                                                            [% IF NEEDSCONFIRMATION %]
578
                                                                <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled" />
578
                                                                <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled" />
579
                                                            [% ELSE %]
579
                                                            [% ELSE %]
Lines 583-589 Link Here
583
                                                            <label for="auto_renew">Automatic renewal</label>
583
                                                            <label for="auto_renew">Automatic renewal</label>
584
                                                        </div>
584
                                                        </div>
585
                                                        [% IF Koha.Preference('decreaseLoanHighHolds') %]
585
                                                        [% IF Koha.Preference('decreaseLoanHighHolds') %]
586
                                                            <div id="set_high_holds_overrride" class="checkout-setting">
586
                                                            <div id="set_high_holds_overrride" class="circ-setting">
587
                                                                [% IF NEEDSCONFIRMATION %]
587
                                                                [% IF NEEDSCONFIRMATION %]
588
                                                                    [% IF override_high_holds %]
588
                                                                    [% IF override_high_holds %]
589
                                                                        <input type="checkbox" name="override_high_holds" id="override_high_holds" value="1" disabled="disabled" checked="checked"/>
589
                                                                        <input type="checkbox" name="override_high_holds" id="override_high_holds" value="1" disabled="disabled" checked="checked"/>
Lines 603-609 Link Here
603
                                                    [% END %]
603
                                                    [% END %]
604
604
605
                                                    [% IF Koha.Preference('OnSiteCheckouts') %]
605
                                                    [% IF Koha.Preference('OnSiteCheckouts') %]
606
                                                        <div id="onsite_checkout-select" class="checkout-setting">
606
                                                        <div id="onsite_checkout-select" class="circ-setting">
607
                                                            [% IF noissues %]
607
                                                            [% IF noissues %]
608
                                                                <div class="onsite-checkout-only">
608
                                                                <div class="onsite-checkout-only">
609
                                                                    <input type="checkbox" id="onsite_checkout" name="onsite_checkout_forced" checked="checked" disabled="disabled" /> <label for="onsite_checkout">On-site checkouts only. Automatic due date: </label>
609
                                                                    <input type="checkbox" id="onsite_checkout" name="onsite_checkout_forced" checked="checked" disabled="disabled" /> <label for="onsite_checkout">On-site checkouts only. Automatic due date: </label>
Lines 616-622 Link Here
616
                                                        </div>
616
                                                        </div>
617
                                                    [% END %]
617
                                                    [% END %]
618
618
619
                                                </div> <!-- /.checkout-settings -->
619
                                                </div> <!-- /.circ-settings -->
620
620
621
                                                <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber | html %]" />
621
                                                <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber | html %]" />
622
                                                <input type="hidden" name="branch" value="[% branch | html %]" />
622
                                                <input type="hidden" name="branch" value="[% branch | html %]" />
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-67 / +113 lines)
Lines 669-759 Link Here
669
        </div>
669
        </div>
670
[% END%]
670
[% END%]
671
671
672
    <div id="exemptfines" class="dialog message" style="display:none;">
673
        <p>Fines for returned items are forgiven.</p>
674
    </div>
675
    <div id="forgivemanualholdsexpire-alert" class="dialog message" style="display:none;">
676
        <p>Fines are not charged for manually cancelled holds.</p>
677
    </div>
678
    <div id="dropboxmode" class="dialog message" style="display:none;">
679
        <p>Book drop mode.  (Effective checkin date is [% dropboxdate | $KohaDates %] ).</p>
680
    </div>
681
682
<div class="row">
683
    <form id="checkin-form" method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off" >
672
    <form id="checkin-form" method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off" >
684
    <div class="col-sm-6">
673
        <fieldset id="circ_returns_checkin">
685
            <fieldset>
674
            <h3>Check in</h3>
686
            <legend>Check in</legend>
675
            <div class="row">
687
            <label for="barcode">Enter item barcode: </label>
676
        <div class="col-sm-6">
677
            <div class="hint">Enter item barcode:</div>
678
                <div class="form-control-group">
679
                    [% IF ( exemptfine ) %]
680
                        <input name="barcode" id="barcode" size="14" class="focus input-warning" type="text" />
681
                    [% ELSIF ( dropboxmode ) %]
682
                        <input name="barcode" id="barcode" size="14" class="barcode focus input-warning" />
683
                    [% ELSE %]
684
                        <input name="barcode" id="barcode" size="14" class="barcode focus" />
685
                    [% END %]
686
                    <button type="submit" class="btn btn-default">Check in</button>
687
                    [% FOREACH inputloo IN inputloop %]
688
                        <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
689
                        <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
690
                        <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
691
                    [% END %]
692
                </div>
693
            <div id="show-circ-settings">
694
                <a href="#"><i class="fa circ-settings-icon fa-caret-down"></i> Checkin settings</a>
695
            </div>
696
        </div>
697
        <div class="col-sm-6">
688
            [% IF ( exemptfine ) %]
698
            [% IF ( exemptfine ) %]
689
            <input name="barcode" id="barcode" size="14" class="focus alert" type="text" />
699
                <div id="exemptfines" class="checkin-active-setting">
690
            [% ELSIF ( dropboxmode ) %]
691
            <input name="barcode" id="barcode" size="14" class="focus alert" type="text" />
692
            [% ELSE %]
700
            [% ELSE %]
693
            <input name="barcode" id="barcode" size="14" class="focus" type="text" />
701
                <div id="exemptfines" class="checkin-active-setting" style="display:none;">
694
            [% END %]
702
            [% END %]
695
            <input type="submit" class="submit" value="Submit" />
703
                <p><i class="fa fa-check"></i> Fines for returned items are forgiven.</p>
704
            </div>
705
706
            [% IF ( forgivemanualholdsexpire ) %]
707
                <div id="forgivemanualholdsexpire-alert" class="checkin-active-setting">
708
            [% ELSE %]
709
                <div id="forgivemanualholdsexpire-alert" class="checkin-active-setting" style="display:none;">
710
            [% END %]
711
                    <p><i class="fa fa-check"></i> Fines are not charged for manually cancelled holds.</p>
712
                </div>
713
714
                [% IF ( dropboxmode ) %]
715
                    <div id="dropboxmode" class="checkin-active-setting">
716
                [% ELSE %]
717
                    <div id="dropboxmode" class="checkin-active-setting" style="display:none;">
718
                [% END %]
719
                    <p><i class="fa fa-check"></i> Book drop mode. <span class="single-line">( Effective checkin date is [% dropboxdate | $KohaDates with_hours => 1 %] )</span></p>
720
                </div>
721
                [% IF ( return_date_override_remember ) %]
722
                    <div id="return_date_remember" class="checkin-active-setting">
723
                [% ELSE %]
724
                    <div id="return_date_remember" class="checkin-active-setting" style="display:none;">
725
                [% END %]
726
                    <p><i class="fa fa-check"></i> Saved check-in date: <span id="saved_return_date" class="single-line">[% return_date_override | html %]</span></p>
727
                </div>
728
            </div>
729
        </div>
696
730
731
            <div class="circ-settings">
697
            [% IF Koha.Preference('SpecifyReturnDate') %]
732
            [% IF Koha.Preference('SpecifyReturnDate') %]
698
                <div class="date-select" id="return_date_override_fields">
733
                <div class="date-select" id="return_date_override_fields">
699
                    <div class="hint">Specify return date [% INCLUDE 'date-format.inc' %]: </div>
734
                    <div class="hint">Specify return date [% INCLUDE 'date-format.inc' %]: </div>
700
735
701
                    <input type="text" size="13" id="return_date_override" name="return_date_override" value="[% return_date_override | html %]" />
736
                    <input type="text" size="13" id="return_date_override" name="return_date_override" value="[% return_date_override | html %]" />
702
737
703
                    <label for="return_date_override_remember"> Remember for next check in:</label>
704
                    [% IF ( return_date_override_remember ) %]
705
                        <input type="checkbox" id="return_date_override_remember" name="return_date_override_remember" checked="checked" />
706
                    [% ELSE %]
707
                        <input type="checkbox" id="return_date_override_remember" name="return_date_override_remember" />
708
                    [% END %]
709
710
                    <input type="button" class="action" id="cleardate" value="Clear" name="cleardate" />
711
            </div>
712
        [% END %]
713
            [% FOREACH inputloo IN inputloop %]
714
                <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
715
                <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
716
                <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
717
            [% END %]
718
738
719
739
720
            </fieldset>
740
                    <button type="button" class="action btn btn-default btn-xs" id="cleardate" name="cleardate">Clear</button>
741
                    <div class="circ-setting">
742
                        [% IF ( return_date_override_remember ) %]
743
                            <input type="checkbox" id="return_date_override_remember" name="return_date_override_remember" checked="checked" />
744
                        [% ELSE %]
745
                            <input type="checkbox" id="return_date_override_remember" name="return_date_override_remember" />
746
                        [% END %]
747
                        <label for="return_date_override_remember"> Remember due date for next check in</label>
748
                    </div>
721
            </div>
749
            </div>
722
            <div class="col-sm-6">
750
        [% END %]
723
            <fieldset id="checkin_options">
724
                <legend>Options</legend>
725
                    [% IF ( CAN_user_updatecharges_writeoff && overduecharges ) %]
751
                    [% IF ( CAN_user_updatecharges_writeoff && overduecharges ) %]
726
                    <p>
752
                        <div id="forgive-overdue-fines" class="circ-setting">
727
                        [% IF ( exemptfine ) %]
753
                        [% IF ( exemptfine ) %]
728
                        <input type="checkbox" id="exemptcheck" name="exemptfine" value="exemptfine" checked="checked" />
754
                        <input type="checkbox" id="exemptcheck" name="exemptfine" value="exemptfine" checked="checked" />
729
                        [% ELSE %]
755
                        [% ELSE %]
730
                        <input type="checkbox" id="exemptcheck" name="exemptfine" value="exemptfine" />
756
                        <input type="checkbox" id="exemptcheck" name="exemptfine" value="exemptfine" />
731
                        [% END %]
757
                        [% END %]
732
                        <label for="exemptcheck">Forgive overdue charges</label>
758
                        <label for="exemptcheck">Forgive overdue charges</label>
733
                    </p>
759
                        </div>
734
                    [% END %] <!-- overduecharges -->
760
                    [% END %] <!-- overduecharges -->
735
                    <p>
761
                        <div id="book-drop-mode" class="circ-setting">
736
                        [% IF ( dropboxmode ) %]
762
                        [% IF ( dropboxmode ) %]
737
                        <input type="checkbox" id="dropboxcheck" name="dropboxmode" value="dropboxmode" checked="checked" />
763
                        <input type="checkbox" id="dropboxcheck" name="dropboxmode" value="dropboxmode" checked="checked" />
738
                        [% ELSE %]
764
                        [% ELSE %]
739
                        <input type="checkbox" id="dropboxcheck" name="dropboxmode" value="dropboxmode" />
765
                        <input type="checkbox" id="dropboxcheck" name="dropboxmode" value="dropboxmode" />
740
                        [% END %]
766
                        [% END %]
741
                        <label for="dropboxcheck">Book drop mode</label>
767
                        <label for="dropboxcheck">Book drop mode</label>
742
                    </p>
768
                        </div>
743
                    [% IF Koha.Preference('ExpireReservesMaxPickUpDelayCharge') %]
769
                    [% IF Koha.Preference('ExpireReservesMaxPickUpDelayCharge') %]
744
                    <p>
770
                        <div class="forgive-manual-hold-fees circ-setting">
745
                        [% IF ( forgivemanualholdsexpire ) %]
771
                        [% IF ( forgivemanualholdsexpire ) %]
746
                        <input type="checkbox" id="forgivemanualholdsexpire" name="forgivemanualholdsexpire" value="forgivemanualholdsexpire" checked="checked" />
772
                        <input type="checkbox" id="forgivemanualholdsexpire" name="forgivemanualholdsexpire" value="forgivemanualholdsexpire" checked="checked" />
747
                        [% ELSE %]
773
                        [% ELSE %]
748
                        <input type="checkbox" id="forgivemanualholdsexpire" name="forgivemanualholdsexpire" value="forgivemanualholdsexpire" />
774
                        <input type="checkbox" id="forgivemanualholdsexpire" name="forgivemanualholdsexpire" value="forgivemanualholdsexpire" />
749
                        [% END %]
775
                        [% END %]
750
                        <label for="forgivemanualholdsexpire">Forgive fees for manually expired holds</label>
776
                        <label for="forgivemanualholdsexpire">Forgive fees for manually expired holds</label>
751
                    </p>
777
                        </div>
752
                    [% END %] <!-- overduecharges -->
778
                    [% END %] <!-- overduecharges -->
753
            </fieldset>
779
                </div> <!-- /.circ-settings -->
754
        </div>
780
            </fieldset> <!-- /#circ_returns_checkin -->
755
    </form>
781
        </form> <!-- /#checkin-form -->
756
</div>
757
782
758
[% IF ( riloop ) %]
783
[% IF ( riloop ) %]
759
    <h2>Checked-in items</h2>
784
    <h2>Checked-in items</h2>
Lines 809-823 Link Here
809
    </table>
834
    </table>
810
[% END %]
835
[% END %]
811
836
812
                    [% IF Koha.Preference('CircSidebar') %]
837
                [% IF Koha.Preference('CircSidebar') %]
813
                            </div> <!-- /.col-sm-10.col-sm-push-2 -->
838
                        </div> <!-- /.col-sm-10.col-sm-push-2 -->
814
                            <div class="col-sm-2 col-sm-pull-10">
839
                        <div class="col-sm-2 col-sm-pull-10">
815
                                <aside>
840
                            <aside>
816
                                    [% INCLUDE 'circ-nav.inc' %]
841
                                [% INCLUDE 'circ-nav.inc' %]
817
                                </aside>
842
                            </aside>
818
                            </div> <!-- /.col-sm-2.col-sm-pull-10 -->
843
                        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
819
                        </div> <!-- /.row -->
844
                    </div> <!-- /.row -->
820
                    [% END %]
845
                [% ELSE %]
846
                        </div> <!-- /.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2 -->
847
                    </div> <!-- /.row -->
848
                [% END %]
821
849
822
            </main>
850
            </main>
823
        </div> <!-- /.col-sm-12 -->
851
        </div> <!-- /.col-sm-12 -->
Lines 828-833 Link Here
828
    [% INCLUDE 'columns_settings.inc' %]
856
    [% INCLUDE 'columns_settings.inc' %]
829
    [% INCLUDE 'calendar.inc' %]
857
    [% INCLUDE 'calendar.inc' %]
830
    [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %]
858
    [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %]
859
    [% Asset.js("js/pages/circulation.js") | $raw %]
831
    [% INCLUDE 'timepicker.inc' %]
860
    [% INCLUDE 'timepicker.inc' %]
832
861
833
    <script>
862
    <script>
Lines 894-921 Link Here
894
                        return false;
923
                        return false;
895
                    }
924
                    }
896
                }
925
                }
926
                // Add saved date information to onscreen message, which
927
                // may or may not be hidden
928
                $("#saved_return_date").text( $("#return_date_override").val() );
897
                return true;
929
                return true;
898
            }
930
            }
899
931
900
            $("#exemptcheck").change(function () {
932
            $("#exemptcheck").change(function () {
901
                if (this.checked == true) {
933
                if (this.checked == true) {
902
                    $("#barcode").addClass("alert");
934
                    $("#barcode").addClass("input-warning");
903
                    $("#exemptfines").show();
935
                    $("#exemptfines").show();
904
                } else {
936
                } else {
905
                    $("#barcode").removeClass("alert");
937
                    $("#barcode").removeClass("input-warning");
906
                    $("#exemptfines").hide();
938
                    $("#exemptfines").hide();
907
                }
939
                }
908
                $("#barcode").focus();
940
                $("#barcode").focus();
909
            });
941
            });
910
            $("#dropboxcheck").change(function () {
942
            $("#dropboxcheck").change(function () {
911
                if (this.checked == true) {
943
                if (this.checked == true) {
912
                    $("#barcode").addClass("alert");
944
                    $("#barcode").addClass("input-warning");
913
                    $("#dropboxmode").show();
945
                    $("#dropboxmode").show();
914
946
915
                    $("#return_date_override_fields :input").prop('disabled', true);
947
                    $("#return_date_override_fields :input").prop('disabled', true);
916
                    $("#return_date_override").datetimepicker("disable");
948
                    $("#return_date_override").datetimepicker("disable");
917
                } else {
949
                } else {
918
                    $("#barcode").removeClass("alert");
950
                    $("#barcode").removeClass("input-warning");
919
                    $("#dropboxmode").hide();
951
                    $("#dropboxmode").hide();
920
952
921
                    $("#return_date_override_fields :input").prop('disabled', false);
953
                    $("#return_date_override_fields :input").prop('disabled', false);
Lines 925-934 Link Here
925
            });
957
            });
926
            $("#forgivemanualholdsexpire").change(function () {
958
            $("#forgivemanualholdsexpire").change(function () {
927
                if (this.checked == true) {
959
                if (this.checked == true) {
928
                    $("#barcode").addClass("alert");
960
                    $("#barcode").addClass("input-warning");
929
                    $("#forgivemanualholdsexpire-alert").show();
961
                    $("#forgivemanualholdsexpire-alert").show();
930
                } else {
962
                } else {
931
                    $("#barcode").removeClass("alert");
963
                    $("#barcode").removeClass("input-warning");
932
                    $("#forgivemanualholdsexpire-alert").hide();
964
                    $("#forgivemanualholdsexpire-alert").hide();
933
                }
965
                }
934
                $("#barcode").focus();
966
                $("#barcode").focus();
Lines 937-949 Link Here
937
            [% IF(overduecharges) %]
969
            [% IF(overduecharges) %]
938
                $("#barcode").focus(function () {
970
                $("#barcode").focus(function () {
939
                    if (($("#exemptcheck").prop("checked") == true) || ($("#dropboxcheck").prop("checked") == true)) {
971
                    if (($("#exemptcheck").prop("checked") == true) || ($("#dropboxcheck").prop("checked") == true)) {
940
                        $("#barcode").addClass("alert");
972
                        $("#barcode").addClass("input-warning");
941
                    } else {
973
                    } else {
942
                        $("#barcode").removeClass("alert");
974
                        $("#barcode").removeClass("input-warning");
943
                    }
975
                    }
944
                });
976
                });
945
                $("#barcode").blur(function () {
977
                $("#barcode").blur(function () {
946
                    $("#barcode").removeClass("alert");
978
                    $("#barcode").removeClass("input-warning");
947
                });
979
                });
948
            [% END %]
980
            [% END %]
949
981
Lines 971-978 Link Here
971
                this.form.return_date_override.value = '';
1003
                this.form.return_date_override.value = '';
972
                this.form.return_date_override_remember.checked = false;
1004
                this.form.return_date_override_remember.checked = false;
973
                this.form.barcode.focus();
1005
                this.form.barcode.focus();
1006
                $("#return_date_remember").hide();
974
                return false;
1007
                return false;
975
            });
1008
            });
1009
1010
            $("#return_date_override_remember").on("change", function(){
1011
                if( $(this).prop("checked" ) ){
1012
                    if( $("#return_date_override").val() == "" ){
1013
                        $("#saved_return_date").text( _("No date selected") );
1014
                    } else {
1015
                        $("#saved_return_date").text( $("#return_date_override").val() );
1016
                    }
1017
                    $("#return_date_remember").show();
1018
                } else {
1019
                    $("#return_date_remember").hide();
1020
                }
1021
            });
976
        });
1022
        });
977
    </script>
1023
    </script>
978
[% END %]
1024
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js (-15 / +14 lines)
Lines 54-79 $(document).ready(function() { Link Here
54
        return false;
54
        return false;
55
    });
55
    });
56
56
57
    var checkout_settings = $(".checkout-settings");
57
    var circ_settings = $(".circ-settings");
58
    var checkout_settings_icon = $(".checkout-settings-icon");
58
    var circ_settings_icon = $(".circ-settings-icon");
59
59
60
    // If any checkboxes in the checkout settings are selected, show the settings by default
60
    // If any checkboxes in the circ settings are selected, show the settings by default
61
    if ( $(".checkout-settings input:checked,#duedatespec[value!='']").length ) {
61
    if ( $(".circ-settings input:checked,#duedatespec[value!='']").length ) {
62
        checkout_settings.show();
62
        circ_settings.show();
63
        checkout_settings_icon.removeClass("fa-caret-right").addClass("fa-caret-down");
63
        circ_settings_icon.removeClass("fa-caret-right").addClass("fa-caret-down");
64
    } else {
64
    } else {
65
        checkout_settings.hide();
65
        circ_settings.hide();
66
        checkout_settings_icon.removeClass("fa-caret-down").addClass("fa-caret-right");
66
        circ_settings_icon.removeClass("fa-caret-down").addClass("fa-caret-right");
67
    }
67
    }
68
68
69
    $("#show-checkout-settings a").on("click",function(){
69
    $("#show-circ-settings a").on("click",function(){
70
        if( checkout_settings.is(":hidden")){
70
        if( circ_settings.is(":hidden")){
71
            checkout_settings.show();
71
            circ_settings.show();
72
            checkout_settings_icon.removeClass("fa-caret-right").addClass("fa-caret-down");
72
            circ_settings_icon.removeClass("fa-caret-right").addClass("fa-caret-down");
73
        } else {
73
        } else {
74
            $("#barcode").focus();
74
            $("#barcode").focus();
75
            checkout_settings.hide();
75
            circ_settings.hide();
76
            checkout_settings_icon.removeClass("fa-caret-down").addClass("fa-caret-right");
76
            circ_settings_icon.removeClass("fa-caret-down").addClass("fa-caret-right");
77
        }
77
        }
78
    });
78
    });
79
79
80
- 

Return to bug 20959