[Koha-cvs] koha/koha-tmpl/opac-tmpl/prog/en opac-userdetai... [rel_3_0]

[Antoine Farnault]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     Antoine Farnault <toins>        07/01/29 16:39:34

Modified files:
        koha-tmpl/opac-tmpl/prog/en: opac-userdetails.tmpl 
                                     opac-userupdate.tmpl 

Log message:
        fix some incorrects TMPL_VAR & display enhancement.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.5&r2=1.1.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-userupdate.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.3&r2=1.1.2.4

Patches:
Index: opac-userdetails.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -b -r1.1.2.5 -r1.1.2.6
--- opac-userdetails.tmpl       8 Dec 2006 11:24:58 -0000       1.1.2.5
+++ opac-userdetails.tmpl       29 Jan 2007 16:39:34 -0000      1.1.2.6
@@ -29,7 +29,7 @@
 
 <tr><th scope="row">Fax:</th><td><!-- TMPL_IF NAME="fax" --><!-- TMPL_VAR 
NAME="fax" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
 
-<tr><th scope="row">E-mail:</th><td><!-- TMPL_IF NAME="email" --><a 
href="mailto:<!-- TMPL_VAR NAME="email" -->"><!-- TMPL_VAR NAME="emailaddress" 
--></a><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
+<tr><th scope="row">E-mail:</th><td><!-- TMPL_IF NAME="email" --><a 
href="mailto:<!-- TMPL_VAR NAME="email" -->"><!-- TMPL_VAR NAME="email" 
--></a><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
 
 <tr><th scope="row">Textmessaging:</th><td><!-- TMPL_IF NAME="opacnote" 
--><!-- TMPL_VAR NAME="opacnote" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF 
--></td></tr>
 </table>
@@ -56,10 +56,8 @@
 
 <tr><th scope="row">Sex:</th><td><!-- TMPL_IF NAME="sex" --><!-- TMPL_VAR 
NAME="sex" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr></table>
 
-
 <h3>Alternate Contact Details</h3>
-
-
+<!-- TMPL_IF NAME="contactname"-->
 <table><tr><th scope="row">Alternate Contact:</th><td> <!-- TMPL_IF 
NAME="contactname" --><!-- TMPL_VAR NAME="contactname" --><!-- TMPL_ELSE 
-->&nbsp;<!-- /TMPL_IF --></td></tr>
 
 <tr><th scope="row">Phone:</th><td> <!-- TMPL_IF NAME="B_phone" --><!-- 
TMPL_VAR NAME="B_phone" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
@@ -70,6 +68,9 @@
 
 <tr><th scope="row">Guarantor:</th><td> <!-- TMPL_IF NAME="guarantorid" 
--><!-- TMPL_VAR NAME="guarantorid" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF 
--> </td></tr></table>
 
+<!-- TMPL_ELSE -->
+No alternate contact.<br /><br />
+<!-- /TMPL_IF -->
 
 <form action="/cgi-bin/koha/opac-userupdate.pl" method="post">
 <input type="submit" name="Modify" value="Modify Your Record" />

Index: opac-userupdate.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-userupdate.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- opac-userupdate.tmpl        7 Dec 2006 15:42:15 -0000       1.1.2.3
+++ opac-userupdate.tmpl        29 Jan 2007 16:39:34 -0000      1.1.2.4
@@ -14,15 +14,20 @@
 
 <tr><th><label for="firstname">First Name</label></th><td><input 
id="firstname" type="text"  size="25" value="<!-- TMPL_VAR name="firstname" 
-->"  name="firstname"></td></tr>
 
-<tr><th><label for="streetaddress">Mailing Address</label></th><td><input 
id="streetaddress" type="text"  size="25" value="<!-- TMPL_VAR 
name="streetaddress" -->"  name="streetaddress"></td></tr>
+<tr>
+    <th><label for="streetaddress">Mailing Address</label></th>
+    <td>
+        <textarea id="streetaddress" cols="25"  
name="streetaddress"><!--TMPL_VAR NAME="streetnumber"--> <!-- TMPL_VAR 
name="address" --> <!-- TMPL_VAR NAME="zipcode"--></textarea>
+    </td>
+</tr>
 
 <tr><th><label for="city">City, State</label></th><td><input id="city" 
type="text"  size="25" value="<!-- TMPL_VAR name="city" -->"  
name="city"></td></tr>
 
 <tr><th><label for="phone">Home Phone</label></th><td><input id="phone" 
type="text"  size="25" value="<!-- TMPL_VAR name="phone" -->"  
name="phone"></td></tr>
 
-<tr><th><label for="faxnumber">Work/Fax phone</label></th><td><input 
id="faxnumber"  type="text"  size="25" value="<!-- TMPL_VAR name="faxnumber" 
-->"  name="faxnumber"></td></tr>
+<tr><th><label for="faxnumber">Work/Fax phone</label></th><td><input 
id="faxnumber"  type="text"  size="25" value="<!-- TMPL_VAR name="fax" -->"  
name="faxnumber"></td></tr>
 
-<tr><th><label for="emailaddress">Email</label></th><td><input 
id="emailaddress" type="text"  size="40" value="<!-- TMPL_VAR 
name="emailaddress" -->"  name="emailaddress"></td></tr>
+<tr><th><label for="emailaddress">Email</label></th><td><input 
id="emailaddress" type="text"  size="25" value="<!-- TMPL_VAR name="email" -->" 
 name="emailaddress"></td></tr>
 </table>
 <p>Clicking 'Submit Changes' will send an email to a library staff member with 
the information you've entered.  You will then be returned to your patron 
record.</p>
 <p><input type="submit" value="Submit Changes"></p>