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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls-reports.inc (-17 / +17 lines)
Lines 26-55 Link Here
26
                [% END %]
26
                [% END %]
27
                    <td>
27
                    <td>
28
                        [% IF recall.is_requested || recall.is_waiting || recall.is_overdue %]
28
                        [% IF recall.is_requested || recall.is_waiting || recall.is_overdue %]
29
                            <input type="checkbox" value="[% recall.recall_id %]" name="recall_ids">
29
                            <input type="checkbox" value="[% recall.recall_id | html %]" name="recall_ids">
30
                        [% ELSE %]
30
                        [% ELSE %]
31
                            &nbsp;
31
                            &nbsp;
32
                        [% END %]
32
                        [% END %]
33
                    </td>
33
                    </td>
34
                    <td class="recall-borrower">
34
                    <td class="recall-borrower">
35
                        <a class="recall-borrower" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.borrowernumber %]">
35
                        <a class="recall-borrower" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.borrowernumber | uri %]">
36
                            [% recall.patron.firstname %] [% recall.patron.surname %] ([% recall.borrowernumber %])
36
                            [% recall.patron.firstname | html %] [% recall.patron.surname | html %] ([% recall.borrowernumber | html %])
37
                        </a>
37
                        </a>
38
                    </td>
38
                    </td>
39
                    <td class="recall-title">
39
                    <td class="recall-title">
40
                        <a class="recall-title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblionumber %]">
40
                        <a class="recall-title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblionumber | uri %]">
41
                            [% recall.biblio.title %]
41
                            [% recall.biblio.title | html %]
42
                            [% FOREACH s IN recall.biblio.subtitles %]
42
                            [% FOREACH s IN recall.biblio.subtitles %]
43
                                [% s %]
43
                                [% s | html %]
44
                            [% END %]
44
                            [% END %]
45
                            [% recall.item.enumchron %]
45
                            [% recall.item.enumchron | html %]
46
                        </a>
46
                        </a>
47
                        [% recall.biblio.author %]
47
                        [% recall.biblio.author | html %]
48
                    </td>
48
                    </td>
49
49
50
                    <td class="recall-barcode">
50
                    <td class="recall-barcode">
51
                         <a class="recall-title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblionumber %]">
51
                         <a class="recall-title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblionumber | uri %]">
52
                         [% recall.item.barcode %]
52
                         [% recall.item.barcode | html %]
53
                         </a>
53
                         </a>
54
                    </td>
54
                    </td>
55
55
Lines 58-82 Link Here
58
                    </td>
58
                    </td>
59
59
60
                    <td class="recall-waiting">
60
                    <td class="recall-waiting">
61
                        [% IF recall.waitingdate %][% recall.waitingdate %][% ELSE %]Not waiting[% END %]
61
                        [% IF recall.waitingdate %][% recall.waitingdate | html %][% ELSE %]Not waiting[% END %]
62
                    </td>
62
                    </td>
63
63
64
                    <td class="recall-expiry">
64
                    <td class="recall-expiry">
65
                        [% IF ( recall.is_waiting ) %]
65
                        [% IF ( recall.is_waiting ) %]
66
                            [% IF ( recall.expirationdate ) %]
66
                            [% IF ( recall.expirationdate ) %]
67
                                [% recall.expirationdate  %]
67
                                [% recall.expirationdate | html %]
68
                            [% ELSE %]
68
                            [% ELSE %]
69
                                Never expires
69
                                Never expires
70
                            [% END %]
70
                            [% END %]
71
                        [% ELSIF ( recall.has_expired && recall.expirationdate ) %]
71
                        [% ELSIF ( recall.has_expired && recall.expirationdate ) %]
72
                            [% recall.expirationdate %]
72
                            [% recall.expirationdate | html %]
73
                        [% ELSE %]
73
                        [% ELSE %]
74
                            -
74
                            -
75
                        [% END %]
75
                        [% END %]
76
                    </td>
76
                    </td>
77
77
78
                    <td class="recall-branch">
78
                    <td class="recall-branch">
79
                        [% recall.library.branchname %]
79
                        [% recall.library.branchname | html %]
80
                    </td>
80
                    </td>
81
81
82
                    <td class="recall-status">
82
                    <td class="recall-status">
Lines 97-105 Link Here
97
97
98
                    <td class="recall-due_date">
98
                    <td class="recall-due_date">
99
                        [% IF ( recall.is_requested ) %]
99
                        [% IF ( recall.is_requested ) %]
100
                            Due to be returned by [% recall.checkout.date_due %]
100
                            Due to be returned by [% recall.checkout.date_due | html %]
101
                        [% ELSIF ( recall.is_waiting && recall.expirationdate ) %]
101
                        [% ELSIF ( recall.is_waiting && recall.expirationdate ) %]
102
                            Pick up by [% recall.expirationdate %]
102
                            Pick up by [% recall.expirationdate | html %]
103
                        [% ELSE %]
103
                        [% ELSE %]
104
                            -
104
                            -
105
                        [% END %]
105
                        [% END %]
Lines 107-113 Link Here
107
107
108
                    <td class="recall-cancel">
108
                    <td class="recall-cancel">
109
                        [% IF ( !recall.cancellationdate && ( recall.is_requested || recall.is_overdue ) ) %]
109
                        [% IF ( !recall.cancellationdate && ( recall.is_requested || recall.is_overdue ) ) %]
110
                            <a class="btn btn-xs btn-default" id="cancel_recall" data-id="[% recall.recall_id %]"><i class="fa fa-times"></i> Cancel</a>
110
                            <a class="btn btn-xs btn-default" id="cancel_recall" data-id="[% recall.recall_id | html %]"><i class="fa fa-times"></i> Cancel</a>
111
                        [% END %]
111
                        [% END %]
112
                    </td>
112
                    </td>
113
113
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc (-7 / +7 lines)
Lines 16-29 Link Here
16
            [% FOREACH recall IN recalls %]
16
            [% FOREACH recall IN recalls %]
17
                <tr>
17
                <tr>
18
                    <td class="recall-title">
18
                    <td class="recall-title">
19
                        <a class="recall-title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblionumber %]">
19
                        <a class="recall-title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblionumber | uri %]">
20
                            [% recall.biblio.title %]
20
                            [% recall.biblio.title | html %]
21
                            [% FOREACH s IN recall.biblio.subtitles %]
21
                            [% FOREACH s IN recall.biblio.subtitles %]
22
                                [% s %]
22
                                [% s | html %]
23
                            [% END %]
23
                            [% END %]
24
                            [% recall.item.enumchron %]
24
                            [% recall.item.enumchron | html %]
25
                        </a>
25
                        </a>
26
                        [% recall.biblio.author %]
26
                        [% recall.biblio.author | html %]
27
                    </td>
27
                    </td>
28
28
29
                    <td class="recall-date">
29
                    <td class="recall-date">
Lines 45-51 Link Here
45
                    </td>
45
                    </td>
46
46
47
                    <td class="recall-branch">
47
                    <td class="recall-branch">
48
                        [% recall.library.branchname %]
48
                        [% recall.library.branchname | html %]
49
                    </td>
49
                    </td>
50
50
51
                    <td class="recall-status">
51
                    <td class="recall-status">
Lines 66-72 Link Here
66
66
67
                    <td class="recall-cancel">
67
                    <td class="recall-cancel">
68
                        [% IF ( !recall.cancellationdate && ( recall.is_requested || recall.is_overdue ) ) %]
68
                        [% IF ( !recall.cancellationdate && ( recall.is_requested || recall.is_overdue ) ) %]
69
                            <a class="btn btn-xs btn-default" id="cancel_recall" data-id="[% recall.recall_id %]"><i class="fa fa-times"></i> Cancel</a>
