From: Colin Campbell <colin.campbell@ptfs-europe.com>
Date: Mon, 18 Apr 2011 03:35:21 +0000 (-0400)
Subject: Bug 6194 Suppress punctuation when no location
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=1c13785fed0473fbf631b047c5d543cac121ef43;p=koha.git

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 <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---

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' %]
 
-	<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 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() {
 	<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()">-->