From 8e5672b70425cb921b7bd9d43c85ddb33abbcd69 Mon Sep 17 00:00:00 2001 From: Colin Campbell <colin.campbell@ptfs-europe.com> Date: Fri, 15 Apr 2011 14:26:48 +0100 Subject: [PATCH] Bug 6194 Suppress punctuation when no location Content-Type: text/plain; charset="utf-8" Template was showing empty parentheses when no location data was present. Punctuation should be dependent on the variable being set --- .../prog/en/modules/serials/serials-collection.tt | 3 ++- .../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 9717899..8d27bd0 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' %] - <h1>Serial Collection information for <i>[% bibliotitle %]</i> ([% location %] ) + <h1>Serial Collection information for <i>[% bibliotitle %]</i> + [% IF location %] ([% location %] ) [% END %] [% IF ( callnumber ) %]callnumber: [% callnumber %][% END %]</h1> [% 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 a93a369..145166d 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() { <div class="yui-b"> <h1>Serial Edition <i>[% bibliotitle %]</i> - ( [% location %] ) [% IF ( callnumber ) %] callnumber: [% callnumber %][% END %]</h1> + i[% IF location %] ( [% location %] ) [% END %] + [% IF ( callnumber ) %] callnumber: [% callnumber %][% END %]</h1> <form method="post" name="f" action="serials-edit.pl" id="serials_edit"> <!--onsubmit="return barcode_check()">--> -- 1.7.4.2