69
                            <a class="btn btn-xs btn-default" id="cancel_recall" data-id="[% recall.recall_id | html %]"><i class="fa fa-times"></i> Cancel</a>
70
                        [% END %]
70
                        [% END %]
71
                    </td>
71
                    </td>
72
72
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (-2 / +2 lines)
Lines 214-222 Link Here
214
                                                                <span>Don't allow</span>
214
                                                                <span>Don't allow</span>
215
                                                            [% END %]
215
                                                            [% END %]
216
                                                        </td>
216
                                                        </td>
217
                                                        <td>[% rule.recall_due_date_interval %]</td>
217
                                                        <td>[% rule.recall_due_date_interval | html %]</td>
218
                                                        <td>[% rule.recall_overdue_fine FILTER format("%.2f") %]</td>
218
                                                        <td>[% rule.recall_overdue_fine FILTER format("%.2f") %]</td>
219
                                                        <td>[% rule.recall_shelf_time %]</td>
219
                                                        <td>[% rule.recall_shelf_time | html %]</td>
220
                                                        <td>
220
                                                        <td>
221
                                                            [% IF rule.article_requests == 'no' %]
221
                                                            [% IF rule.article_requests == 'no' %]
222
                                                                <span>No</span>
222
                                                                <span>No</span>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-1 / +1 lines)
Lines 489-495 Link Here
489
                            [% END %]
489
                            [% END %]
490
                        [% END %]
490
                        [% END %]
491
                        [% IF ( item.recalled ) %]
491
                        [% IF ( item.recalled ) %]
492
                            Item recalled (placed [% item.recall.recalldate | $KohaDates %]) by <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.recall.borrowernumber %]">[% item.recall.patron.firstname %] [% item.recall.patron.surname %] ([% item.recall.patron.cardnumber %])</a>
492
                            Item recalled (placed [% item.recall.recalldate | $KohaDates %]) by <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.recall.borrowernumber | uri %]">[% item.recall.patron.firstname | html %] [% item.recall.patron.surname | html %] ([% item.recall.patron.cardnumber | html %])</a>
493
                            [% END %]
493
                            [% END %]
494
                            [% UNLESS ( item.itemnotforloan || item.notforloan_per_itemtype || item.onloan || item.itemlost || item.withdrawn || item.damaged || item.transfertwhen || item.reservedate || item.recalled ) %]
494
                            [% UNLESS ( item.itemnotforloan || item.notforloan_per_itemtype || item.onloan || item.itemlost || item.withdrawn || item.damaged || item.transfertwhen || item.reservedate || item.recalled ) %]
495
                            Available
495
                            Available
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-1 / +1 lines)
Lines 828-834 No patron matched <span class="ex">[% message | html %]</span> Link Here
828
    </li>
828
    </li>
829
829
830
    [% IF Koha.Preference('UseRecalls') && recalls.count %]
830
    [% IF Koha.Preference('UseRecalls') && recalls.count %]
831
        <li><a href="#recalls" id="recalls-tab">[% recalls.count %] Recall(s)</a></li>
831
        <li><a href="#recalls" id="recalls-tab">[% recalls.count | html %] Recall(s)</a></li>
832
    [% END %]
832
    [% END %]
833
833
834
    [% IF Koha.Preference('ArticleRequests') %]
834
    [% IF Koha.Preference('ArticleRequests') %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recall-pickup-slip.tt (-5 / +6 lines)
Lines 1-13 Link Here
1
[% USE raw %]
1
[% USE Asset %]
2
[% USE Asset %]
2
[% USE Koha %]
3
[% USE Koha %]
3
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
4
<title>Koha &rsaquo; Circulation &rsaquo; Recall print receipt</title>
5
<title>Koha &rsaquo; Circulation &rsaquo; Recall print receipt</title>
5
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
6
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
7
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
7
<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" />
8
<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon | url %][% ELSE %][% interface | url %]/[% theme | uri %]/img/favicon.ico[% END %]" type="image/x-icon" />
8
[% Asset.css("css/print.css") %]
9
[% Asset.css("css/print.css") | $raw %]
9
[% IF ( Koha.Preference('SlipCSS') ) %]
10
[% IF ( Koha.Preference('SlipCSS') ) %]
10
<link rel="stylesheet" type="text/css" href="[% Koha.Preference('SlipCSS') %]" />
11
<link rel="stylesheet" type="text/css" href="[% Koha.Preference('SlipCSS') | url %]" />
11
[% END %]
12
[% END %]
12
13
13
[% INCLUDE 'slip-print.inc' #printThenClose %]
14
[% INCLUDE 'slip-print.inc' #printThenClose %]
Lines 17-26 Link Here
17
18
18
[% IF plain %]
19
[% IF plain %]
19
<pre>
20
<pre>
20
[% IF ( slip ) %][% slip %][% ELSE %]No slip template found[% END %]
21
[% IF ( slip ) %][% slip | html %][% ELSE %]No slip template found[% END %]
21
</pre>
22
</pre>
22
[% ELSE %]
23
[% ELSE %]
23
[% IF ( slip ) %][% slip %][% ELSE %]No slip template found[% END %]
24
[% IF ( slip ) %][% slip | html %][% ELSE %]No slip template found[% END %]
24
[% END %]
25
[% END %]
25
26
26
[% INCLUDE 'intranet-bottom.inc' %]
27
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_overdue.tt (-15 / +16 lines)
Lines 1-3 Link Here
1
[% USE raw %]
1
[% USE Asset %]
2
[% USE Asset %]
2
[% USE Koha %]
3
[% USE Koha %]
3
[% USE KohaDates %]
4
[% USE KohaDates %]
Lines 5-12 Link Here
5
<title>Koha &rsaquo; Circulation &rsaquo; Overdue recalls</title>
6
<title>Koha &rsaquo; Circulation &rsaquo; Overdue recalls</title>
6
[% INCLUDE 'doc-head-close.inc' %]
7
[% INCLUDE 'doc-head-close.inc' %]
7
<style type="text/css"> p { margin-top: 0; }</style>
8
<style type="text/css"> p { margin-top: 0; }</style>
8
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
9
<link rel="stylesheet" type="text/css" href="[% interface | url %]/[% theme | uri %]/css/datatables.css" />
9
[% Asset.js("js/recalls.js") %]
10
[% Asset.js("js/recalls.js") | $raw %]
10
[% INCLUDE 'datatables.inc' %]
11
[% INCLUDE 'datatables.inc' %]
11
[% INCLUDE 'columns_settings.inc' %]
12
[% INCLUDE 'columns_settings.inc' %]
12
</head>
13
</head>
Lines 55-93 Link Here
55
                                    [% FOREACH recall IN recalls %]
56
                                    [% FOREACH recall IN recalls %]
56
                                        <tr>
57
                                        <tr>
57
                                            <td>
58
                                            <td>
58
                                                <input type="checkbox" value="[% recall.recall_id %]" name="recall_ids">
59
                                                <input type="checkbox" value="[% recall.recall_id | html %]" name="recall_ids">
59
                                            </td>
60
                                            </td>
60
                                            <td class="recall-borrower">
61
                                            <td class="recall-borrower">
61
                                                <a class="recall-borrower" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.borrowernumber %]">
62
                                                <a class="recall-borrower" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.borrowernumber | uri %]">
62
                                                    [% recall.patron.firstname %] [% recall.patron.surname %] ([% recall.borrowernumber %])
63
                                                    [% recall.patron.firstname | html %] [% recall.patron.surname | html %] ([% recall.borrowernumber | html %])
63
                                                </a>
64
                                                </a>
64
                                            </td>
65
                                            </td>
65
                                            <td class="recall-title">
66
                                            <td class="recall-title">
66
                                                <a class="recall-title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblionumber %]">
