[PATCH] Bug 3764: Made city/town admin form clear

[Nicole Engard]

---
 .../prog/en/modules/admin/cities.tmpl              |   12 ++++++------
 1 files 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 6a96abf..62055da 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>
-- 
1.5.6.5

--00163698966cf0c04b0477915738
Content-Type: application/octet-stream; 
	name="0001-Bug-3764-Made-city-town-admin-form-clear.patch"
Content-Disposition: attachment; 
	filename="0001-Bug-3764-Made-city-town-admin-form-clear.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_g1mj96z10

RnJvbSBkN2Y1NzUxNDY5MThlZjE3NTQyOTU0N2RjYzQxNzEyMWE0ZjJmNDhlIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBOaWNvbGUgRW5nYXJkIDxuZW5nYXJkQGdtYWlsLmNvbT4KRGF0
ZTogVHVlLCAzIE5vdiAyMDA5IDE3OjAxOjAwIC0wNTAwClN1YmplY3Q6IFtQQVRDSF0gQnVnIDM3
NjQ6IE1hZGUgY2l0eS90b3duIGFkbWluIGZvcm0gY2xlYXIKQ29udGVudC1UeXBlOiB0ZXh0L3Bs
YWluOyBjaGFyc2V0PSJ1dGYtOCIKCi0tLQogLi4uL3Byb2cvZW4vbW9kdWxlcy9hZG1pbi9jaXRp
ZXMudG1wbCAgICAgICAgICAgICAgfCAgIDEyICsrKysrKy0tLS0tLQogMSBmaWxlcyBjaGFuZ2Vk
LCA2IGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEva29oYS10bXBs
L2ludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2FkbWluL2NpdGllcy50bXBsIGIva29oYS10
bXBsL2ludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2FkbWluL2NpdGllcy50bXBsCmluZGV4
IDZhOTZhYmYuLjYyMDU1ZGEgMTAwNjQ0Ci0tLSBhL2tvaGEtdG1wbC9pbnRyYW5ldC10bXBsL3By
b2cvZW4vbW9kdWxlcy9hZG1pbi9jaXRpZXMudG1wbAorKysgYi9rb2hhLXRtcGwvaW50cmFuZXQt
dG1wbC9wcm9nL2VuL21vZHVsZXMvYWRtaW4vY2l0aWVzLnRtcGwKQEAgLTU0LDExICs1NCwxMSBA
QAogCQk8c3BhbiBjbGFzcz0ibGFiZWwiPkNpdHkgSUQ6IDwvc3Bhbj48IS0tIFRNUExfVkFSIE5B
TUU9ImNpdHlpZCIgLS0+PC9saT4KIAk8IS0tIC9UTVBMX0lGIC0tPgogCTxsaT4KLQk8bGFiZWwg
Zm9yPSJjaXR5X25hbWUiPkNpdHkgbmFtZTogPC9sYWJlbD4KKwk8bGFiZWwgZm9yPSJjaXR5X25h
bWUiPkNpdHksIFN0YXRlOiA8L2xhYmVsPgogCTxpbnB1dCB0eXBlPSJ0ZXh0IiBuYW1lPSJjaXR5
X25hbWUiIGlkPSJjaXR5X25hbWUiIHNpemU9IjQwIiBtYXhsZW5ndGg9IjgwIiB2YWx1ZT0iPCEt
LSBUTVBMX1ZBUiBOQU1FPSJjaXR5X25hbWUiIEVTQ0FQRT0iSFRNTCIgLS0+IiAvPgogCTwvbGk+
CiAJPGxpPgkJCQkKLQk8bGFiZWwgZm9yPSJjaXR5X3ppcGNvZGUiPkNpdHkgemlwY29kZTogPC9s
YWJlbD4KKwk8bGFiZWwgZm9yPSJjaXR5X3ppcGNvZGUiPlppcC9Qb3N0YWwgY29kZTogPC9sYWJl
bD4KIAk8aW5wdXQgdHlwZT0idGV4dCIgbmFtZT0iY2l0eV96aXBjb2RlIiBpZD0iY2l0eV96aXBj
b2RlIiBzaXplPSIxMCIgbWF4bGVuZ3RoPSIxMCIgdmFsdWU9IjwhLS0gVE1QTF9WQVIgTkFNRT0i
Y2l0eV96aXBjb2RlIiAtLT4iIC8+CiAJPC9saT48L29sPjwvZmllbGRzZXQ+CiAJCkBAIC04MSwx
MCArODEsMTAgQEAKICAgICAgICAgPHRyPjx0aD5DaXR5IGlkPC90aD4KICAgICAgICAgICAgIDx0
ZD48IS0tIFRNUExfVkFSIE5BTUU9ImNpdHlpZCIgLS0+PC90ZD4KICAgICAgICAgPC90cj4KLSAg
ICAgICAgPHRyPjx0aD5DaXR5IG5hbWU8L3RoPgorICAgICAgICA8dHI+PHRoPkNpdHksIFN0YXRl
PC90aD4KICAgICAgICAgICAgIDx0ZD48IS0tIFRNUExfVkFSIE5BTUU9ImNpdHlfbmFtZSIgLS0+
PC90ZD4KICAgICAgICAgPC90cj4KLSAgICAgICAgPHRyPjx0aD5DaXR5IHppcGNvZGU8L3RoPgor
ICAgICAgICA8dHI+PHRoPlppcC9Qb3N0YWwgY29kZTwvdGg+CiAgICAgICAgICAgICA8dGQ+PCEt
LSBUTVBMX1ZBUiBOQU1FPSJjaXR5X3ppcGNvZGUiIC0tPjwvdGQ+CiAgICAgICAgIDwvdHI+CiAg
ICAgPC90YWJsZT4KQEAgLTExOCw4ICsxMTgsOCBAQAogPCEtLSBUTVBMX0lGIE5BTUU9Imxvb3Ai
IC0tPgk8dGFibGU+CiAJCTx0cj4KIAkJCTx0aD5DaXR5IElEPC90aD4KLQkJCTx0aD5DaXR5IG5h
bWU8L3RoPgotCQkJPHRoPkNpdHkgemlwY29kZTwvdGg+CisJCQk8dGg+Q2l0eSwgU3RhdGU8L3Ro
PgorCQkJPHRoPlppcC9Qb3N0YWwgY29kZTwvdGg+CiAJCQk8dGg+Jm5ic3A7PC90aD4KIAkJCTx0
aD4mbmJzcDs8L3RoPgogCQk8L3RyPgotLSAKMS41LjYuNQoK
--00163698966cf0c04b0477915738--