@@ -, +, @@ --- koha-tmpl/intranet-tmpl/prog/en/includes/recalls-reports.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 2 +- koha-tmpl/intranet-tmpl/prog/js/recalls.js | 1 + koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt | 3 +-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls-reports.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls-reports.inc @@ -77,7 +77,7 @@ - [% IF ( !recall.cancellationdate && ( recall.is_requested || recall.is_overdue ) ) %] + [% IF ( !recall.cancellationdate && ( recall.is_requested || recall.is_waiting || recall.is_overdue ) ) %] Cancel [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc @@ -63,7 +63,7 @@ - [% IF ( !recall.cancellationdate && ( recall.is_requested || recall.is_overdue ) ) %] + [% IF ( !recall.cancellationdate && ( recall.is_requested || recall.is_waiting || recall.is_overdue ) ) %] Cancel [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -945,7 +945,7 @@ No patron matched [% message | html %] [% IF Koha.Preference('UseRecalls') && recalls.count %] -
  • [% recalls.count %] Recall(s)
  • +
  • [% recalls.count %] Recall(s)
  • [% END %] [% IF Koha.Preference('ArticleRequests') %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -517,7 +517,7 @@ function validate1(date) { [% END %] [% IF Koha.Preference('UseRecalls') && recalls.count %] -
  • [% recalls.count %] Recall(s)
  • +
  • [% recalls.count %] Recall(s)
  • [% END %] [% IF Koha.Preference('ArticleRequests') %]
  • --- a/koha-tmpl/intranet-tmpl/prog/js/recalls.js +++ a/koha-tmpl/intranet-tmpl/prog/js/recalls.js @@ -27,6 +27,7 @@ $(document).ready(function() { }); $("#recalls-table").dataTable($.extend(true, {}, dataTablesDefaults, { + "autoWidth": false, "aoColumnDefs": [ { "aTargets": [ 'nosort' ], "bSortable": false, "bSearchable": false }, ], --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt @@ -44,8 +44,7 @@

    You will be notified when your item is waiting to be picked up at the library.

    [% ELSIF not error %]

    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.

    -

    Warning: Your library does not allow recalls for x item types.

    -
    +
    [% IF loggedinusername %]

    Place a recall on [% biblio.title %] ([% biblio.author %])?

    Confirm   Cancel --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -855,7 +855,7 @@ Using this account is not recommended because some parts of Koha will not functi [% END %] - +
    [% END # / # RECALLS.count %] --