From c2a0333caf045eee6a2eb800662cad6e3526cd25 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 28 Feb 2008 10:18:30 +1300
Subject: [PATCH] Beginning changes to opac-userupdate.tmpl, with the intention
 of eliminating opac-userdetails.tmpl in favor of linking directly to update
 form (a la Wordpress)

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 koha-tmpl/opac-tmpl/prog/en/css/opac.css      | 20 ++++++++-
 .../prog/en/modules/opac-passwd.tmpl          | 10 ++---
 .../prog/en/modules/opac-userdetails.tmpl     |  1 -
 .../prog/en/modules/opac-userupdate.tmpl      | 44 +++++++++++++++----
 4 files changed, 59 insertions(+), 16 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index f89bd5a4a3..98fb1e7639 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -639,10 +639,28 @@ fieldset.brief legend {
 
 fieldset.brief label {
 	display : block;
-	font-weight : bold;
 	padding : .3em 0;
 }
 
+fieldset.brief input, fieldset.brief textarea {	
+	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%;
+	padding : .2em;
+	font-weight: normal;
+}
+
+fieldset.brief textarea {
+	font-size: 105%;
+}
+
+fieldset.brief input:focus {
+	background-color: #FFFFCC;
+}
+
 fieldset.brief ol, fieldset.brief li {
 	list-style-type : none;
 }
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tmpl
index 93997ffd14..b13e767fab 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tmpl
@@ -12,7 +12,7 @@
 	<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" -->l../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Change your Password </h3>
 
     <!-- TMPL_IF NAME= "Error_messages" -->
-<div class="error">        <h3>There was a problem with your submission</h3>
+<div class="dialog error">        <h3>There was a problem with your submission</h3>
         <p>
             <!-- TMPL_IF NAME= "PassMismatch" -->
             Passwords do not match.  Please re-type your new password.
@@ -28,7 +28,7 @@
     
     <!-- TMPL_IF NAME= "Ask_data" -->
         <!-- TMPL_IF NAME="OpacPasswordChange" -->
-        <form action="/cgi-bin/koha/opac-passwd.pl" name="mainform" id="mainform" method="post"><fieldset class="rows">
+        <form action="/cgi-bin/koha/opac-passwd.pl" name="mainform" id="mainform" method="post"><fieldset class="brief">
 			<!-- TMPL_UNLESS NAME= "ShortPass" --><div class="hint">Your password must be at least <!-- TMPL_VAR NAME="minpasslen" --> characters long.</div><!-- /TMPL_UNLESS -->
           <ol>  <li><label for="password">Current Password:</label> <input type="password" id="Oldkey" size="25"  name="Oldkey" /></li>
             <li><label for="Newkey">New Password:</label> <input type="password" id="Newkey"  size="25"  name="Newkey" /></li>
@@ -36,13 +36,13 @@
             <fieldset class="action"><input type="submit" value="Submit Changes" class="submit" /> <a href="/cgi-bin/koha/opac-user.pl" class="cancel">Cancel</a></fieldset>
     </form>
         <!-- TMPL_ELSE -->
-            <div class="error">You can't change your password.</div>
+            <div class="dialog alert">You can't change your password.</div>
         <!-- /TMPL_IF -->
     <!-- /TMPL_IF -->
     
     <!-- TMPL_IF NAME= "password_updated" -->
-        <h1>Password Updated</h1>
-        Your password has been changed
+        <div class="dialog message"><h1>Password Updated</h1>
+        Your password has been changed</div>
         <form action="/cgi-bin/koha/opac-user.pl" method="post">
             <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
             <p><input type="submit" class="icon back" value="Return to Your Record" /></p>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tmpl
index 0ce33a2270..eaf5216565 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tmpl
@@ -31,7 +31,6 @@ Card Number:</th><td><!-- TMPL_VAR NAME="cardnumber" --></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>
 
 <table>
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 3563e4ab0e..6556afa644 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
@@ -11,28 +11,54 @@
 <!-- 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>
+<div class="yui-u first">
+
 <form action="/cgi-bin/koha/opac-userupdate.pl" method="get">
 <input type="hidden" name="modify" value="yes" />
-<fieldset class="rows"><ol>
-<li><label for="surname">Last Name:</label> <input id="surname" type="text"  size="28" value="<!-- TMPL_VAR name="surname" -->"  name="surname" /></li>
-
+<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>
+</ol>
+</fieldset>
 
+<fieldset class="brief"><legend>Mailing Address</legend>
+<ol>
 <li>
-    <label for="streetaddress">Mailing Address:</label>
-        <textarea id="streetaddress" cols="25"  name="streetaddress"><!--TMPL_VAR NAME="streetnumber"--> <!-- TMPL_VAR name="address" --> <!-- TMPL_VAR NAME="zipcode"--></textarea>
+    <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>
 
-<li><label for="faxnumber">Work/Fax phone:</label> <input id="faxnumber"  type="text"  size="28" value="<!-- TMPL_VAR name="fax" -->"  name="faxnumber" /></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="emailaddress">Email:</label> <input id="emailaddress" type="text"  size="28" value="<!-- TMPL_VAR name="email" -->"  name="emailaddress" /></li>
+</ol>
+</fieldset>
+</div>
+<div class="yui-u">
+<fieldset class="brief">
+<legend>Permanent Address</legend>
+<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>
+</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="dob">Date of Birth: </label> <input id="dob" type="text" size="10" value="<!-- TMPL_VAR NAME="dateofbirth" -->" name="dateofbirth" /></li>
 </ol></fieldset>
+</div>
 <fieldset class="action">
 <input type="submit" value="Submit Changes" /> <a class="cancel" href="/cgi-bin/koha/opac-userdetails.pl">Cancel</a></fieldset>
 </form>
-- 
2.39.5