From ebd7c422b48c53fa037b69a9150f8e0460d24418 Mon Sep 17 00:00:00 2001 From: Josef Moravec Date: Fri, 13 Oct 2017 06:44:55 +0000 Subject: [PATCH] Bug 19456: Make patron-title ability to be generated with or without html tags Modified pages: circ/circulation.pl circ/circulation_batch_checkouts.pl members/boraccount.pl members/files.pl members/holdshistory.pl members/housebound.pl members/moremember.pl members/notices.pl members/purchase-suggestions.pl members/readingrec.pl members/routing-lists.pl members/statistics.pl Test plan: 0) Do not apply the patch 1) Have a patron with title/salution filled in 2) Confirm bug, go for example to circ/circulation page and see there is html in tag (you can see it in your browser page/window title) 3) Apply the patch 4) Go through circulation/patron pages (see modified page above) and confirm there is no html in <title> tag, but on the page itself the salutation should be in <span class="patron-title"> Signed-off-by: David Bourgalt <david.bourgault@inlibro.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- .../prog/en/includes/patron-title.inc | 16 ++++++++++++---- .../prog/en/modules/circ/circulation.tt | 2 +- .../modules/circ/circulation_batch_checkouts.tt | 2 +- .../prog/en/modules/members/boraccount.tt | 2 +- .../prog/en/modules/members/files.tt | 2 +- .../prog/en/modules/members/holdshistory.tt | 2 +- .../prog/en/modules/members/housebound.tt | 2 +- .../prog/en/modules/members/moremember.tt | 2 +- .../prog/en/modules/members/notices.tt | 2 +- .../en/modules/members/purchase-suggestions.tt | 2 +- .../prog/en/modules/members/readingrec.tt | 2 +- .../prog/en/modules/members/routing-lists.tt | 2 +- .../prog/en/modules/members/statistics.tt | 2 +- 13 files changed, 24 insertions(+), 16 deletions(-) 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 c7818f0043..660003259b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc @@ -1,11 +1,19 @@ +[%# Parameter no_html - if 1, the html tags are NOT generated %] +[%- IF no_html %] + [%- span_start = '' %] + [%- span_end = '' %] +[%- ELSE %] + [%- span_start = '<span class="patron-title">' %] + [%- span_end = '</span>' %] +[%- END %] [%- IF ( borrower.borrowernumber ) %] [%- IF borrower.category_type == 'I' %] [%- borrower.surname | html %] [% IF borrower.othernames %] ([% borrower.othernames | html %]) [% END %] [%- ELSE %] [%- IF invert_name %] - [%- IF borrower.title %]<span class="patron-title">[%- borrower.title | html %]</span> [% END %][%- borrower.surname | html %], [% borrower.firstname | html %] [% IF borrower.othernames %] ([% borrower.othernames | html %]) [% END %] + [%- IF borrower.title %][% span_start %][%- borrower.title | html %][% span_end %] [% END %][%- borrower.surname | html %], [% borrower.firstname | html %] [% IF borrower.othernames %] ([% borrower.othernames | html %]) [% END %] [%- ELSE %] - [%- IF borrower.title %]<span class="patron-title">[%- borrower.title | html %]</span> [% END %][%- borrower.firstname | html %] [% IF borrower.othernames %] ([% borrower.othernames | html %]) [% END %] [% borrower.surname | html %] + [%- IF borrower.title %][% span_start %][%- borrower.title | html %][% span_end %] [% END %][%- borrower.firstname | html %] [% IF borrower.othernames %] ([% borrower.othernames | html %]) [% END %] [% borrower.surname | html %] [%- END -%] [%- END -%] [%- IF ( borrower.cardnumber ) -%] @@ -16,9 +24,9 @@ [%- surname | html %] [% IF othernames %] ([% othernames | html %]) [% END %] [%- ELSE %] [%- IF invert_name %] - [%- IF title %]<span class="patron-title">[%- title | html %]</span> [% END %][%- surname | html %], [% firstname | html %] [% IF othernames %] ([% othernames | html %]) [% END %] + [%- IF title %][% span_start %][%- title | html %][% span_end %] [% END %][%- surname | html %], [% firstname | html %] [% IF othernames %] ([% othernames | html %]) [% END %] [%- ELSE %] - [%- IF title %]<span class="patron-title">[%- title | html %]</span> [% END %][%- firstname | html %] [% IF othernames %] ([% othernames | html %]) [% END %] [% surname | html %] + [%- IF title %][% span_start %][%- title | html %][% span_end %] [% END %][%- firstname | html %] [% IF othernames %] ([% othernames | html %]) [% END %] [% surname | html %] [%- END %] [%- END -%] [%- IF ( cardnumber ) -%] 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 d5507c0f39..842e479ee9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -10,7 +10,7 @@ [% SET destination = "circ" %] <title>Koha › Circulation [% IF borrowernumber and borrower%] - › Checking out to [% INCLUDE 'patron-title.inc' invert_name = 1 %] + › Checking out to [% INCLUDE 'patron-title.inc' invert_name = 1 no_html = 1 %] [% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt index 1fc917f96d..2416f36d4d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt @@ -6,7 +6,7 @@ [% SET destination = "circ" %] Koha › Circulation [% IF borrowernumber and borrower %] - › Batch check out › Issuing items to [% INCLUDE 'patron-title.inc' invert_name = 1 %] + › Batch check out › Issuing items to [% INCLUDE 'patron-title.inc' invert_name = 1 no_html = 1 %] [% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt index ef4354a454..efcc726ab3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -3,7 +3,7 @@ [% USE ColumnsSettings %] [% USE Price %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Patrons › Account for [% INCLUDE 'patron-title.inc' %] +Koha › Patrons › Account for [% INCLUDE 'patron-title.inc' no_html = 1 %] [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'datatables.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt index ba4cc1f63b..b5cf108172 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt @@ -1,7 +1,7 @@ [% USE KohaDates %] [% USE AuthorisedValues %] [% INCLUDE 'doc-head-open.inc' %] -Files for [% INCLUDE 'patron-title.inc' %] +Files for [% INCLUDE 'patron-title.inc' no_html = 1 %] [% INCLUDE 'doc-head-close.inc' %]