67
                                                <a class="recall-title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblionumber | uri %]">
67
                                                    [% recall.biblio.title %]
68
                                                    [% recall.biblio.title | html %]
68
                                                    [% FOREACH s IN recall.biblio.subtitles %]
69
                                                    [% FOREACH s IN recall.biblio.subtitles %]
69
                                                        [% s %]
70
                                                        [% s | html %]
70
                                                    [% END %]
71
                                                    [% END %]
71
                                                    [% recall.item.enumchron %]
72
                                                    [% recall.item.enumchron | html %]
72
                                                </a>
73
                                                </a>
73
                                                [% recall.biblio.author %]
74
                                                [% recall.biblio.author | html %]
74
                                            </td>
75
                                            </td>
75
                                            <td class="recall-date">
76
                                            <td class="recall-date">
76
                                                [% recall.recalldate | $KohaDates %]
77
                                                [% recall.recalldate | $KohaDates %]
77
                                            </td>
78
                                            </td>
78
                                            <td class="recall-due">
79
                                            <td class="recall-due">
79
                                                [% recall.checkout.date_due %]
80
                                                [% recall.checkout.date_due | html %]
80
                                            </td>
81
                                            </td>
81
                                            <td class="recall-current-borrower">
82
                                            <td class="recall-current-borrower">
82
                                                <a class="recall-current-borrower" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.checkout.borrowernumber %]">
83
                                                <a class="recall-current-borrower" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.checkout.borrowernumber | uri %]">
83
                                                    [% recall.checkout.patron.firstname %] [% recall.checkout.patron.surname %] ([% recall.checkout.borrowernumber %])
84
                                                    [% recall.checkout.patron.firstname | html %] [% recall.checkout.patron.surname | html %] ([% recall.checkout.borrowernumber | html %])
84
                                                </a>
85
                                                </a>
85
                                            </td>
86
                                            </td>
86
                                            <td class="recall-branch">
87
                                            <td class="recall-branch">
87
                                                [% recall.library.branchname %]
88
                                                [% recall.library.branchname | html %]
88
                                            </td>
89
                                            </td>
89
                                            <td class="recall-cancel">
90
                                            <td class="recall-cancel">
90
                                                <a class="btn btn-xs btn-default" id="cancel_recall" data-id="[% recall.recall_id %]"><i class="fa fa-times"></i> Cancel</a>
91
                                                <a class="btn btn-xs btn-default" id="cancel_recall" data-id="[% recall.recall_id | html %]"><i class="fa fa-times"></i> Cancel</a>
91
                                            </td>
92
                                            </td>
92
                                        </tr>
93
                                        </tr>
93
                                    [% END %]
94
                                    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_queue.tt (-2 / +3 lines)
Lines 1-3 Link Here
1
[% USE raw %]
1
[% USE Asset %]
2
[% USE Asset %]
2
[% USE Koha %]
3
[% USE Koha %]
3
[% USE KohaDates %]
4
[% USE KohaDates %]
Lines 6-12 Link Here
6
<title>Koha &rsaquo; Circulation &rsaquo; Recalls queue</title>
7
<title>Koha &rsaquo; Circulation &rsaquo; Recalls queue</title>
7
[% INCLUDE 'doc-head-close.inc' %]
8
[% INCLUDE 'doc-head-close.inc' %]
8
<style type="text/css"> p { margin-top: 0; }</style>
9
<style type="text/css"> p { margin-top: 0; }</style>
9
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
10
<link rel="stylesheet" type="text/css" href="[% interface | url %]/[% theme | uri %]/css/datatables.css" />
10
</head>
11
</head>
11
<body id="circ_recalls_queue" class="circ">
12
<body id="circ_recalls_queue" class="circ">
12
[% INCLUDE 'header.inc' %]
13
[% INCLUDE 'header.inc' %]
Lines 59-65 Link Here
59
[% MACRO jsinclude BLOCK %]
60
[% MACRO jsinclude BLOCK %]
60
    [% INCLUDE 'datatables.inc' %]
61
    [% INCLUDE 'datatables.inc' %]
61
    [% INCLUDE 'columns_settings.inc' %]
62
    [% INCLUDE 'columns_settings.inc' %]
62
    [% Asset.js("js/recalls.js") %]
63
    [% Asset.js("js/recalls.js") | $raw %]
63
    <script type="text/javascript">
64
    <script type="text/javascript">
