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 438-471 $(document).ready(function() { Link Here
438
438
439
        [% IF ( UNKNOWN_BARCODE ) %]
439
        [% IF ( UNKNOWN_BARCODE ) %]
440
            <li>The barcode was not found: <span class="ex">[% barcode |html %]</span>
440
            <li>The barcode was not found: <span class="ex">[% barcode |html %]</span>
441
	    [% IF ( fast_cataloging ) %]
442
	        [% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
443
            <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>
444
		[% END %]
445
	    [% END %]
446
441
447
        [% IF ( FALLBACK ) %]
442
                <div>
448
            [% IF options %]
443
                    [% IF ( FALLBACK ) %]
449
                <br />The following items were found by searching:
444
                        [% IF options %]
450
                [% FOREACH book IN options %]
445
                            <button type="button" class="approve" data-toggle="modal" data-target="#itemSearchFallback"><i class="fa fa-search"></i> Show matching titles</button>
451
                    <br />
446
                        [% ELSE %]
452
                    <form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
447
                            <div>No items were found by searching.</div>
453
                    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
448
                        [% END %]
454
                        <input type="hidden" name="restoreduedatespec" />
449
                    [% END %]
455
                        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
456
                        <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
457
                        <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
458
                        <input type="hidden" name="branch" value="[% branch %]" />
459
                        <input type="hidden" name="barcode" value="[% book.barcode %]" />
460
                        <button type="submit" name="x"><i class="fa fa-check"></i> Check out [% book.barcode %]: [% book.title %]</button>
461
                    </form>
462
                [% END %]
463
            [% ELSE %]
464
                <br />No items were found by searching.
465
            [% END %]
466
        [% END %]
467
450
468
     </li>
451
                    [% IF ( fast_cataloging ) %]
452
                        [% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
453
                            <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>
454
                        [% END %]
455
                    [% END %]
456
                </div>
457
458
            </li>
469
        [% END %]
459
        [% END %]
470
460
471
        [% IF ( NOT_FOR_LOAN ) %]
461
        [% IF ( NOT_FOR_LOAN ) %]
Lines 545-550 $(document).ready(function() { Link Here
545
        [% END %]
535
        [% END %]
546
536
547
</div></div>
537
</div></div>
538
539
        [% IF ( FALLBACK ) %]
540
            [% IF options %]
541
542
                <!-- Modal -->
543
                <div class="modal" id="itemSearchFallback" tabindex="-1" role="dialog" aria-labelledby="itemSearchFallbackLabel">
544
                    <div class="modal-dialog modal-wide" role="document">
545
                        <div class="modal-content">
546
                            <div class="modal-header">
547
                                <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
548
                                <h3 id="itemSearchFallbackLabel"><h3>Barcode not found. The following items were found by searching:</h3>
549
                            </div>
550
                            <div class="modal-body">
551
                                <table class="table_borrowers">
552
                                    [% FOREACH book IN options %]
553
                                        <tr>
554
                                            <td>
555
                                                <a class="popup" target="_blank" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% book.biblionumber %]">[% book.title %]</a>
556
                                                [% book.barcode %]
557
                                            </td>
558
                                            <td>
559
                                                <form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
560
                                                    [% IF (forceallow) %]
561
                                                        <input type="hidden" name="forceallow" value="1">
562
                                                    [% END %]
563
                                                    <input type="hidden" name="restoreduedatespec" />
564
                                                    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
565
                                                    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
566
                                                    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
567
                                                    <input type="hidden" name="branch" value="[% branch %]" />
568
                                                    <input type="hidden" name="barcode" value="[% book.barcode %]" />
569
                                                    <button class="btn btn-default btn-xs" type="submit" name="x"><i class="fa fa-check"></i> Check out</button>
570
                                                </form>
571
                                            </td>
572
                                        </tr>
573
                                    [% END %]
574
                                </table>
575
                            </div>
576
                            <div class="modal-footer">
577
                                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
578
                            </div>
579
                        </div>
580
                    </div>
581
                </div>
582
            [% END %]
583
        [% END %]
584
548
[% ELSE %]
585
[% ELSE %]
549
  [% IF (forceallow) %]
586
  [% IF (forceallow) %]
550
      <div id="overridden_debarment" class="dialog alert">Restriction overridden temporarily</div>
587
      <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