From c71b616f84f2548b57ac673f07de209cc8932ca2 Mon Sep 17 00:00:00 2001
From: Nicole Engard <nengard@gmail.com>
Date: Mon, 4 Jan 2010 02:31:05 -0500
Subject: [PATCH] Bug 3764: Made city/town admin form clear

---
 .../intranet-tmpl/prog/en/modules/admin/cities.tmpl  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl
index 6a96abf1f4..62055da444 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl
@@ -54,11 +54,11 @@
 		<span class="label">City ID: </span><!-- TMPL_VAR NAME="cityid" --></li>
 	<!-- /TMPL_IF -->
 	<li>
-	<label for="city_name">City name: </label>
+	<label for="city_name">City, State: </label>
 	<input type="text" name="city_name" id="city_name" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="city_name" ESCAPE="HTML" -->" />
 	</li>
 	<li>				
-	<label for="city_zipcode">City zipcode: </label>
+	<label for="city_zipcode">Zip/Postal code: </label>
 	<input type="text" name="city_zipcode" id="city_zipcode" size="10" maxlength="10" value="<!-- TMPL_VAR NAME="city_zipcode" -->" />
 	</li></ol></fieldset>
 	
@@ -81,10 +81,10 @@
         <tr><th>City id</th>
             <td><!-- TMPL_VAR NAME="cityid" --></td>
         </tr>
-        <tr><th>City name</th>
+        <tr><th>City, State</th>
             <td><!-- TMPL_VAR NAME="city_name" --></td>
         </tr>
-        <tr><th>City zipcode</th>
+        <tr><th>Zip/Postal code</th>
             <td><!-- TMPL_VAR NAME="city_zipcode" --></td>
         </tr>
     </table>
@@ -118,8 +118,8 @@
 <!-- TMPL_IF NAME="loop" -->	<table>
 		<tr>
 			<th>City ID</th>
-			<th>City name</th>
-			<th>City zipcode</th>
+			<th>City, State</th>
+			<th>Zip/Postal code</th>
 			<th>&nbsp;</th>
 			<th>&nbsp;</th>
 		</tr>
-- 
2.39.2