64
    $(document).ready(function() {
65
    $(document).ready(function() {
65
            $(".old").hide();
66
            $(".old").hide();
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_waiting.tt (-27 / +28 lines)
Lines 1-3 Link Here
1
[% USE raw %]
1
[% USE Asset %]
2
[% USE Asset %]
2
[% USE Koha %]
3
[% USE Koha %]
3
[% USE KohaDates %]
4
[% USE KohaDates %]
Lines 5-12 Link Here
5
<title>Koha &rsaquo; Circulation &rsaquo; Recalls awaiting pickup</title>
6
<title>Koha &rsaquo; Circulation &rsaquo; Recalls awaiting pickup</title>
6
[% INCLUDE 'doc-head-close.inc' %]
7
[% INCLUDE 'doc-head-close.inc' %]
7
<style type="text/css"> p { margin-top: 0; }</style>
8
<style type="text/css"> p { margin-top: 0; }</style>
8
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
9
<link rel="stylesheet" type="text/css" href="[% interface | url %]/[% theme | uri %]/css/datatables.css" />
9
[% Asset.js("js/recalls.js") %]
10
[% Asset.js("js/recalls.js") | $raw %]
10
[% INCLUDE 'datatables.inc' %]
11
[% INCLUDE 'datatables.inc' %]
11
<script type="text/javascript">
12
<script type="text/javascript">
12
    $(document).ready(function() {
13
    $(document).ready(function() {
Lines 46-53 Link Here
46
                <div id="results" class="toptabs">
47
                <div id="results" class="toptabs">
47
48
48
                    <ul>
49
                    <ul>
49
                        <li><a href="#recallswaiting">Recalls waiting: [% recalls.size %]</a></li>
50
                        <li><a href="#recallswaiting">Recalls waiting: [% recalls.size | html %]</a></li>
50
                        <li><a href="#recallsover">Recalls waiting over [% Koha.Preference('RecallsMaxPickUpDelay') %] days: [% over.size %]</a></li>
51
                        <li><a href="#recallsover">Recalls waiting over [% Koha.Preference('RecallsMaxPickUpDelay') | html %] days: [% over.size | html %]</a></li>
51
                    </ul>
52
                    </ul>
52
53
53
                    <div id="recallswaiting">
54
                    <div id="recallswaiting">
Lines 64-88 Link Here
64
                                    [% FOREACH recall IN recalls %]<tr>
65
                                    [% FOREACH recall IN recalls %]<tr>
65
                                        <td>[% recall.waitingdate | $KohaDates %]</td>
66
                                        <td>[% recall.waitingdate | $KohaDates %]</td>
66
                                        <td>
67
                                        <td>
67
                                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblionumber %]">
68
                                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblionumber | uri %]">
68
                                                [% recall.biblio.title %]
69
                                                [% recall.biblio.title | html %]
69
                                                [% FOREACH s IN recall.biblio.subtitles %]
70
                                                [% FOREACH s IN recall.biblio.subtitles %]
70
                                                    [% s %]
71
                                                    [% s | html %]
71
                                                [% END %]
72
                                                [% END %]
72
                                                [% recall.item.enumchron %]
73
                                                [% recall.item.enumchron | html %]
73
                                            </a>
74
                                            </a>
74
                                            [% recall.biblio.author %]
75
                                            [% recall.biblio.author | html %]
75
                                            <br><i>Barcode: [% recall.item.barcode %]</i>
76
                                            <br><i>Barcode: [% recall.item.barcode | html %]</i>
76
                                        </td>
77
                                        </td>
77
                                        <td>
78
                                        <td>
78
                                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.borrowernumber %]">[% recall.patron.firstname %] [% recall.patron.surname %]</a>
79
                                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.borrowernumber | uri %]">[% recall.patron.firstname | html %] [% recall.patron.surname | html %]</a>
79
                                            [% IF ( recall.patron.phone ) %]<br />[% recall.patron.phone %][% END %]
80
                                            [% IF ( recall.patron.phone ) %]<br />[% recall.patron.phone | html %][% END %]
80
                                            [% IF ( recall.patron.email ) %]<br /><a href="mailto:[% recall.patron.email %]?subject=Recall waiting: [% recall.biblio.title %]">[% recall.patron.email %]</a>[% END %]
81
                                            [% IF ( recall.patron.email ) %]<br /><a href="mailto:[% recall.patron.email | uri %]?subject=Recall waiting: [% recall.biblio.title | uri %]">[% recall.patron.email | html %]</a>[% END %]
81
                                        </td>
82
                                        </td>
82
                                        <td>[% recall.library.branchname %]</td>
83
                                        <td>[% recall.library.branchname | html %]</td>
83
                                        <td>
84
                                        <td>
84
                                            <form action="/cgi-bin/koha/circ/recalls_waiting.pl" method="post">
85
                                            <form action="/cgi-bin/koha/circ/recalls_waiting.pl" method="post">
85
                                                <input type="hidden" name="recall_id" value="[% recall.recall_id %]">
86
                                                <input type="hidden" name="recall_id" value="[% recall.recall_id | html %]">
86
                                                <input type="hidden" name="op" value="expire_recall">
87
                                                <input type="hidden" name="op" value="expire_recall">
87
                                                <fieldset class="action">
88
                                                <fieldset class="action">
88
                                                    <button type="submit" class="btn btn-default btn-xs" id="expire_recall"><i class="fa fa-times"></i> Expire</button>
89
                                                    <button type="submit" class="btn btn-default btn-xs" id="expire_recall"><i class="fa fa-times"></i> Expire</button>
Lines 99-105 Link Here
99
100
100
                    <div id="recallsover">
101
                    <div id="recallsover">
101
                        [% IF ( over.size > 0 ) %]
102
                        [% IF ( over.size > 0 ) %]
102
                            [% IF ( Koha.Preference('RecallsMaxPickUpDelay') ) %]<p>Recalls listed here have been awaiting pickup for more than [% Koha.Preference('RecallsMaxPickUpDelay') %] days.</p>[% END %]
103
                            [% IF ( Koha.Preference('RecallsMaxPickUpDelay') ) %]<p>Recalls listed here have been awaiting pickup for more than [% Koha.Preference('RecallsMaxPickUpDelay') | html %] days.</p>[% END %]
103
                            <table id="recallsover-table">
104
                            <table id="recallsover-table">
104
                                <thead><tr>
105
                                <thead><tr>
105
                                    <th class="title-string">Available since</th>
106
                                    <th class="title-string">Available since</th>
Lines 112-136 Link Here
112
                                    [% FOREACH recall IN over %]<tr>
113
                                    [% FOREACH recall IN over %]<tr>
113
                                        <td>[% recall.waitingdate | $KohaDates %]</td>
114
                                        <td>[% recall.waitingdate | $KohaDates %]</td>
114
                                        <td>
115
                                        <td>
115
                                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblionumber %]">
116
                                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblionumber | uri %]">
116
                                                [% recall.biblio.title %]
117
                                                [% recall.biblio.title | html %]
117
                                                [% FOREACH s IN recall.biblio.subtitles %]
118
                                                [% FOREACH s IN recall.biblio.subtitles %]
118
                                                    [% s %]
119
                                                    [% s | html %]
119
                                                [% END %]
120
                                                [% END %]
120
                                                [% recall.item.enumchron %]
121
                                                [% recall.item.enumchron | html %]
121
                                            </a>
122
                                            </a>
122
                                            [% recall.biblio.author %]
123
                                            [% recall.biblio.author | html %]
123
                                            <br><i>Barcode: [% recall.item.barcode %]</i>
124
                                            <br><i>Barcode: [% recall.item.barcode | html %]</i>
124
                                        </td>
125
                                        </td>
125
                                        <td>
126
                                        <td>
126
                                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.borrowernumber %]">[% recall.patron.firstname %] [% recall.patron.surname %]</a>
127
                                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.borrowernumber | uri %]">[% recall.patron.firstname | html %] [% recall.patron.surname | html %]</a>
127
                                            [% IF ( recall.patron.phone ) %]<br />[% recall.patron.phone %][% END %]
128
                                            [% IF ( recall.patron.phone ) %]<br />[% recall.patron.phone | html %][% END %]
128
                                            [% IF ( recall.patron.email ) %]<br /><a href="mailto:[% recall.patron.email %]?subject=Recall waiting: [% recall.biblio.title %]">[% recall.patron.email %]</a>[% END %]
129
                                            [% IF ( recall.patron.email ) %]<br /><a href="mailto:[% recall.patron.email | uri %]?subject=Recall waiting: [% recall.biblio.title | uri %]">[% recall.patron.email | html %]</a>[% END %]
129
                                        </td>
130
                                        </td>
130
                                        <td>[% recall.library.branchname %]</td>
131
                                        <td>[% recall.library.branchname | html %]</td>
131
                                        <td>
132
                                        <td>
132
                                            <form action="/cgi-bin/koha/circ/recalls_waiting.pl" method="post">
133
                                            <form action="/cgi-bin/koha/circ/recalls_waiting.pl" method="post">
133
                                                <input type="hidden" name="recall_id" value="[% recall.recall_id %]">
134
                                                <input type="hidden" name="recall_id" value="[% recall.recall_id | html %]">
134
                                                <input type="hidden" name="op" value="expire_recall">
135
                                                <input type="hidden" name="op" value="expire_recall">
135
                                                <fieldset class="action">
136
                                                <fieldset class="action">
136
                                                    <button type="submit" class="btn btn-default btn-xs" id="expire_recall"><i class="fa fa-times"></i> Expire</button>
137
                                                    <button type="submit" class="btn btn-default btn-xs" id="expire_recall"><i class="fa fa-times"></i> Expire</button>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-22 / +22 lines)
Lines 74-80 Link Here
74
                        [% IF ( transfertodo ) %]
74
                        [% IF ( transfertodo ) %]
75
                            [% patron.email | html %]
75
                            [% patron.email | html %]
76
                        [% ELSE %]
76
                        [% ELSE %]
77
                            <a id="boremail" href="mailto:[% patron.email | html %]">[% patron.email | html %]</a>
77
                            <a id="boremail" href="mailto:[% patron.email | uri %]">[% patron.email | html %]</a>
78
                        [% END %]
78
                        [% END %]
79
                    </li>
79
                    </li>
80
                [% END %]
80
                [% END %]
Lines 176-190 Link Here
176
        <!-- WrongTransfer -->
176
        <!-- WrongTransfer -->
177
        <h3>Please return item to: [% Branches.GetName( TransferWaitingAt ) | html %]</h3>
177
        <h3>Please return item to: [% Branches.GetName( TransferWaitingAt ) | html %]</h3>
178
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% itembarcode | html %]: [% title | html %]</a></p>
178
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% itembarcode | html %]: [% title | html %]</a></p>
179
        <button type="submit" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&amp;&amp;branchcode=[% TransferWaitingAt | html %]&amp;op=slip"><i class="fa fa-print"></i> Print transfer slip</button>
