@@ -, +, @@ --- .../prog/en/modules/labels/label-edit-batch.tt | 3 +++ .../prog/en/modules/labels/label-edit-layout.tt | 1 + .../prog/en/modules/labels/label-edit-profile.tt | 2 +- .../prog/en/modules/labels/label-edit-range.tt | 2 +- .../prog/en/modules/labels/label-edit-template.tt | 2 +- .../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 +- 30 files changed, 71 insertions(+), 28 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt @@ -30,6 +30,9 @@
[% INCLUDE 'labels-toolbar.inc' %] +

+ [% IF description %]Edit [% description | html %] [% ELSIF batch_id %]Edit ([% batch_id | html %]) [% ELSE %]New [% END %]label batches +

[% IF ( err ) %] [% BLOCK xlate_errtype %] [% SWITCH errtype %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt @@ -39,6 +39,7 @@ [% INCLUDE 'labels-toolbar.inc' %] +

[% IF ( layout_id ) %]Edit ([% layout_id | html %]) [% ELSE %]New [% END %]label layouts

[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] label layout --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt @@ -22,7 +22,7 @@
[% INCLUDE 'labels-toolbar.inc' %] -

Edit printer profile

+

Edit printer profile

Profile settings
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt @@ -19,7 +19,7 @@
    [% INCLUDE 'labels-toolbar.inc' %] -

    Print barcode range

    +

    Print barcode range

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

    Edit label template

    +

    Edit label template

    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt @@ -19,6 +19,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 @@ -34,6 +34,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 @@ -16,7 +16,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 @@ -28,6 +28,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 @@ -30,6 +30,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 @@ -21,7 +21,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.
      • @@ -50,7 +50,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 @@ -18,7 +18,7 @@
      [% IF pending_discharges %] -

      Pending discharge requests

      +

      Pending discharge requests

      @@ -43,7 +43,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 @@ -20,10 +20,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 @@ -25,10 +25,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 @@ -27,8 +27,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 @@ -26,6 +26,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 @@ -27,6 +27,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 @@ -59,7 +59,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 @@ -30,7 +30,6 @@ [% INCLUDE 'patron-toolbar.inc' %] [% INCLUDE 'noadd-warnings.inc' %] -
        Browse by last name: [% FOREACH letter IN alphabet.split(' ') %] @@ -38,6 +37,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 @@ -94,8 +94,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 @@ -48,7 +48,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 @@ -171,12 +171,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 @@ -24,6 +24,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 @@ -56,8 +56,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 @@ -25,8 +25,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 @@ -22,9 +22,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 @@ -20,8 +20,9 @@
        -[% INCLUDE 'members-toolbar.inc' %] + [% INCLUDE 'members-toolbar.inc' %] +

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

        Search subscriptions:

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

        +

        [% UNLESS ( routinglists ) %] 0 subscription routing lists [% ELSIF ( routinglists.count == 1 ) %] @@ -37,7 +38,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 %] --