Finishing re-working of opac userupdate in the style of Wordpress. Link to user detai...

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 4ad06fb..23b435f 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -643,13 +643,17 @@ fieldset.brief label {
        padding : .3em 0;
 }
 
-fieldset.brief input, fieldset.brief textarea {        
+fieldset.brief input+input {
+       margin-top : 3px;
+}
+
+fieldset.brief input, fieldset.brief textarea, fieldset.brief select { 
        background-color: #F3F3F3;
        border-top : 1px solid #979797;
        border-left : 1px solid #979797;
        border-right : 1px solid #DDDDDD;
        border-bottom : 1px solid #DDDDDD;
-       font-size : 150%;
+       font-size : 140%;
        padding : .2em;
        font-weight: normal;
 }

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc b/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
index dea7cf5..5fe63c1 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
@@ -2,7 +2,7 @@
                <ul>
                        <li class="active"><a href="/cgi-bin/koha/opac-user.pl">my summary</a></li>
                        <li><a href="/cgi-bin/koha/opac-account.pl">my fines</a></li>
-                       <li><a href="/cgi-bin/koha/opac-userdetails.pl">my personal details</a></li>
+                       <li><a href="/cgi-bin/koha/opac-userupdate.pl">my personal details</a></li>
                        <!-- TMPL_IF NAME="OpacPasswordChange" --><li><a href="/cgi-bin/koha/opac-passwd.pl">change my password</a></li><!-- /TMPL_IF -->
                        <!-- TMPL_IF NAME="opacreadinghistory" --><li><a href="/cgi-bin/koha/opac-readingrecord.pl">my reading history</a></li><!-- /TMPL_IF -->
                        <!-- TMPL_IF name="suggestion" --><!-- TMPL_UNLESS NAME="AnonSuggestions" --><li><a href="/cgi-bin/koha/opac-suggestions.pl">my purchase suggestions</a></li><!-- /TMPL_UNLESS --><!-- /TMPL_IF -->

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
index 6556afa..1f4c990 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
@@ -10,38 +10,33 @@
 
 <!-- TMPL_LOOP name="BORROWER_INFO" -->
 
-<h3><a href="/cgi-bin/koha/opac-user.pl"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->'s account</a> <img src="<!-- TMPL_VAR NAME="themelang" -->../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Update Your Personal Details</h3>
-<p>Please make any necessary changes to your record.  Submitting the form will notify a library staff member, who will make the changes permanent.</p>
+<h3><a href="/cgi-bin/koha/opac-user.pl"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->'s account</a> <img src="<!-- TMPL_VAR NAME="themelang" -->../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Your Personal Details</h3>
+
 <div class="yui-u first">
 
 <form action="/cgi-bin/koha/opac-userupdate.pl" method="get">
 <input type="hidden" name="modify" value="yes" />
 <fieldset class="brief"><legend>Name</legend><ol>
-<li><label for="firstname">First Name:</label> <input id="firstname" type="text"  size="28" value="<!-- TMPL_VAR name="firstname" -->"  name="firstname" /></li>
-<li><label for="surname">Last Name:</label> <input id="surname" type="text"  size="28" value="<!-- TMPL_VAR name="surname" -->"  name="surname" /></li>
+<li><label for="firstname">First Name:</label> <input id="firstname" type="text" value="<!-- TMPL_VAR name="firstname" -->"  name="firstname" /></li>
+<li><label for="surname">Last Name:</label> <input id="surname" type="text" value="<!-- TMPL_VAR name="surname" -->"  name="surname" /></li>
 </ol>
 </fieldset>
 
-<fieldset class="brief"><legend>Mailing Address</legend>
+<fieldset class="brief"><legend>Contact Information</legend>
 <ol>
 <li>
     <label for="streetaddress">Address:</label>
-       <input type="text" size="28" name="address" value="<!-- TMPL_VAR NAME="address" -->" id="address" />
-</li>
-<li><input type="text" size="28" name="address2" value="<!-- TMPL_VAR NAME="address2" -->" id="address2" /></li>
-<li><label for="city">City, State:</label> <input id="city" type="text"  size="28" value="<!-- TMPL_VAR name="city" -->"  name="city" /></li>
-<li><label for="zipcode">Zip Code: </label><input id="zipcode" name="zipcode" size="28" value="<!-- TMPL_VAR NAME="zipcode" -->" /></li>
-</ol>
-</fieldset>
-<fieldset class="brief"><legend>Contact Information</legend>
-<ol>
-<li><label for="phone">Home Phone:</label> <input id="phone" type="text"  size="28" value="<!-- TMPL_VAR name="phone" -->"  name="phone" /></li>
-<li><label for="mobile">Mobile Phone:</label> <input id="mobile" type="text"  size="28" value="<!-- TMPL_VAR name="mobile" -->"  name="mobile" /></li>
-<li><label for="fax">Fax:</label> <input id="fax" type="text"  size="28" value="<!-- TMPL_VAR name="fax" -->"  name="fax" /></li>
+       <input type="text" name="address" value="<!-- TMPL_VAR NAME="address" -->" id="address" />
+       <input type="text" name="address2" value="<!-- TMPL_VAR NAME="address2" -->" id="address2" /></li>
+<li><label for="city">City, State:</label> <input id="city" type="text" value="<!-- TMPL_VAR name="city" -->"  name="city" /></li>
+<li><label for="zipcode">Zip Code: </label><input id="zipcode" name="zipcode" value="<!-- TMPL_VAR NAME="zipcode" -->" /></li>
+<li><label for="phone">Home Phone:</label> <input id="phone" type="text" value="<!-- TMPL_VAR name="phone" -->"  name="phone" /></li>
+<li><label for="mobile">Mobile Phone:</label> <input id="mobile" type="text" value="<!-- TMPL_VAR name="mobile" -->"  name="mobile" /></li>
+<li><label for="fax">Fax:</label> <input id="fax" type="text" value="<!-- TMPL_VAR name="fax" -->"  name="fax" /></li>
 
-<li><label for="phonepro">Work phone:</label> <input id="phonepro"  type="text"  size="28" value="<!-- TMPL_VAR name="phonepro" -->"  name="phonepro" /></li>
+<li><label for="phonepro">Work phone:</label> <input id="phonepro"  type="text" value="<!-- TMPL_VAR name="phonepro" -->"  name="phonepro" /></li>
 
-<li><label for="emailaddress">Email:</label> <input id="emailaddress" type="text"  size="28" value="<!-- TMPL_VAR name="email" -->"  name="emailaddress" /></li>
+<li><label for="emailaddress">Email:</label> <input id="emailaddress" type="text" value="<!-- TMPL_VAR name="email" -->"  name="emailaddress" /></li>
 </ol>
 </fieldset>
 </div>
@@ -51,16 +46,35 @@
 <ol>
 <li>
     <label for="B_streetaddress">Permanent or Alternate Address:</label>
-        <textarea id="B_streetaddress" cols="25"  name="B_streetaddress"><!--TMPL_VAR NAME="B_streetnumber"--> <!-- TMPL_VAR name="B_address" --> <!-- TMPL_VAR NAME="B_zipcode"--></textarea>
+        <textarea id="B_streetaddress" cols="25"  name="B_streetaddress"><!--TMPL_VAR NAME="B_streetnumber"--> <!-- TMPL_VAR name="B_address" --></textarea>
 </li>
 
-<li><label for="B_city">City, State:</label> <input id="B_city" type="text"  size="28" value="<!-- TMPL_VAR name="B_city" -->"  name="B_city" /></li>
-
+<li><label for="B_city">City, State:</label> <input id="B_city" type="text" value="<!-- TMPL_VAR name="B_city" -->"  name="B_city" /></li>
+<li><label for="B_zipcode">Zip Code</label> <input type="text" id="B_zipcode" value="<!-- TMPL_VAR NAME="B_zipcode" -->" /></li>
+</ol>
+</fieldset>
+<fieldset class="brief">
+<ol>
 <li><label for="dob">Date of Birth: </label> <input id="dob" type="text" size="10" value="<!-- TMPL_VAR NAME="dateofbirth" -->" name="dateofbirth" /></li>
+<li><label for="sex">Sex: </label> <select name="sex" id="sex"><option></option>
+<!-- TMPL_IF EXPR="sex eq 'F'" --><option value="F" selected="selected">Female</option><!-- TMPL_ELSE --><option value="F">Female</option><!-- /TMPL_IF -->
+<!-- TMPL_IF EXPR="sex eq 'M'" --><option value="M" selected="selected">Male</option><!-- TMPL_ELSE --><option value="M">Male</option><!-- /TMPL_IF -->
+</select></li>
 </ol></fieldset>
-</div>
+<fieldset class="brief">
+<legend>Library Use:</legend>
+<ol>
+       <li><label for="borrowernumber">Patron Number:</label><input type="text" id="borrowernumber" disabled="disabled" readonly="readonly" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /></li>
+       <li><label for="categorycode">Patron Category:</label><input type="text" id="categorycode" disabled="disabled" readonly="readonly" value="<!-- TMPL_VAR NAME="categorycode" -->" /></li>
+       <li><label for="dateenrolled">Joined: </label><input type="text" id="dateenrolled" disabled="disabled" readonly="readonly" value="<!-- TMPL_VAR NAME="dateenrolled" -->" /></li>
+       <li><label for="dateexpiry">Expires: </label><input type="text" id="dateexpiry" disabled="disabled" readonly="readonly" value="<!-- TMPL_VAR NAME="dateexpiry" -->" /></li>
+</ol>
+</fieldset>
+<p>Please make any necessary changes to your record.  Submitting the form will notify a library staff member, who will make the changes permanent.</p>
 <fieldset class="action">
-<input type="submit" value="Submit Changes" /> <a class="cancel" href="/cgi-bin/koha/opac-userdetails.pl">Cancel</a></fieldset>
+<input type="submit" value="Submit Changes" /> <a class="cancel" href="/cgi-bin/koha/opac-user.pl">Cancel</a></fieldset>
+
+</div>
 </form>
 
 <!-- /TMPL_LOOP -->