179
        <button type="submit" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | uri %]&amp;&amp;branchcode=[% TransferWaitingAt | uri %]&amp;op=slip"><i class="fa fa-print"></i> Print transfer slip</button>
180
        <button class="deny" type="submit" onclick="window.location.href='/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber | html %]&amp;canceltransfer=1'"><i class="fa fa-times"></i> Cancel transfer</button>
180
        <button class="deny" type="submit" onclick="window.location.href='/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber | uri %]&amp;canceltransfer=1'"><i class="fa fa-times"></i> Cancel transfer</button>
181
[% IF ( patron.cardnumber ) %]<h5>Hold for:</h5>
181
[% IF ( patron.cardnumber ) %]<h5>Hold for:</h5>
182
        <ul>
182
        <ul>
183
            <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">
183
            <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">
184
            [% patron.surname | html %], [% patron.firstname | html %]</a> ([% patron.cardnumber | html %]) <span class="patron-category"> - [% patron.category.description | html %]</span> </li>
184
            [% patron.surname | html %], [% patron.firstname | html %]</a> ([% patron.cardnumber | html %]) <span class="patron-category"> - [% patron.category.description | html %]</span> </li>
185
            [% INCLUDE display_holdpatron_address %]
185
            [% INCLUDE display_holdpatron_address %]
186
            [% IF ( patron.phone ) %]<li>[% patron.phone | html %]</li>[% END %]
186
            [% IF ( patron.phone ) %]<li>[% patron.phone | html %]</li>[% END %]
187
            [% IF ( patron.email ) %]<li><a id="boremail" href="mailto:[% patron.email | html %]">[% patron.email | html %]</a></li>[% END %]
187
            [% IF ( patron.email ) %]<li><a id="boremail" href="mailto:[% patron.email | uri %]">[% patron.email | html %]</a></li>[% END %]
188
        </ul>
188
        </ul>
189
189
190
    <form method="post" action="returns.pl" class="confirm">
190
    <form method="post" action="returns.pl" class="confirm">
Lines 235-241 Link Here
235
                    [% END %]
235
                    [% END %]
236
236
237
                    [% IF ( patron.email ) %]
237
                    [% IF ( patron.email ) %]
238
                        <li><a id="boremail" href="mailto:[% patron.email | html %]">[% patron.email | html %]</a></li>
238
                        <li><a id="boremail" href="mailto:[% patron.email | uri %]">[% patron.email | html %]</a></li>
239
                    [% END %]
239
                    [% END %]
240
240
241
                    [% IF ( patron.debarred ) %]
241
                    [% IF ( patron.debarred ) %]
Lines 515-544 Link Here
515
            <div class="modal-content">
515
            <div class="modal-content">
516
            <form method="post" action="/cgi-bin/koha/circ/returns.pl" class="confirm">
516
            <form method="post" action="/cgi-bin/koha/circ/returns.pl" class="confirm">
517
                <div class="modal-header">
517
                <div class="modal-header">
518
                    <h3>Recall found  [% IF transfer_recall %] needing transfer to [% Branches.GetName( recall.branchcode ) %][% END %]: <br/>
518
                    <h3>Recall found  [% IF transfer_recall %] needing transfer to [% Branches.GetName( recall.branchcode ) | html %][% END %]: <br/>
519
                        <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %] </a>
519
                        <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% itembarcode |html %]: [% title |html %] </a>
520
                    </h3>
520
                    </h3>
521
                </div>
521
                </div>
522
522
523
                <div class="modal-body">
523
                <div class="modal-body">
524
                    [% IF ( recallnotes ) %]
524
                    [% IF ( recallnotes ) %]
525
                        <h4>Notes: [% recall.recallnotes %]</h4>
525
                        <h4>Notes: [% recall.recallnotes | html %]</h4>
526
                    [% END %]
526
                    [% END %]
527
                    <h5>This item has been recalled by:</h5>
527
                    <h5>This item has been recalled by:</h5>
528
                    <li>
528
                    <li>
529
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.surname %], [% patron.firstname %]</a>
529
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.surname | html %], [% patron.firstname | html %]</a>
530
                        ([% patron.cardnumber %])
530
                        ([% patron.cardnumber | html %])
531
                        <span class="patron-category"> - [% patron.category.description %]</span>
531
                        <span class="patron-category"> - [% patron.category.description | html %]</span>
532
                    </li>
532
                    </li>
533
533
534
                    [% INCLUDE display_holdpatron_address %]
534
                    [% INCLUDE display_holdpatron_address %]
535
535
536
                    [% IF ( patron.phone ) %]
536
                    [% IF ( patron.phone ) %]
537
                        <li>[% patron.phone %]</li>
537
                        <li>[% patron.phone | html %]</li>
538
                    [% END %]
538
                    [% END %]
539
539
540
                    [% IF ( patron.email ) %]
540
                    [% IF ( patron.email ) %]
541
                        <li><a id="boremail" href="mailto:[% patron.email %]">[% patron.email %]</a></li>
541
                        <li><a id="boremail" href="mailto:[% patron.email | html %]">[% patron.email | html %]</a></li>
542
                    [% END %]
542
                    [% END %]
543
543
544
                    [% IF ( patron.debarred ) %]
544
                    [% IF ( patron.debarred ) %]
Lines 550-565 Link Here
550
                    [% END %]
550
                    [% END %]
551
551
552
                    <h4>
552
                    <h4>
553
                    [% IF transfer_recall %]Transfer to [% Branches.GetName( recall.branchcode ) %]
553
                    [% IF transfer_recall %]Transfer to [% Branches.GetName( recall.branchcode ) | html %]
554
                    [% ELSIF recall.status == 'W' %]Hold for pickup (already waiting) at [% recall.library.branchname %]
554
                    [% ELSIF recall.status == 'W' %]Hold for pickup (already waiting) at [% recall.library.branchname | html %]
555
                    [% ELSE %]Hold for pickup at [% recall.library.branchname %][% END %]
555
                    [% ELSE %]Hold for pickup at [% recall.library.branchname | html %][% END %]
556
                    </h4>
556
                    </h4>
557
557
558
                    <input type="hidden" name="itemnumber" value="[% recall.itemnumber %]" />
558
                    <input type="hidden" name="itemnumber" value="[% recall.itemnumber | html %]" />
559
                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
559
                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
560
                    <input type="hidden" name="biblionumber" value="[% itembiblionumber %]" />
560
                    <input type="hidden" name="biblionumber" value="[% itembiblionumber | html %]" />
561
                    <input type="hidden" name="recall_id" value="[% recall.recall_id %]" />
561
                    <input type="hidden" name="recall_id" value="[% recall.recall_id | html %]" />
562
                    <input type="hidden" name="diffBranch" value="[% recall.branchcode %]" />
562
                    <input type="hidden" name="diffBranch" value="[% recall.branchcode | html %]" />
563
                    <input type="hidden" name="print_recall_slip" value="0" />
563
                    <input type="hidden" name="print_recall_slip" value="0" />
564
                </div>
564
                </div>
565
565
Lines 846-852 Link Here
846
                Dopop('hold-transfer-slip.pl?borrowernumber=[% patron.borrowernumber | html %]&amp;biblionumber=[% biblionumber | html %]');
846
                Dopop('hold-transfer-slip.pl?borrowernumber=[% patron.borrowernumber | html %]&amp;biblionumber=[% biblionumber | html %]');
847
            });
847
            });
848
            [% IF print_recall_slip %]
848
            [% IF print_recall_slip %]
849
                Dopop('recall-pickup-slip.pl?borrowernumber=[% borrowernumber %]&amp;biblionumber=[% biblionumber %]&amp;recall_id=[% recall_id %]')    ;
849
                Dopop('recall-pickup-slip.pl?borrowernumber=[% borrowernumber | html %]&amp;biblionumber=[% biblionumber | html %]&amp;recall_id=[% recall_id | html %]')    ;
