@@ -, +, @@ --- .../prog/en/modules/labels/label-home.tt | 1 + .../prog/en/modules/labels/label-manage.tt | 1 + .../prog/en/modules/labels/label-print.tt | 1 + .../prog/en/modules/labels/spinelabel-home.tt | 2 +- .../prog/en/modules/members/accountline-details.tt | 8 ++++++++ .../prog/en/modules/members/boraccount.tt | 1 + .../prog/en/modules/members/deletemem.tt | 5 +++-- .../prog/en/modules/members/discharges.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/members/files.tt | 4 ++-- .../prog/en/modules/members/housebound.tt | 6 +++--- .../prog/en/modules/members/ill-requests.tt | 2 +- .../prog/en/modules/members/mancredit.tt | 2 ++ .../prog/en/modules/members/maninvoice.tt | 2 ++ .../prog/en/modules/members/member-password.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/member.tt | 3 ++- .../prog/en/modules/members/members-update.tt | 2 +- .../prog/en/modules/members/merge-patrons.tt | 2 +- .../prog/en/modules/members/moremember-brief.tt | 2 +- .../prog/en/modules/members/moremember.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/members/pay.tt | 2 ++ .../prog/en/modules/members/paycollect.tt | 19 ++++++++++++++++++- .../prog/en/modules/members/purchase-suggestions.tt | 2 +- .../prog/en/modules/members/readingrec.tt | 3 ++- .../prog/en/modules/members/routing-lists.tt | 7 ++++--- .../prog/en/modules/members/update-child.tt | 2 +- 25 files changed, 64 insertions(+), 25 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt @@ -30,6 +30,7 @@
[% INCLUDE 'labels-toolbar.inc' %] +

Label creator

--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt @@ -47,6 +47,7 @@
[% INCLUDE 'labels-toolbar.inc' %] +

Manage labels

