@@ -, +, @@ --- .../prog/en/modules/members/accountline-details.tt | 43 +++++++++++++--- .../prog/en/modules/members/apikeys.tt | 22 +++++--- .../prog/en/modules/members/boraccount.tt | 16 +++++- .../prog/en/modules/members/deletemem.tt | 16 +++++- .../prog/en/modules/members/discharge.tt | 29 +++++++++-- .../prog/en/modules/members/discharges.tt | 16 +++++- .../intranet-tmpl/prog/en/modules/members/files.tt | 16 +++++- .../prog/en/modules/members/holdshistory.tt | 16 +++++- .../prog/en/modules/members/housebound.tt | 20 ++++++-- .../prog/en/modules/members/ill-requests.tt | 20 ++++++-- .../prog/en/modules/members/mancredit.tt | 20 ++++++-- .../prog/en/modules/members/maninvoice.tt | 19 +++++-- .../prog/en/modules/members/member-flags.tt | 16 +++++- .../prog/en/modules/members/member-password.tt | 23 ++++++++- .../prog/en/modules/members/member.tt | 24 ++++++++- .../prog/en/modules/members/memberentrygen.tt | 58 ++++++++++++++-------- .../prog/en/modules/members/members-update.tt | 16 +++++- .../prog/en/modules/members/moremember.tt | 29 +++++++++-- .../prog/en/modules/members/notices.tt | 16 +++++- .../intranet-tmpl/prog/en/modules/members/pay.tt | 16 +++++- .../prog/en/modules/members/paycollect.tt | 48 ++++++++++++------ .../en/modules/members/purchase-suggestions.tt | 20 ++++++-- .../prog/en/modules/members/readingrec.tt | 16 +++++- .../prog/en/modules/members/routing-lists.tt | 16 +++++- .../prog/en/modules/members/statistics.tt | 31 ++++++++++-- 25 files changed, 480 insertions(+), 102 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt @@ -15,13 +15,42 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt @@ -10,13 +10,21 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -22,7 +22,21 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt @@ -11,7 +11,21 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt @@ -12,11 +12,30 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt @@ -11,7 +11,21 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt @@ -13,7 +13,21 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt @@ -16,7 +16,21 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt @@ -14,11 +14,21 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt @@ -16,11 +16,21 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt @@ -15,11 +15,21 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt @@ -17,10 +17,21 @@ [% INCLUDE 'patron-search.inc' %] +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt @@ -12,7 +12,21 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.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 @@ -12,7 +12,28 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt @@ -15,7 +15,29 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -35,28 +35,44 @@ legend:hover { [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.inc' %] - +
  • + + [% IF ( opadd ) %] + Add patron + [% ELSIF ( opduplicate ) %] + Duplicate patron + [% ELSE %] + Modify patron + [% END %] + [% IF categoryname %] + ([% categoryname | html %]) + [% END %] + +
  • + [% END %] + +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt @@ -88,7 +88,21 @@ [% END %] [% END %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -23,11 +23,30 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt @@ -18,7 +18,21 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt @@ -17,7 +17,21 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt @@ -35,21 +35,39 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.inc' %] - + +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt @@ -14,11 +14,21 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt @@ -15,7 +15,21 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt @@ -13,7 +13,21 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt @@ -17,11 +17,32 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.inc' %] - +
    --