850
            [% END %]
850
            [% END %]
851
851
852
            [% IF print_slip %]
852
            [% IF print_slip %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-1 / +1 lines)
Lines 662-668 Link Here
662
                                </li>
662
                                </li>
663
                            [% END %]
663
                            [% END %]
664
                            [% IF Koha.Preference('UseRecalls') && recalls.count %]
664
                            [% IF Koha.Preference('UseRecalls') && recalls.count %]
665
                                <li><a href="#recalls" id="recalls-tab">[% recalls.count %] Recall(s)</a></li>
665
                                <li><a href="#recalls" id="recalls-tab">[% recalls.count | html %] Recall(s)</a></li>
666
                            [% END %]
666
                            [% END %]
667
                            [% IF Koha.Preference('ArticleRequests') %]
667
                            [% IF Koha.Preference('ArticleRequests') %]
668
                                <li>
668
                                <li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt (-2 / +3 lines)
Lines 1-12 Link Here
1
[% USE raw %]
1
[% USE Asset %]
2
[% USE Asset %]
2
[% USE KohaDates %]
3
[% USE KohaDates %]
3
[% USE Koha %]
4
[% USE Koha %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
[% INCLUDE 'doc-head-open.inc' %]
5
<title>Recalls history for [% INCLUDE 'patron-title.inc' %]</title>
6
<title>Recalls history for [% INCLUDE 'patron-title.inc' %]</title>
6
[% INCLUDE 'doc-head-close.inc' %]
7
[% INCLUDE 'doc-head-close.inc' %]
7
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
8
<link rel="stylesheet" type="text/css" href="[% interface | url %]/[% theme | uri %]/css/datatables.css" />
8
[% INCLUDE 'datatables.inc' %]
9
[% INCLUDE 'datatables.inc' %]
9
[% Asset.js("js/recalls.js") %]
10
[% Asset.js("js/recalls.js") | $raw %]
10
</head>
11
</head>
11
<body id="recalls_history" class="pat">
12
<body id="recalls_history" class="pat">
12
[% INCLUDE 'header.inc' %]
13
[% INCLUDE 'header.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc (-1 / +1 lines)
Lines 38-44 Link Here
38
            <span class="item-status checkedout">Checked out</span>
38
            <span class="item-status checkedout">Checked out</span>
39
        [% END %]
39
        [% END %]
40
    [% END %]
40
    [% END %]
41
    [% IF item.avail_for_recall %]<a href="/cgi-bin/koha/opac-recall.pl?itemnumber=[% item.itemnumber %]" class="btn btn-default btn-xs">Recall</a>[% END %]
41
    [% IF item.avail_for_recall %]<a href="/cgi-bin/koha/opac-recall.pl?itemnumber=[% item.itemnumber | uri %]" class="btn btn-default btn-xs">Recall</a>[% END %]
42
[% END %]
42
[% END %]
43
43
44
[% IF NOT ( item.isa('Koha::Item') ) AND item.transfertwhen %] [%# transfertwhen is set in C4::Search, do not have it for course reserves %]
44
[% IF NOT ( item.isa('Koha::Item') ) AND item.transfertwhen %] [%# transfertwhen is set in C4::Search, do not have it for course reserves %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt (-5 / +5 lines)
Lines 1-7 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE KohaDates %]
2
[% USE KohaDates %]
3
[% INCLUDE 'doc-head-open.inc' %]
3
[% INCLUDE 'doc-head-open.inc' %]
4
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Recall</title>
4
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Recall</title>
5
[% INCLUDE 'doc-head-close.inc' %]
5
[% INCLUDE 'doc-head-close.inc' %]
6
[% BLOCK cssinclude %][% END %]
6
[% BLOCK cssinclude %][% END %]
7
</head>
7
</head>
Lines 11-18 Link Here
11
<div class="main">
11
<div class="main">
12
    <ul class="breadcrumb">
12
    <ul class="breadcrumb">
13
        <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
13
        <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
14
        <li><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber %]">Details for: [% biblio.title %]</a> <span class="divider">&rsaquo;</span></li>
14
        <li><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | uri %]">Details for: [% biblio.title | html %]</a> <span class="divider">&rsaquo;</span></li>
15
        <li><a href="/cgi-bin/koha/opac-recall.pl?itemnumber=[% itemnumber %]">Recall item</a></li>
15
        <li><a href="/cgi-bin/koha/opac-recall.pl?itemnumber=[% itemnumber | uri %]">Recall item</a></li>
16
    </ul>
16
    </ul>
17
17
18
    <div class="container-fluid">
18
    <div class="container-fluid">
Lines 43-56 Link Here
43
                    [% END %]
43
                    [% END %]
44
44
45
                    [% IF success %]
45
                    [% IF success %]
46
                        <p>Your recall has been placed. The user the item is currently checked out to has been asked to return the item within [% due_interval %] [% due_unit %], on [% due_date | $KohaDates %].</p>
46
                        <p>Your recall has been placed. The user the item is currently checked out to has been asked to return the item within [% due_interval | html %] [% due_unit | html %], on [% due_date | $KohaDates %].</p>
47
                        <p>You will be notified when your item is waiting to be picked up at the library.</p>
47
                        <p>You will be notified when your item is waiting to be picked up at the library.</p>
48
                    [% ELSIF not error %]
48
                    [% ELSIF not error %]
49
                        <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>
49
                        <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>
50
<hr>
50
<hr>
51
                        [% IF loggedinusername %]
51
                        [% IF loggedinusername %]
52
                            <div class="dialog">
52
                            <div class="dialog">
53
                            <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>
53
                            <p>Place a recall on [% biblio.title | html %] ([% biblio.author | html %])?</p> <a href="/cgi-bin/koha/opac-recall.pl?op=request&itemnumber=[% itemnumber | uri %]" class="btn btn-default btn-sm">Confirm</a> &nbsp; <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | uri %]">Cancel</a>
54
                            </div>
54
                            </div>
55
                        [% ELSE %]
55
                        [% ELSE %]
56
                            <div class="dialog alert">You must be logged in to place a recall.</div>
56
                            <div class="dialog alert">You must be logged in to place a recall.</div>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt (-13 / +13 lines)
Lines 2-8 Link Here
2
[% USE KohaDates %]
2
[% USE KohaDates %]
3
3
4
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your recalls history</title>
5
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your recalls history</title>
6
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
7
[% BLOCK cssinclude %][% END %]
7
[% BLOCK cssinclude %][% END %]
8
</head>
8
</head>
Lines 46-62 Link Here
46
                                    [% FOREACH RECALL IN RECALLS %]
46
                                    [% FOREACH RECALL IN RECALLS %]
47
                                        <tr>
47
                                        <tr>
48
                                            <td class="title">
48
                                            <td class="title">
49
                                                <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% RECALL.biblionumber %]">
49
                                                <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% RECALL.biblionumber | uri %]">
50
                                                    [% RECALL.biblio.title %]
50
                                                    [% RECALL.biblio.title | html %]
51
                                                    [% FOREACH s IN RECALL.biblio.subtitles %]
51
                                                    [% FOREACH s IN RECALL.biblio.subtitles %]
52
                                                        [% s %]
52
                                                        [% s | html %]
53
                                                    [% END %]
53
                                                    [% END %]
54
                                                    [% RECALL.item.enumchron %]
54
                                                    [% RECALL.item.enumchron | html %]
55
                                                </a>
55
                                                </a>
56
                                                [% RECALL.biblio.author %]
56
                                                [% RECALL.biblio.author | html %]
57
                                            </td>
57
                                            </td>
58
                                            <td class="recalldate">
58
                                            <td class="recalldate">
