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

(-)a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css (-3 / +15 lines)
Lines 1177-1200 div.alert strong { Link Here
1177
    list-style-position:inside;
1177
    list-style-position:inside;
1178
}
1178
}
1179
1179
1180
.dialog button {
1180
.dialog button,
1181
.dialog a.approve {
1181
    background: #fff none;
1182
    background: #fff none;
1182
    border: 1px outset #999999;
1183
    border: 1px outset #999999;
1183
    border-top-color: #666;
1184
    border-top-color: #666;
1184
    border-left-color: #666;
1185
    border-left-color: #666;
1186
    color: #000;
1185
    margin : .4em;
1187
    margin : .4em;
1186
    padding : .4em;
1188
    padding : .4em;
1187
    white-space: pre-line;
1189
    white-space: pre-line;
1188
}
1190
}
1189
1191
1190
.dialog button:hover {
1192
.dialog button:hover,
1193
.dialog a.approve:hover {
1191
    background-color : #ffc;
1194
    background-color : #ffc;
1192
}
1195
}
1193
1196
1194
.dialog button:active {
1197
.dialog button:active,
1198
.dialog a.approve:active {
1195
    border : 1px inset #999999;
1199
    border : 1px inset #999999;
1196
}
1200
}
1197
1201
1202
.dialog a.approve {
1203
    display: inline-block;
1204
}
1205
1198
.approve i.fa,
1206
.approve i.fa,
1199
.success i.fa {
1207
.success i.fa {
1200
    color: green;
1208
    color: green;
Lines 2638-2643 button.closebtn{padding:0;cursor:pointer;background:transparent;border:0;-webkit Link Here
2638
    overflow-y: auto;
2646
    overflow-y: auto;
2639
}
2647
}
2640
2648
2649
.modal-dialog.modal-wide {
2650
    width: 80%;
2651
}
2652
2641
.btn-group label,
2653
.btn-group label,
2642
.btn-group select {
2654
.btn-group select {
2643
    font-size: 13px;
2655
    font-size: 13px;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-26 / +63 lines)
Lines 439-472 $(document).ready(function() { Link Here
439
439
440
        [% IF ( UNKNOWN_BARCODE ) %]
440
        [% IF ( UNKNOWN_BARCODE ) %]
441
            <li>The barcode was not found: <span class="ex">[% barcode |html %]</span>
441
            <li>The barcode was not found: <span class="ex">[% barcode |html %]</span>
442
	    [% IF ( fast_cataloging ) %]
443
	        [% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
444
            <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA&amp;barcode=[% barcode |uri %]&amp;circborrowernumber=[% borrowernumber %]&amp;branch=[% branch %]&amp;duedatespec=[% duedatespec %]&amp;stickyduedate=[% stickyduedate %]">Add record using fast cataloging</a>
445
		[% END %]
446
	    [% END %]
447
442
448
        [% IF ( FALLBACK ) %]
443
                <div>
449
            [% IF options %]
444
                    [% IF ( FALLBACK ) %]
450
                <br />The following items were found by searching:
445
                        [% IF options %]
451
                [% FOREACH book IN options %]
446
                            <button type="button" class="approve" data-toggle="modal" data-target="#itemSearchFallback"><i class="fa fa-search"></i> Show matching titles</button>
452
                    <br />
447
                        [% ELSE %]
453
                    <form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
448
                            <div>No items were found by searching.</div>
454
                    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
449
                        [% END %]
455
                        <input type="hidden" name="restoreduedatespec" />
450
                    [% END %]
456
                        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
457
                        <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
458
                        <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
459
                        <input type="hidden" name="branch" value="[% branch %]" />
460
                        <input type="hidden" name="barcode" value="[% book.barcode %]" />
461
                        <button type="submit" name="x"><i class="fa fa-check"></i> Check out [% book.barcode %]: [% book.title %]</button>
462
                    </form>
463
                [% END %]
464
            [% ELSE %]
465
                <br />No items were found by searching.
466
            [% END %]
467
        [% END %]
468
451
469
     </li>
452
                    [% IF ( fast_cataloging ) %]
453
                        [% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
454
                            <a class="approve" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA&amp;barcode=[% barcode |uri %]&amp;circborrowernumber=[% borrowernumber %]&amp;branch=[% branch %]&amp;duedatespec=[% duedatespec %]&amp;stickyduedate=[% stickyduedate %]"><i class="fa fa-plus"></i> Add record using fast cataloging</a>
455
                        [% END %]
456
                    [% END %]
457
                </div>
458
459
            </li>
470
        [% END %]
460
        [% END %]
471
461
472
        [% IF ( NOT_FOR_LOAN ) %]
462
        [% IF ( NOT_FOR_LOAN ) %]
Lines 546-551 $(document).ready(function() { Link Here
546
        [% END %]
536
        [% END %]
547
537
548
</div></div>
538
</div></div>
539
540
        [% IF ( FALLBACK ) %]
541
            [% IF options %]
542
543
                <!-- Modal -->
544
                <div class="modal" id="itemSearchFallback" tabindex="-1" role="dialog" aria-labelledby="itemSearchFallbackLabel">
545
                    <div class="modal-dialog modal-wide" role="document">
546
                        <div class="modal-content">
547
                            <div class="modal-header">
548
                                <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
549
                                <h3 id="itemSearchFallbackLabel"><h3>Barcode not found. The following items were found by searching:</h3>
550
                            </div>
551
                            <div class="modal-body">
552
                                <table class="table_borrowers">
553
                                    [% FOREACH book IN options %]
554
                                        <tr>
555
                                            <td>
556
                                                <a class="popup" target="_blank" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% book.biblionumber %]">[% book.title %]</a>
557
                                                [% book.barcode %]
558
                                            </td>
559
                                            <td>
560
                                                <form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
561
                                                    [% IF (forceallow) %]
562
                                                        <input type="hidden" name="forceallow" value="1">
563
                                                    [% END %]
564
                                                    <input type="hidden" name="restoreduedatespec" />
565
                                                    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
566
                                                    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
567
                                                    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
568
                                                    <input type="hidden" name="branch" value="[% branch %]" />
569
                                                    <input type="hidden" name="barcode" value="[% book.barcode %]" />
570
                                                    <button class="btn btn-default btn-xs" type="submit" name="x"><i class="fa fa-check"></i> Check out</button>
571
                                                </form>
572
                                            </td>
573
                                        </tr>
574
                                    [% END %]
575
                                </table>
576
                            </div>
577
                            <div class="modal-footer">
578
                                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
579
                            </div>
580
                        </div>
581
                    </div>
582
                </div>
583
            [% END %]
584
        [% END %]
585
549
[% ELSE %]
586
[% ELSE %]
550
  [% IF (forceallow) %]
587
  [% IF (forceallow) %]
551
      <div id="overridden_debarment" class="dialog alert">Restriction overridden temporarily</div>
588
      <div id="overridden_debarment" class="dialog alert">Restriction overridden temporarily</div>
(-)a/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js (-1 / +4 lines)
Lines 81-86 $(document).ready(function() { Link Here
81
        $("#barcode").focus();
81
        $("#barcode").focus();
82
    });
82
    });
83
83
84
    $("#itemSearchFallback").ready(function(){
85
        $("#itemSearchFallback").modal("show");
86
    });
87
84
});
88
});
85
89
86
function export_checkouts(format) {
90
function export_checkouts(format) {
87
- 

Return to bug 18708