From b0550f684754a254d6957deb781789a545e87de1 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Fri, 24 Nov 2017 01:31:48 +0000 Subject: [PATCH] Bug 19532: Some fiddly fixes Little typos etc https://bugs.koha-community.org/show_bug.cgi?id=19523 --- 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(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls-reports.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/recalls-reports.inc index 825f98c..aff8634 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls-reports.inc +++ b/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 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc index b17288b..d46761e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc +++ b/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 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index b61b341..ded858c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/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') %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index 496b4c5..d07fc57 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/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') %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/js/recalls.js b/koha-tmpl/intranet-tmpl/prog/js/recalls.js index 1174286..a85c482 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/recalls.js +++ b/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 }, ], diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt index 43a84e9..adfbec8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt +++ b/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 diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt index b609258..47c1aa9 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/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 %] -- 2.1.4