59
                                                <span title="[% RECALL.recalldate %]">
59
                                                <span title="[% RECALL.recalldate | html %]">
60
                                                    <span class="tdlabel">Recall date:</span>
60
                                                    <span class="tdlabel">Recall date:</span>
61
                                                    [% RECALL.recalldate | $KohaDates %]
61
                                                    [% RECALL.recalldate | $KohaDates %]
62
                                                </span>
62
                                                </span>
Lines 64-70 Link Here
64
                                            <td class="expirationdate">
64
                                            <td class="expirationdate">
65
                                                [% IF ( RECALL.is_waiting ) %]
65
                                                [% IF ( RECALL.is_waiting ) %]
66
                                                    [% IF ( RECALL.expirationdate ) %]
66
                                                    [% IF ( RECALL.expirationdate ) %]
67
                                                        <span title="[% RECALL.expirationdate %]">
67
                                                        <span title="[% RECALL.expirationdate | html %]">
68
                                                            <span class="tdlabel">Expiration:</span>
68
                                                            <span class="tdlabel">Expiration:</span>
69
                                                            [% RECALL.expirationdate | $KohaDates %]
69
                                                            [% RECALL.expirationdate | $KohaDates %]
70
                                                        </span>
70
                                                        </span>
Lines 75-81 Link Here
75
                                                        </span>
75
                                                        </span>
76
                                                    [% END %]
76
                                                    [% END %]
77
                                                [% ELSIF ( RECALL.expirationdate ) %]
77
                                                [% ELSIF ( RECALL.expirationdate ) %]
78
                                                    <span title="[% RECALL.expirationdate %]" class="overdue">
78
                                                    <span title="[% RECALL.expirationdate | html %]" class="overdue">
79
                                                        <span class="tdlabel">Expiration:</span>
79
                                                        <span class="tdlabel">Expiration:</span>
80
                                                        [% RECALL.expirationdate | $KohaDates %]
80
                                                        [% RECALL.expirationdate | $KohaDates %]
81
                                                    </span>
81
                                                    </span>
Lines 85-91 Link Here
85
                                            </td>
85
                                            </td>
86
                                            <td class="branch">
86
                                            <td class="branch">
87
                                                <span class="tdlabel">Pick up location:</span>
87
                                                <span class="tdlabel">Pick up location:</span>
88
                                                [% RECALL.library.branchname %]
88
                                                [% RECALL.library.branchname | html %]
89
                                            </td>
89
                                            </td>
90
                                            <td class="status">
90
                                            <td class="status">
91
                                                <span class="tdlabel">Status:</span>
91
                                                <span class="tdlabel">Status:</span>
Lines 116-124 Link Here
116
                                                [% IF ( !RECALL.cancellationdate && ( RECALL.is_requested || RECALL.is_overdue ) ) %]
116
                                                [% IF ( !RECALL.cancellationdate && ( RECALL.is_requested || RECALL.is_overdue ) ) %]
117
                                                    <form action="/cgi-bin/koha/opac-recall.pl" method="post">
117
                                                    <form action="/cgi-bin/koha/opac-recall.pl" method="post">
118
                                                        <input type="hidden" name="op" value="cancel">
118
                                                        <input type="hidden" name="op" value="cancel">
119
                                                        <input type="hidden" name="recall_id" value="[% RECALL.recall_id %]">
119
                                                        <input type="hidden" name="recall_id" value="[% RECALL.recall_id | html %]">
120
                                                        <input type="hidden" name="itemnumber" value="[% RECALL.itemnumber %]">
120
                                                        <input type="hidden" name="itemnumber" value="[% RECALL.itemnumber | html %]">
121
                                                        <button type="submit" name="submit" class="btn btn-xs btn-danger" id="cancel_recall_[% RECALL.recall_id %]"><i class="icon-remove icon-white"></i> Cancel</button>
121
                                                        <button type="submit" name="submit" class="btn btn-xs btn-danger" id="cancel_recall_[% RECALL.recall_id | html %]"><i class="icon-remove icon-white"></i> Cancel</button>
122
                                                    </form>
122
                                                    </form>
123
                                                [% END %]
123
                                                [% END %]
124
                                            </td>
124
                                            </td>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-18 / +17 lines)
Lines 214-220 Link Here
214
214
215
                                                    [% IF ( OPACAmazonCoverImages ) %]
215
                                                    [% IF ( OPACAmazonCoverImages ) %]
216
                                                        [% IF ( ISSUE.normalized_isbn ) %]
216
                                                        [% IF ( ISSUE.normalized_isbn ) %]
217
                                                            <a href="http://www.amazon.com/gp/reader/[% ISSUE.normalized_isbn | uri %][% AmazonAssocTag | uri %]#reader-link" title="View on Amazon.com"><img src="https://images-na.ssl-images-amazon.com/images/P/[% ISSUE.normalized_isbn | html %].01.THUMBZZZ.jpg" alt="View on Amazon.com" class="item-thumbnail"/></a>
217
                                                            <a href="http://www.amazon.com/gp/reader/[% ISSUE.normalized_isbn | uri %][% AmazonAssocTag | uri %]#reader-link" title="View on Amazon.com"><img src="https://images-na.ssl-images-amazon.com/images/P/[% ISSUE.normalized_isbn | uri %].01.THUMBZZZ.jpg" alt="View on Amazon.com" class="item-thumbnail"/></a>
218
                                                        [% ELSE %]
218
                                                        [% ELSE %]
219
                                                            <a href="#"><span class="no-image">No cover image available</span></a>
219
                                                            <a href="#"><span class="no-image">No cover image available</span></a>
220
                                                        [% END %]
220
                                                        [% END %]
Lines 224-230 Link Here
224
                                                        [% IF ( ISSUE.normalized_isbn ) %]
224
                                                        [% IF ( ISSUE.normalized_isbn ) %]
225
                                                            <div style="display:block;" title="Click to view in Google Books" class="[% ISSUE.normalized_isbn | html %]" id="gbs-thumbnail[% loop.count | html %]"></div>
225
                                                            <div style="display:block;" title="Click to view in Google Books" class="[% ISSUE.normalized_isbn | html %]" id="gbs-thumbnail[% loop.count | html %]"></div>
226
                                                        [% ELSE %]
226
                                                        [% ELSE %]
227
                                                            <a href="http://books.google.com/books?q=[% ISSUE.title |url %]"><span class="no-image">No cover image available</span></a>
227
                                                            <a href="http://books.google.com/books?q=[% ISSUE.title | uri %]"><span class="no-image">No cover image available</span></a>
228
                                                        [% END %]
228
                                                        [% END %]
229
                                                    [% END %]
229
                                                    [% END %]
230
230
Lines 244-251 Link Here
244
                                                </td>[% END # / IF JacketImages %]
244
                                                </td>[% END # / IF JacketImages %]
245
245
246
                                                <td class="title">
246
                                                <td class="title">
247
                                                    <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ISSUE.biblionumber | html %]">[% ISSUE.title | html %] [% FOREACH subtitl IN ISSUE.subtitle %] [% subtitl.subfield | html %][% END %]</a>
247
                                                    <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ISSUE.biblionumber | uri %]">[% ISSUE.title | html %] [% FOREACH subtitl IN ISSUE.subtitle %] [% subtitl.subfield | html %][% END %]</a>
248
                                                    [% IF ( ISSUE.enumchron ) %] [% ISSUE.enumchron %][% END %]
248
                                                    [% IF ( ISSUE.enumchron ) %] [% ISSUE.enumchron | html %][% END %]
249
                                                    [% IF ( ISSUE.recalled ) %]<br /><i>This item has been recalled. Please return by the new due date.</i>[% END %]