[% IF ( error ) %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt @@ -8,6 +8,7 @@
+

Label printing/exporting

[% IF ( batches ) %]

Click on the following links to download the exported batch(es).

--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt @@ -30,7 +30,7 @@
-

Quick spine label creator

+

Quick spine label creator

    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt @@ -57,6 +57,14 @@
    +

    + [% IF type == 'credit' %] + Details of payment + [% ELSIF type == 'debit' %] + Details of fee + [% END %] +

    + [% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %] [% IF accountline %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -44,6 +44,7 @@
    [% INCLUDE 'members-toolbar.inc' %] +

    Account for [% INCLUDE 'patron-title.inc' %]

    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt @@ -35,7 +35,7 @@ [% INCLUDE 'members-toolbar.inc' %] [% IF ItemsOnIssues || debits || is_guarantor %]
    -

    Cannot delete patron

    +

    Cannot delete patron

      [% IF ( ItemsOnIssues ) %]
    • Patron has [% ItemsOnIssues | html %] item(s) checked out.
    • @@ -64,7 +64,8 @@ [% END %]
    [% END %] -

    Are you sure you want to delete the patron [% patron.firstname | html %] [% patron.surname | html %]? This cannot be undone.

    +

    Are you sure you want to delete the patron [% patron.firstname | html %] [% patron.surname | html %]?

    +

    This cannot be undone.

    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt @@ -32,7 +32,7 @@
    [% IF pending_discharges %] -

    Pending discharge requests

    +

    Pending discharge requests

    @@ -57,7 +57,7 @@ [% ELSE %]
    -

    There are no pending discharge requests.

    +

    There are no pending discharge requests.

    [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt @@ -34,10 +34,10 @@
    - [% INCLUDE 'members-toolbar.inc' %] -

    Files

    + [% INCLUDE 'members-toolbar.inc' %] + [% IF errors %]
    [% IF errors.empty_upload %]The file you are attempting to upload has no contents.[% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt @@ -35,10 +35,10 @@
    - [% INCLUDE 'members-toolbar.inc' %] + +

    Housebound details for [% INCLUDE 'patron-title.inc' %]

    - -

    Housebound details for [% INCLUDE 'patron-title.inc' %]

    + [% INCLUDE 'members-toolbar.inc' %] [% FOR m IN messages %]
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt @@ -37,8 +37,8 @@
    - [% INCLUDE 'members-toolbar.inc' %]

    ILL requests history

    + [% INCLUDE 'members-toolbar.inc' %] [% INCLUDE 'ill-list-table.inc' %]
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt @@ -36,6 +36,8 @@
    +

    Manual credit

    + [% INCLUDE 'members-toolbar.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt @@ -37,6 +37,8 @@
    +

    Manual invoice

    + [% INCLUDE 'members-toolbar.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt @@ -80,7 +80,7 @@ [% END %] -
    Change username and/or password for [% patron.firstname | html %] [% patron.surname | html %] +

    Change username and/or password for [% patron.firstname | html %] [% patron.surname | html %]

    1. --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt @@ -52,7 +52,6 @@ [% INCLUDE 'patron-toolbar.inc' %] [% INCLUDE 'noadd-warnings.inc' %] -
      Browse by last name: [% FOREACH letter IN alphabet.split(' ') %] @@ -60,6 +59,8 @@ [% END %]
      +

      Patrons

      + [% IF CAN_user_borrowers_edit_borrowers && pending_borrower_modifications %]
      Patrons requesting modifications: --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt @@ -108,8 +108,8 @@
      +

      Update patron records

      [% IF PendingModifications %] -

      Update patron records

      [% FOREACH pm IN PendingModifications %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt @@ -84,7 +84,7 @@
      -

      Merge patron records

      +

      Merge patron records

      [% IF action == 'show' %] [% IF patrons.count > 1 %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt @@ -12,7 +12,7 @@
      -

      [% INCLUDE 'patron-title.inc' %]

      +

      [% INCLUDE 'patron-title.inc' %]

      --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -190,12 +190,12 @@
      [% END %] -

      +

      [% UNLESS ( I ) %] [% patron.title | html %] [% patron.firstname | html %] [% END %] [% patron.surname | html %] ([% patron.cardnumber | html %]) -

      +
      --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt @@ -38,6 +38,8 @@
      +

      Make a payment

      + [% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt @@ -73,8 +73,25 @@
      -[% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %] +

      + [% IF ( pay_individual ) %] + Pay an individual fine + [% ELSIF ( writeoff_individual ) %] + Write off an individual fine + [% ELSE %] + [% IF ( selected_accts ) %] + [% IF type == 'WRITEOFF' %] + Write off an amount toward selected fines + [% ELSE %] + Pay an amount toward selected fines + [% END %] + [% ELSE %] + Pay an amount toward all fines + [% END %] + [% END %] +

      +[% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %]
      --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt @@ -35,8 +35,8 @@
      - [% INCLUDE 'members-toolbar.inc' %]

      Purchase suggestions

      + [% INCLUDE 'members-toolbar.inc' %]
      New purchase suggestion --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt @@ -36,9 +36,10 @@
      -[% INCLUDE 'members-toolbar.inc' %]

      Circulation history

      +[% INCLUDE 'members-toolbar.inc' %] + [% UNLESS Koha.Preference('intranetreadinghistory') %]
      Staff members are not allowed to access patron's checkout history
      [% ELSIF is_anonymous %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt @@ -34,8 +34,9 @@
      -[% INCLUDE 'members-toolbar.inc' %] + [% INCLUDE 'members-toolbar.inc' %] +

      Subscription routing lists for [% INCLUDE 'patron-title.inc' %]

      Search subscriptions:

      [% IF ( routing ) %][% END %] @@ -43,7 +44,7 @@ [% SET routinglists = patron.get_routing_lists %] -

      +

      [% UNLESS ( routinglists ) %] 0 subscription routing lists [% ELSIF ( routinglists.count == 1 ) %] @@ -51,7 +52,7 @@ [% ELSE %] [% routinglists.count | html %] subscription routing lists [% END %] -

      +
      --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt @@ -11,7 +11,7 @@ [% IF ( MULTI ) %] -

      Choose adult category

      +

      Choose adult category

      [% IF patron_categories %] --