From 486d549a746844133c7c307d2b48ec9ff1956588 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 22 Aug 2012 16:26:49 -0400 Subject: [PATCH] Bug 2930 - Put other name on checkout screen Content-Type: text/plain; charset="utf-8" This patch adds other name to the include which is used to display patron names and adds this include in several places where it can be used in place of direct output. The patron-title include has been modified to handle the two possible variable scopes throughout patron-related templates. This is a hack similar to having both circ-menu.tt and circ-menu.inc, but keeping both in the same file. Changes to some scripts were necessary to make the othernames variable available to the include. This patch also corrects some tags and fixes some incorrect capitalization (see Bug 2780). To test, view each of the pages affected by these template changes and confirm that the patron's name displays correctly, including their "other name." --- .../intranet-tmpl/prog/en/includes/circ-menu.tt | 2 +- .../prog/en/includes/patron-title.inc | 21 ++++++++++++++------ .../prog/en/modules/members/mancredit.tt | 4 ++-- .../prog/en/modules/members/maninvoice.tt | 6 +++--- .../prog/en/modules/members/member-flags.tt | 6 +++--- .../prog/en/modules/members/moremember-brief.tt | 4 +--- .../prog/en/modules/members/moremember-print.tt | 4 ++-- .../prog/en/modules/members/moremember-receipt.tt | 2 +- .../prog/en/modules/members/moremember.tt | 5 ++--- .../intranet-tmpl/prog/en/modules/members/pay.tt | 4 ++-- .../prog/en/modules/members/paycollect.tt | 4 ++-- .../prog/en/modules/members/routing-lists.tt | 4 ++-- members/mancredit.pl | 1 + members/maninvoice.pl | 1 + members/member-flags.pl | 1 + members/routing-lists.pl | 1 + 16 files changed, 40 insertions(+), 30 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt index ced2858..6fe10d4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt @@ -1,7 +1,7 @@ [%# duplicates circ-menu.inc but assumes all borrower attributes are in a borrower variable rather than in the global namespace %] [% IF borrower %] -<div class="patroninfo"><h5>[% borrower.firstname %] [% borrower.surname %] ([% borrower.cardnumber %])</h5> +<div class="patroninfo"><h5>[% INCLUDE 'patron-title.inc' %]</h5> <!--[if IE 6]> <style type="tex/css">img { width: expression(this.width > 140 ? 140: true); }</style> diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc index d07a449..fb77341 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc @@ -1,6 +1,15 @@ -[% IF category_type == 'I' %] - [% surname %] [% IF othernames %] ([% othernames %]) [% END %] -[% ELSE %] - [% firstname %] [% surname %] -[% END %] -([% cardnumber %]) +[% IF ( borrower.borrowernumber ) %] + [% IF borrower.category_type == 'I' %] + [% borrower.surname %] [% IF borrower.othernames %] ([% borrower.othernames %]) [% END %] + [% ELSE %] + [% borrower.firstname %] [% IF borrower.othernames %] ([% borrower.othernames %]) [% END %] [% borrower.surname %] + [% END %] + ([% borrower.cardnumber %]) +[% ELSIF ( borrowernumber ) %] + [% IF category_type == 'I' %] + [% surname %] [% IF othernames %] ([% othernames %]) [% END %] + [% ELSE %] + [% firstname %] [% IF othernames %] ([% othernames %]) [% END %] [% surname %] + [% END %] + ([% cardnumber %]) +[% END %] \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt index 8b71856..5482e4f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt @@ -1,5 +1,5 @@ [% INCLUDE 'doc-head-open.inc' %] -<title>Koha › Borrowers › Create manual credit +Koha › Patrons › [% INCLUDE 'patron-title.inc' %] › Create manual credit [% INCLUDE 'doc-head-close.inc' %] @@ -72,7 +72,7 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.inc' %] - +
@@ -84,7 +84,7 @@
-

Set Privileges for [% surname %], [% firstname %]

+

Set Privileges for [% INCLUDE 'patron-title.inc' %]

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt index efe7f20..a44f52e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt @@ -9,13 +9,11 @@

    [% UNLESS ( I ) %] - [% title %] [% firstname %] [% END %] [% surname %] ([% cardnumber %])

    + [% INCLUDE 'patron-title.inc' %]
    - [% UNLESS ( I ) %][% IF ( othernames ) %]“[% othernames %]”[% END %] -

    [% streetnumber %] [% IF ( roaddetails ) %] [% roaddetails %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt index d3e5b49..f1c90a8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt @@ -1,5 +1,5 @@ [% INCLUDE 'doc-head-open.inc' %] -Summary for [% firstname %] [% surname %] ([% cardnumber %]) +Summary for [% INCLUDE 'patron-title.inc' %] @@ -16,7 +16,7 @@

    -

    Account summary: [% firstname %] [% surname %] ([% cardnumber %])

    +

    Account summary: [% INCLUDE 'patron-title.inc' %]

    • [% address %]
      [% address2 %]
    • [% city %], [% zipcode %]
    • [% IF ( phone ) %][% phone %][% ELSE %](no phone number on file)[% END %]
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt index 71fdc35..107ebf5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt @@ -17,7 +17,7 @@

      [% LibraryName %]

      [% IF ( branchname ) %][% branchname %]
      [% END %] -Checked out to [% firstname %] [% surname %]
      +Checked out to [% INCLUDE 'patron-title.inc' %]
      ([% cardnumber %])
      [% todaysdate %]
      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 b6df1b3..9b38c1c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -180,12 +180,11 @@ function validate1(date) {
    [% END %] -

    [% UNLESS ( I ) %] - [% title %] [% firstname %] [% END %] [% surname %] ([% cardnumber %])

    +

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

    - [% UNLESS ( I ) %][% IF ( othernames ) %]“[% othernames %]”[% END %] + [% UNLESS ( I ) %]

    [% streetnumber %] [% IF ( roaddetails ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt index 4c1b362..2a6caf1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt @@ -1,5 +1,5 @@ [% INCLUDE 'doc-head-open.inc' %] -Koha › Patrons › Pay Fines for [% borrower.firstname %] [% borrower.surname %] +Koha › Patrons › Pay fines for [% INCLUDE 'patron-title.inc' %] [% INCLUDE 'doc-head-close.inc' %]