From 1c13785fed0473fbf631b047c5d543cac121ef43 Mon Sep 17 00:00:00 2001 From: Colin Campbell Date: Sun, 17 Apr 2011 23:35:21 -0400 Subject: [PATCH] Bug 6194 Suppress punctuation when no location Template was showing empty parentheses when no location data was present. Punctuation should be dependent on the variable being set Signed-off-by: Nicole C. Engard Signed-off-by: Chris Cormack --- .../prog/en/modules/serials/serials-collection.tt | 3 ++- .../intranet-tmpl/prog/en/modules/serials/serials-edit.tt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt index 971789959f..8d27bd0f9f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt @@ -64,7 +64,8 @@ $(document).ready(function() { [% UNLESS ( popup ) %] [% INCLUDE 'serials-toolbar.inc' %] -

Serial Collection information for [% bibliotitle %] ([% location %] ) +

Serial Collection information for [% bibliotitle %] + [% IF location %] ([% location %] ) [% END %] [% IF ( callnumber ) %]callnumber: [% callnumber %][% END %]

[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt index a93a3698f0..145166d709 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt @@ -178,7 +178,8 @@ $(document).ready(function() {

Serial Edition [% bibliotitle %] - ( [% location %] ) [% IF ( callnumber ) %] callnumber: [% callnumber %][% END %]

+ i[% IF location %] ( [% location %] ) [% END %] + [% IF ( callnumber ) %] callnumber: [% callnumber %][% END %]
-- 2.39.5