Standardized all references to Address and Zip/Postal Code.
Also fixed bug #3138 by making the Alt address ready City, State.
---
.../prog/en/modules/members/memberentrygen.tmpl | 32 ++++++++++----------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
index 85d29d5..fa2aeba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
@@ -411,7 +411,7 @@
<!--TMPL_ELSE-->
<label for="zipcode">
<!-- /TMPL_IF-->
- Zipcode: </label>
+ Zip/Postal code: </label>
<input type="text" name="zipcode" id="zipcode" size="10" value="<!--
TMPL_VAR NAME="zipcode" -->" />
<!-- TMPL_IF NAME="mandatoryzipcode" --><span
class="required">Required</span><!-- /TMPL_IF -->
</li>
@@ -506,7 +506,7 @@
<!--TMPL_ELSE-->
<label for="B_city">
<!-- /TMPL_IF-->
- City: </label>
+ City, State: </label>
<input type="text" id="B_city" name="B_city"
size="20" value="<!-- TMPL_VAR NAME="B_city" -->" />
<!-- TMPL_IF NAME="mandatoryB_city" --><span
class="required">Required</span><!-- /TMPL_IF -->
</li>
@@ -516,7 +516,7 @@
<!--TMPL_ELSE-->
<label for="B_zipcode">
<!-- /TMPL_IF-->
- Zipcode: </label>
+ Zip/Postal code: </label>
<input type="text" id="B_zipcode"
name="B_zipcode" maxlength="10" size="10" value="<!-- TMPL_VAR NAME="B_zipcode"
-->" />
<!-- TMPL_IF NAME="mandatoryB_zipcode" --><span
class="required">Required</span><!-- /TMPL_IF -->
</li>
@@ -554,16 +554,6 @@
<fieldset class="rows" id="memberentry_altaddress">
<legend>Alternate Contact</legend><ol>
<li>
- <!-- TMPL_IF NAME="mandatoryaltcontactfirstname" -->
- <label for="altcontactfirstname"
class="required">
- <!-- TMPL_ELSE -->
- <label for="altcontactfirstname">
- <!-- /TMPL_IF -->
- First name:</label>
- <input type="text" name="altcontactfirstname"
id="altcontactfirstname" value="<!-- TMPL_VAR NAME="altcontactfirstname" -->" />
- <!-- TMPL_IF
NAME="mandatoryaltcontactfirstname" --><span
class="required">Required</span><!-- /TMPL_IF -->
- </li>
- <li>
<!-- TMPL_IF NAME="mandatoryaltcontactsurname" -->
<label for="altcontactsurname" class="required">
<!-- TMPL_ELSE -->
@@ -574,12 +564,22 @@
<!-- TMPL_IF NAME="mandatoryaltcontactsurname"
--><span class="required">Required</span><!-- /TMPL_IF -->
</li>
<li>
+ <!-- TMPL_IF NAME="mandatoryaltcontactfirstname" -->
+ <label for="altcontactfirstname"
class="required">
+ <!-- TMPL_ELSE -->
+ <label for="altcontactfirstname">
+ <!-- /TMPL_IF -->
+ First name:</label>
+ <input type="text" name="altcontactfirstname"
id="altcontactfirstname" value="<!-- TMPL_VAR NAME="altcontactfirstname" -->" />
+ <!-- TMPL_IF
NAME="mandatoryaltcontactfirstname" --><span
class="required">Required</span><!-- /TMPL_IF -->
+ </li>
+ <li>
<!-- TMPL_IF NAME="mandatoryaltcontactaddress1" -->
<label for="altcontactaddress1"
class="required">
<!-- TMPL_ELSE -->
<label for="altcontactaddress1">
<!-- /TMPL_IF -->
- Address line 1:</label>
+ Address:</label>
<input type="text" name="altcontactaddress1"
id="altcontactaddress1" value="<!-- TMPL_VAR NAME="altcontactaddress1" -->"
size="40" />
<!-- TMPL_IF NAME="mandatoryaltcontactaddress1"
--><span class="required">Required</span><!-- /TMPL_IF -->
</li>
@@ -589,7 +589,7 @@
<!-- TMPL_ELSE -->
<label for="altcontactaddress2">
<!-- /TMPL_IF -->
- Address line 2:</label>
+ Address 2:</label>
<input type="text" name="altcontactaddress2"
id="altcontactaddress2" value="<!-- TMPL_VAR NAME="altcontactaddress2" -->"
size="40" />
<!-- TMPL_IF NAME="mandatoryaltcontactaddress2"
--><span class="required">Required</span><!-- /TMPL_IF -->
</li>
@@ -609,7 +609,7 @@
<!-- TMPL_ELSE -->
<label for="altcontactzipcode">
<!-- /TMPL_IF -->
- ZIP/Post code:</label>
+ Zip/Postal code:</label>
<input type="text" name="altcontactzipcode"
id="altcontactzipcode" value="<!-- TMPL_VAR NAME="altcontactzipcode" -->"
size="5" />
<!-- TMPL_IF NAME="mandatoryaltcontactzipcode"
--><span class="required">Required</span><!-- /TMPL_IF -->
</li>
--
1.5.6.5
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha.org/mailman/listinfo/koha-patches
