Bug 5252 - Phone labels on patron creation

The labels for emails on the patron forms say 'primary' and
'secondary.' This patch does the same thing for the phones.
phone is now 'Primary phone', mobile is now 'Secondary phone',
and 'phonepro' is now 'Other phone'. This way the type of phone
does not matter and the phone that the patron wants to be called
at the most is the 'primary.'

This is just a step in the direction of fixing Bug 5252, not a
complete fix.

This patch also updated a stray reference to Home Email.  Both the
OPAC and staff client are updated with this patch.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
This commit is contained in:
Nicole C. Engard 2011-08-09 11:20:47 -04:00 committed by Chris Cormack
parent c37d260223
commit 0a71367dc2
5 changed files with 25 additions and 25 deletions

View file

@ -480,7 +480,7 @@
[% ELSE %] [% ELSE %]
<label for="phone"> <label for="phone">
[% END %] [% END %]
Phone (home): </label> Primary Phone: </label>
<input type="text" id="phone" name="phone" value="[% phone %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] /> <input type="text" id="phone" name="phone" value="[% phone %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
[% IF ( mandatoryphone ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div> [% IF ( mandatoryphone ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
@ -491,7 +491,7 @@
[% ELSE %] [% ELSE %]
<label for="phonepro"> <label for="phonepro">
[% END %] [% END %]
Phone (work): </label> Secondary Phone: </label>
<input type="text" id="phonepro" name="phonepro" value="[% phonepro %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] /> <input type="text" id="phonepro" name="phonepro" value="[% phonepro %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
[% IF ( mandatoryphonepro ) %]<span class="required">Required</span>[% END %] [% IF ( mandatoryphonepro ) %]<span class="required">Required</span>[% END %]
</li> </li>
@ -501,7 +501,7 @@
[% ELSE %] [% ELSE %]
<label for="mobile"> <label for="mobile">
[% END %] [% END %]
Phone (cell): </label> Other Phone: </label>
<input type="text" id="mobile" name="mobile" value="[% mobile %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] /> <input type="text" id="mobile" name="mobile" value="[% mobile %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
[% IF ( mandatorymobile ) %]<span class="required">Required</span>[% END %] [% IF ( mandatorymobile ) %]<span class="required">Required</span>[% END %]
</li> </li>

View file

@ -32,19 +32,19 @@
[% IF ( phonepro ) %]<li><span class="label">Organization phone: </span>[% phonepro %]</li>[% END %] [% IF ( phonepro ) %]<li><span class="label">Organization phone: </span>[% phonepro %]</li>[% END %]
[% IF ( emailpro ) %]<li><span class="label">Organization email: </span>[% emailpro %]</li>[% END %] [% IF ( emailpro ) %]<li><span class="label">Organization email: </span>[% emailpro %]</li>[% END %]
[% ELSE %] [% ELSE %]
[% IF ( phone ) %]<li><span class="label">Home: </span>[% phone %]</li>[% END %] [% IF ( phone ) %]<li><span class="label">Primary phone: </span>[% phone %]</li>[% END %]
[% IF ( mobile ) %]<li><span class="label">Mobile: </span>[% mobile %]</li>[% END %] [% IF ( mobile ) %]<li><span class="label">Secondary phone: </span>[% mobile %]</li>[% END %]
[% IF ( phonepro ) %]<li><span class="label">Work: </span>[% phonepro %]</li>[% END %] [% IF ( phonepro ) %]<li><span class="label">Other phone: </span>[% phonepro %]</li>[% END %]
[% END %] [% END %]
[% IF ( P ) %] [% IF ( P ) %]
[% IF ( phone ) %]<li><span class="label">Professional phone: </span>[% phone %]</li>[% END %] [% IF ( phone ) %]<li><span class="label">Primary phone: </span>[% phone %]</li>[% END %]
[% IF ( mobile ) %]<li><span class="label">Professional mobile: </span>[% mobile %]</li>[% END %] [% IF ( mobile ) %]<li><span class="label">Secondary mobile: </span>[% mobile %]</li>[% END %]
[% END %] [% END %]
[% IF ( fax ) %]<li><span class="label">Fax: </span>[% fax %]</li>[% END %] [% IF ( fax ) %]<li><span class="label">Fax: </span>[% fax %]</li>[% END %]
[% UNLESS ( I ) %] [% UNLESS ( I ) %]
[% IF ( email ) %]<li><span class="label">Email (home):</span><a href="mailto:[% email %]">[% email %]</a></li>[% END %] [% IF ( email ) %]<li><span class="label">Primary email:</span><a href="mailto:[% email %]">[% email %]</a></li>[% END %]
[% IF ( emailpro ) %]<li><span class="label">Email (work): </span><a href="mailto:[% emailpro %]">[% emailpro %]</a></li>[% END %] [% IF ( emailpro ) %]<li><span class="label">Secondary email: </span><a href="mailto:[% emailpro %]">[% emailpro %]</a></li>[% END %]
[% END %] [% END %]
<li><span class="label">Initials: </span>[% initials %]</li> <li><span class="label">Initials: </span>[% initials %]</li>
<li><span class="label">Date of birth:</span>[% dateofbirth %]</li> <li><span class="label">Date of birth:</span>[% dateofbirth %]</li>

View file

@ -196,19 +196,19 @@ function validate1(date) {
[% IF ( phonepro ) %]<li><span class="label">Organization phone: </span>[% phonepro %]</li>[% END %] [% IF ( phonepro ) %]<li><span class="label">Organization phone: </span>[% phonepro %]</li>[% END %]
[% IF ( emailpro ) %]<li><span class="label">Organization email: </span>[% emailpro %]</li>[% END %] [% IF ( emailpro ) %]<li><span class="label">Organization email: </span>[% emailpro %]</li>[% END %]
[% ELSE %] [% ELSE %]
[% IF ( phone ) %]<li><span class="label">Home: </span>[% phone %]</li>[% END %] [% IF ( phone ) %]<li><span class="label">Primary phone: </span>[% phone %]</li>[% END %]
[% IF ( mobile ) %]<li><span class="label">Mobile: </span>[% mobile %]</li>[% END %] [% IF ( mobile ) %]<li><span class="label">Secondary phone: </span>[% mobile %]</li>[% END %]
[% IF ( phonepro ) %]<li><span class="label">Work: </span>[% phonepro %]</li>[% END %] [% IF ( phonepro ) %]<li><span class="label">Other phone: </span>[% phonepro %]</li>[% END %]
[% END %] [% END %]
[% IF ( P ) %] [% IF ( P ) %]
[% IF ( phone ) %]<li><span class="label">Professional phone: </span>[% phone %]</li>[% END %] [% IF ( phone ) %]<li><span class="label">Primary phone: </span>[% phone %]</li>[% END %]
[% IF ( mobile ) %]<li><span class="label">Professional mobile: </span>[% mobile %]</li>[% END %] [% IF ( mobile ) %]<li><span class="label">Secondary phone: </span>[% mobile %]</li>[% END %]
[% END %] [% END %]
[% IF ( fax ) %]<li><span class="label">Fax: </span>[% fax %]</li>[% END %] [% IF ( fax ) %]<li><span class="label">Fax: </span>[% fax %]</li>[% END %]
[% UNLESS ( I ) %] [% UNLESS ( I ) %]
[% IF ( email ) %]<li><span class="label">Email (home):</span><a href="mailto:[% email %]">[% email %]</a></li>[% END %] [% IF ( email ) %]<li><span class="label">Primary email:</span><a href="mailto:[% email %]">[% email %]</a></li>[% END %]
[% IF ( emailpro ) %]<li><span class="label">Email (work): </span><a href="mailto:[% emailpro %]">[% emailpro %]</a></li>[% END %] [% IF ( emailpro ) %]<li><span class="label">Secondary email: </span><a href="mailto:[% emailpro %]">[% emailpro %]</a></li>[% END %]
[% END %] [% END %]
<li><span class="label">Initials: </span>[% initials %]</li> <li><span class="label">Initials: </span>[% initials %]</li>
<li><span class="label">Date of birth:</span>[% dateofbirth %]</li> <li><span class="label">Date of birth:</span>[% dateofbirth %]</li>

View file

@ -23,9 +23,9 @@ Card Number:</th><td>[% cardnumber %]</td></tr>
<tr><th scope="row">Permanent Address:</th><td> [% B_address %], [% B_address2 %], [% B_city %]</td></tr> <tr><th scope="row">Permanent Address:</th><td> [% B_address %], [% B_address2 %], [% B_city %]</td></tr>
<tr><th scope="row">Phone (Home):</th><td>[% IF ( phone ) %][% phone %][% ELSE %]&nbsp;[% END %]</td></tr> <tr><th scope="row">Primary Phone:</th><td>[% IF ( phone ) %][% phone %][% ELSE %]&nbsp;[% END %]</td></tr>
<tr><th scope="row">Phone (Daytime):</th><td>[% IF ( mobile ) %][% mobile %][% ELSE %]&nbsp;[% END %]</td></tr> <tr><th scope="row">Secondary Phone:</th><td>[% IF ( mobile ) %][% mobile %][% ELSE %]&nbsp;[% END %]</td></tr>
<tr><th scope="row">Fax:</th><td>[% IF ( fax ) %][% fax %][% ELSE %]&nbsp;[% END %]</td></tr> <tr><th scope="row">Fax:</th><td>[% IF ( fax ) %][% fax %][% ELSE %]&nbsp;[% END %]</td></tr>

View file

@ -34,9 +34,9 @@
<li><label for="state">State:</label> <input id="state" type="text" value="[% BORROWER_INF.state %]" name="state" /></li> <li><label for="state">State:</label> <input id="state" type="text" value="[% BORROWER_INF.state %]" name="state" /></li>
<li><label for="zipcode">Zip Code: </label><input type="text" id="zipcode" value="[% BORROWER_INF.zipcode %]" name="zipcode" /></li> <li><label for="zipcode">Zip Code: </label><input type="text" id="zipcode" value="[% BORROWER_INF.zipcode %]" name="zipcode" /></li>
<li><label for="country">Country: </label><input type="text" id="country" value="[% BORROWER_INF.country %]" name="country" /></li> <li><label for="country">Country: </label><input type="text" id="country" value="[% BORROWER_INF.country %]" name="country" /></li>
<li><label for="phone">Home Phone:</label> <input id="phone" type="text" value="[% BORROWER_INF.phone %]" name="phone" /></li> <li><label for="phone">Primary Phone:</label> <input id="phone" type="text" value="[% BORROWER_INF.phone %]" name="phone" /></li>
<li><label for="mobile">Mobile Phone:</label> <input id="mobile" type="text" value="[% BORROWER_INF.mobile %]" name="mobile" /></li> <li><label for="mobile">Secondary Phone:</label> <input id="mobile" type="text" value="[% BORROWER_INF.mobile %]" name="mobile" /></li>
<li><label for="phonepro">Work phone:</label> <input id="phonepro" type="text" value="[% BORROWER_INF.phonepro %]" name="phonepro" /></li> <li><label for="phonepro">Other Phone:</label> <input id="phonepro" type="text" value="[% BORROWER_INF.phonepro %]" name="phonepro" /></li>
<li><label for="fax">Fax:</label> <input id="fax" type="text" value="[% BORROWER_INF.fax %]" name="fax" /></li> <li><label for="fax">Fax:</label> <input id="fax" type="text" value="[% BORROWER_INF.fax %]" name="fax" /></li>
<li><label for="emailaddress">Primary Email:</label> <input id="emailaddress" type="text" value="[% BORROWER_INF.email %]" name="emailaddress" /></li> <li><label for="emailaddress">Primary Email:</label> <input id="emailaddress" type="text" value="[% BORROWER_INF.email %]" name="emailaddress" /></li>
<li><label for="emailpro">Secondary Email:</label> <input id="emailpro" type="text" value="[% BORROWER_INF.emailpro %]" name="emailpro" /></li> <li><label for="emailpro">Secondary Email:</label> <input id="emailpro" type="text" value="[% BORROWER_INF.emailpro %]" name="emailpro" /></li>
@ -113,9 +113,9 @@
<li><span class="label">State:</span> [% BORROWER_INF.state %]</li> <li><span class="label">State:</span> [% BORROWER_INF.state %]</li>
<li><span class="label">Zip Code:</span> [% BORROWER_INF.zipcode %]</li> <li><span class="label">Zip Code:</span> [% BORROWER_INF.zipcode %]</li>
<li><span class="label">Country:</span> [% BORROWER_INF.country %]</li> <li><span class="label">Country:</span> [% BORROWER_INF.country %]</li>
<li><span class="label">Home Phone:</span> [% BORROWER_INF.phone %]</li> <li><span class="label">Primary Phone:</span> [% BORROWER_INF.phone %]</li>
<li><span class="label">Mobile Phone:</span> [% BORROWER_INF.mobile %]</li> <li><span class="label">Secondary Phone:</span> [% BORROWER_INF.mobile %]</li>
<li><span class="label">Work phone:</span> [% BORROWER_INF.phonepro %]</li> <li><span class="label">Other Phone:</span> [% BORROWER_INF.phonepro %]</li>
<li><span class="label">Fax:</span> [% BORROWER_INF.fax %]</li> <li><span class="label">Fax:</span> [% BORROWER_INF.fax %]</li>
<li><span class="label">Primary Email:</span> [% BORROWER_INF.email %]</li> <li><span class="label">Primary Email:</span> [% BORROWER_INF.email %]</li>
<li><span class="label">Secondary Email:</span> [% BORROWER_INF.emailpro %]</li> <li><span class="label">Secondary Email:</span> [% BORROWER_INF.emailpro %]</li>