249
                                                    [% IF ( ISSUE.recalled ) %]<br /><i>This item has been recalled. Please return by the new due date.</i>[% END %]
250
                                                </td>
250
                                                </td>
251
251
Lines 336-342 Link Here
336
                                                    <td class="note">
336
                                                    <td class="note">
337
                                                        <input type="text" name="note" data-issue_id="[% ISSUE.issue_id | html %]" data-origvalue="[% ISSUE.note | html %]" value="[% ISSUE.note | html %]" readonly>
337
                                                        <input type="text" name="note" data-issue_id="[% ISSUE.issue_id | html %]" data-origvalue="[% ISSUE.note | html %]" value="[% ISSUE.note | html %]" readonly>
338
                                                        <a class="btn" name="js_submitnote" id="save_[% ISSUE.issue_id | html %]" style="display:none;">Submit note</a>
338
                                                        <a class="btn" name="js_submitnote" id="save_[% ISSUE.issue_id | html %]" style="display:none;">Submit note</a>
339
                                                        <a class="btn" name="nonjs_submitnote" href="/cgi-bin/koha/opac-issue-note.pl?issue_id=[% ISSUE.issue_id | url %]">Edit / Create note</a>
339
                                                        <a class="btn" name="nonjs_submitnote" href="/cgi-bin/koha/opac-issue-note.pl?issue_id=[% ISSUE.issue_id | uri %]">Edit / Create note</a>
340
                                                    </td>
340
                                                    </td>
341
                                                [% END %]
341
                                                [% END %]
342
                                            </tr>
342
                                            </tr>
Lines 791-797 Link Here
791
                        [% IF Koha.Preference('UseRecalls') && RECALLS.count %]
791
                        [% IF Koha.Preference('UseRecalls') && RECALLS.count %]
792
                            <div id="opac-user-recalls">
792
                            <div id="opac-user-recalls">
793
                                <table id="recalls-table" class="table table-bordered table-striped">
793
                                <table id="recalls-table" class="table table-bordered table-striped">
794
                                    <caption>Recalls <span class="count">([% RECALLS.count %])</span></caption>
794
                                    <caption>Recalls <span class="count">([% RECALLS.count | html %])</span></caption>
795
                                    <thead>
795
                                    <thead>
796
                                        <tr>
796
                                        <tr>
797
                                            <th class="anti-the">Title</th>
797
                                            <th class="anti-the">Title</th>
Lines 806-822 Link Here
806
                                        [% FOREACH RECALL IN RECALLS %]
806
                                        [% FOREACH RECALL IN RECALLS %]
807
                                            <tr>
807
                                            <tr>
808
                                                <td class="title">
808
                                                <td class="title">
809
                                                    <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% RECALL.biblionumber %]">
809
                                                    <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% RECALL.biblionumber | html %]">
810
                                                        [% RECALL.biblio.title %]
810
                                                        [% RECALL.biblio.title | html %]
811
                                                        [% FOREACH s IN RECALL.biblio.subtitles %]
811
                                                        [% FOREACH s IN RECALL.biblio.subtitles %]
812
                                                            [% s %]
812
                                                            [% s | html %]
813
                                                        [% END %]
813
                                                        [% END %]
814
                                                        [% RECALL.item.enumchron %]
814
                                                        [% RECALL.item.enumchron | html %]
815
                                                    </a>
815
                                                    </a>
816
                                                    [% RECALL.biblio.author %]
816
                                                    [% RECALL.biblio.author | html %]
817
                                                </td>
817
                                                </td>
818
                                                <td class="recalldate">
818
                                                <td class="recalldate">
819
                                                    <span title="[% RECALL.recalldate %]">
819
                                                    <span title="[% RECALL.recalldate | html %]">
820
                                                        <span class="tdlabel">Recall date:</span>
820
                                                        <span class="tdlabel">Recall date:</span>
821
                                                        [% RECALL.recalldate | $KohaDates %]
821
                                                        [% RECALL.recalldate | $KohaDates %]
822
                                                    </span>
822
                                                    </span>
Lines 824-830 Link Here
824
                                                <td class="expirationdate">
824
                                                <td class="expirationdate">
825
                                                    [% IF ( RECALL.is_waiting ) %]
825
                                                    [% IF ( RECALL.is_waiting ) %]
826
                                                        [% IF ( RECALL.expirationdate ) %]
826
                                                        [% IF ( RECALL.expirationdate ) %]
827
                                                            <span title="[% RECALL.expirationdate %]">
827
                                                            <span title="[% RECALL.expirationdate | html %]">
828
                                                                <span class="tdlabel">Expiration:</span>
828
                                                                <span class="tdlabel">Expiration:</span>
829
                                                                    [% RECALL.expirationdate | $KohaDates %]
829
                                                                    [% RECALL.expirationdate | $KohaDates %]
830
                                                            </span>
830
                                                            </span>
Lines 835-841 Link Here
835
                                                            </span>
835
                                                            </span>
836
                                                        [% END %]
836
                                                        [% END %]
837
                                                    [% ELSIF ( RECALL.has_expired && RECALL.expirationdate ) %]
837
                                                    [% ELSIF ( RECALL.has_expired && RECALL.expirationdate ) %]
838
                                                        <span title="[% RECALL.expirationdate %]" class="overdue">
838
                                                        <span title="[% RECALL.expirationdate | html %]" class="overdue">
839
                                                            <span class="tdlabel">Expiration:</span>
839
                                                            <span class="tdlabel">Expiration:</span>
840
                                                            [% RECALL.expirationdate | $KohaDates %]
840
                                                            [% RECALL.expirationdate | $KohaDates %]
841
                                                        </span>
841
                                                        </span>
Lines 845-851 Link Here
845
                                                </td>
845
                                                </td>
846
                                                <td class="branch">
846
                                                <td class="branch">
847
                                                    <span class="tdlabel">Pick up location:</span>
847
                                                    <span class="tdlabel">Pick up location:</span>
848
                                                    [% RECALL.library.branchname %]
848
                                                    [% RECALL.library.branchname | html %]
849
                                                </td>
849
                                                </td>
850
                                                <td class="status">
850
                                                <td class="status">
851
                                                    <span class="tdlabel">Status:</span>
851
                                                    <span class="tdlabel">Status:</span>
Lines 861-868 Link Here
861
                                                    [% IF ( !RECALL.cancellationdate && ( RECALL.is_requested || RECALL.is_overdue || RECALL.status == 'T' ) ) %]
861
                                                    [% IF ( !RECALL.cancellationdate && ( RECALL.is_requested || RECALL.is_overdue || RECALL.status == 'T' ) ) %]
862
                                                        <form action="/cgi-bin/koha/opac-recall.pl" method="post">
862
                                                        <form action="/cgi-bin/koha/opac-recall.pl" method="post">
863
                                                            <input type="hidden" name="op" value="cancel">
863
                                                            <input type="hidden" name="op" value="cancel">
864
                                                            <input type="hidden" name="recall_id" value="[% RECALL.recall_id %]">
864
                                                            <input type="hidden" name="recall_id" value="[% RECALL.recall_id | html %]">
865
                                                            <input type="hidden" name="itemnumber" value="[% RECALL.itemnumber %]">
865
                                                            <input type="hidden" name="itemnumber" value="[% RECALL.itemnumber | html %]">
866
                                                            <button type="submit" name="submit" class="btn btn-sm btn-danger" id="cancel_recall"><i class="icon-remove icon-white"></i> Cancel</button>
866
                                                            <button type="submit" name="submit" class="btn btn-sm btn-danger" id="cancel_recall"><i class="icon-remove icon-white"></i> Cancel</button>
867
                                                        </form>
867
                                                        </form>
868
                                                    [% END %]
868
                                                    [% END %]
869
- 

Return to bug 19532