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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls-reports.inc (-1 / +1 lines)
Lines 77-83 Link Here
77
                    </td>
77
                    </td>
78
78
79
                    <td class="recall-cancel">
79
                    <td class="recall-cancel">
80
                        [% IF ( !recall.cancellationdate && ( recall.is_requested || recall.is_overdue ) ) %]
80
                        [% IF ( !recall.cancellationdate && ( recall.is_requested || recall.is_waiting || recall.is_overdue ) ) %]
81
                            <a class="btn btn-xs btn-default" id="cancel_recall" data-id="[% recall.recall_id %]"><i class="fa fa-times"></i> Cancel</a>
81
                            <a class="btn btn-xs btn-default" id="cancel_recall" data-id="[% recall.recall_id %]"><i class="fa fa-times"></i> Cancel</a>
82
                        [% END %]
82
                        [% END %]
83
                    </td>
83
                    </td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc (-1 / +1 lines)
Lines 63-69 Link Here
63
                    </td>
63
                    </td>
64
64
65
                    <td class="recall-cancel">
65
                    <td class="recall-cancel">
66
                        [% IF ( !recall.cancellationdate && ( recall.is_requested || recall.is_overdue ) ) %]
66
                        [% IF ( !recall.cancellationdate && ( recall.is_requested || recall.is_waiting || recall.is_overdue ) ) %]
67
                            <a class="btn btn-xs btn-default" id="cancel_recall" data-id="[% recall.recall_id %]"><i class="fa fa-times"></i> Cancel</a>
67
                            <a class="btn btn-xs btn-default" id="cancel_recall" data-id="[% recall.recall_id %]"><i class="fa fa-times"></i> Cancel</a>
68
                        [% END %]
68
                        [% END %]
69
                    </td>
69
                    </td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-1 / +1 lines)
Lines 945-951 No patron matched <span class="ex">[% message | html %]</span> Link Here
945
    </li>
945
    </li>
946
946
947
    [% IF Koha.Preference('UseRecalls') && recalls.count %]
947
    [% IF Koha.Preference('UseRecalls') && recalls.count %]
948
        <li><a href="#recalls" id+"recalls-tab">[% recalls.count %] Recall(s)</a></li>
948
        <li><a href="#recalls" id="recalls-tab">[% recalls.count %] Recall(s)</a></li>
949
    [% END %]
949
    [% END %]
950
950
951
    [% IF Koha.Preference('ArticleRequests') %]
951
    [% IF Koha.Preference('ArticleRequests') %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-1 / +1 lines)
Lines 517-523 function validate1(date) { Link Here
517
            [% END %]
517
            [% END %]
518
        </li>
518
        </li>
519
        [% IF Koha.Preference('UseRecalls') && recalls.count %]
519
        [% IF Koha.Preference('UseRecalls') && recalls.count %]
520
            <li><a href="#recalls" id+"recalls-tab">[% recalls.count %] Recall(s)</a></li>
520
            <li><a href="#recalls" id="recalls-tab">[% recalls.count %] Recall(s)</a></li>
521
        [% END %]
521
        [% END %]
522
        [% IF Koha.Preference('ArticleRequests') %]
522
        [% IF Koha.Preference('ArticleRequests') %]
523
            <li>
523
            <li>
(-)a/koha-tmpl/intranet-tmpl/prog/js/recalls.js (+1 lines)
Lines 27-32 $(document).ready(function() { Link Here
27
        });
27
        });
28
28
29
        $("#recalls-table").dataTable($.extend(true, {}, dataTablesDefaults, {
29
        $("#recalls-table").dataTable($.extend(true, {}, dataTablesDefaults, {
30
            "autoWidth": false,
30
            "aoColumnDefs": [
31
            "aoColumnDefs": [
31
                { "aTargets": [ 'nosort' ], "bSortable": false, "bSearchable": false },
32
                { "aTargets": [ 'nosort' ], "bSortable": false, "bSearchable": false },
32
            ],
33
            ],
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt (-2 / +1 lines)
Lines 44-51 Link Here
44
                        <p>You will be notified when your item is waiting to be picked up at the library.</p>
44
                        <p>You will be notified when your item is waiting to be picked up at the library.</p>
45
                    [% ELSIF not error %]
45
                    [% ELSIF not error %]
46
                        <p>All borrowable material is subject to recall if checked out and needed by someone else. We will ask the person who has checked out this item to return it so you may use it.</p>
46
                        <p>All borrowable material is subject to recall if checked out and needed by someone else. We will ask the person who has checked out this item to return it so you may use it.</p>
47
                        <p><strong>Warning</strong>: Your library does not allow recalls for x item types.</p>
47
                        <hr>
48
<hr>
49
                        [% IF loggedinusername %]
48
                        [% IF loggedinusername %]
50
                            <div class="dialog">
49
                            <div class="dialog">
51
                            <p>Place a recall on [% biblio.title %] ([% biblio.author %])?</p> <a href="/cgi-bin/koha/opac-recall.pl?op=request&itemnumber=[% itemnumber %]" class="btn btn-default btn-sm">Confirm</a> &nbsp; <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber %]">Cancel</a>
50
                            <p>Place a recall on [% biblio.title %] ([% biblio.author %])?</p> <a href="/cgi-bin/koha/opac-recall.pl?op=request&itemnumber=[% itemnumber %]" class="btn btn-default btn-sm">Confirm</a> &nbsp; <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber %]">Cancel</a>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-2 / +1 lines)
Lines 855-861 Using this account is not recommended because some parts of Koha will not functi Link Here
855
                                            [% END %]
855
                                            [% END %]
856
                                        </tr>
856
                                        </tr>
857
                                    </tbody>
857
                                    </tbody>
858
                                <table>
858
                                </table>
859
                            </div>
859
                            </div>
860
                        [% END # / # RECALLS.count %]
860
                        [% END # / # RECALLS.count %]
861
861
862
- 

Return to bug 19523