[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/user userpage.tmpl,1.1,1.2

[Paul POULAIN]

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/user
In directory 
usw-pr-cvs1:/tmp/cvs-serv18392/koha-tmpl/intranet-tmpl/default/en/user

Modified Files:
        userpage.tmpl 
Log Message:
merging 1.2 and bugfixes for auth and login

Index: userpage.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** userpage.tmpl       2 Oct 2002 16:18:13 -0000       1.1
--- userpage.tmpl       10 Oct 2002 10:08:33 -0000      1.2
***************
*** 2,78 ****
  
  <TMPL_IF NAME="loggedinuser">
! <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a 
href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>
! <TMPL_ELSE>
! </TMPL_IF>
! <p>
  
  
! <center>
! <h3>This page is just a mock up</h3>
  
! <table border=0 cellspacing=15>
! <tr><td valign=top>
  
!     <table border=1 cellpadding=10>
!     <tr><th bgcolor=#99cccc background=/images/background-opac.gif><font 
size=+2>Reserves</font></th></tr>
!     <tr><td>
!     <b>You have the following books waiting to be picked up:</b>
!     <ul>
!     <li>The Great Mom Swap by Betsy Hanes at Main Library
!     <li>Between Brothers by Irene Morck at Main Library
!     </ul>
!     <p>
!     <b>You have the following requests for items on loan:</b>
!     <ul>
!     <li>The Amazing Apple Book by Paulette Bourgeois
!     <li>Tracey the Great by Alan Cliburn
!     <li>The biography of a grizzly by Ernest Thompson Seton
!     </ul>
!     </td></tr>
!     </table>
! 
! </td><td valign=top>
! 
!     <form method=post>
!     <table border=1 cellpadding=10>
!       <tr><th bgcolor=#99cccc background=/images/background-opac.gif><font 
size=+2>User Preferences</font></th></tr>
!       <tr><td align =center>
!           <table border=0 cellpadding=5>
!               <tr><td>Language</td><td>
!               <select name=language>
!               <option value=english>English
!               <option value=english>French
!               <option value=english>German
!               <option value=english>Polish
!               </select>
!               </td></tr>
!               <tr><td>E-mail Address</td><td><input name=email size=30 
value=<TMPL_VAR NAME=loggedinuser>@mylibrary.com></td></tr>
!               <tr><td>Preferred Branch<br>for reserve pickups</td><td>
!                   <select name=pickupbranch>
!                   <option value=MAIN>Main Library
!                   <option value=SEDGE>Sedgewick Library
!                   <option value=HANSEN selected>Rick Hansen Library
!                   <option value=CAT>Cataline Library
!                   </select>
!               </td></tr>
!               <tr><td colspan=2>
!                   <input name=specialeventsbyemail type=checkbox checked> 
Notify me about Special Events by email<br>
!                   <input name=overduesbyemail type=checkbox checked> Notify 
me about overdues by email<br>
!                   <input name=recordreadingrecord type=checkbox> Keep a 
record of books I have read<br>
!                   <input name=recordreadingrecord type=checkbox> Allow 
library staff to see my reading record<br>
!               </td></tr>
                <tr><td align=center colspan=2>
!                   <input type=submit value="Set Preferences">
                </td>
                </tr>
            </table>
!       </td></tr>
!     </table>
!     </form>
!     
! </td></tr>
! </table>
! 
! </center>
  
  <TMPL_INCLUDE NAME="opac-bottom.inc">
--- 2,89 ----
  
  <TMPL_IF NAME="loggedinuser">
!       <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a 
href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>
!       <p>
!       <center>
!       <h3>This page is just a mock up</h3>
! 
!       <table border=0 cellspacing=15>
!       <tr><td valign=top>
! 
!       <table border=1 cellpadding=10>
!       <tr><th bgcolor=#99cccc background=/images/background-opac.gif><font 
size=+2>Reserves</font></th></tr>
!       <tr><td>
!       <b>You have the following books waiting to be picked up:</b>
!       <ul>
!       <li>The Great Mom Swap by Betsy Hanes at Main Library
!       <li>Between Brothers by Irene Morck at Main Library
!       </ul>
!       <p>
!       <b>You have the following requests for items on loan:</b>
!       <ul>
!       <li>The Amazing Apple Book by Paulette Bourgeois
!       <li>Tracey the Great by Alan Cliburn
!       <li>The biography of a grizzly by Ernest Thompson Seton
!       </ul>
!       </td></tr>
!       </table>
  
+       </td><td valign=top>
  
!               <form method=post>
!               <table border=1 cellpadding=10>
!               <tr><th bgcolor=#99cccc 
background=/images/background-opac.gif><font size=+2>User 
Preferences</font></th></tr>
!               <tr><td align =center>
!               <table border=0 cellpadding=5>
!                       <tr><td>Language</td><td>
!                       <select name=language>
!                       <option value=english>English
!                       <option value=english>French
!                       <option value=english>German
!                       <option value=english>Polish
!                       </select>
!                       </td></tr>
!                       <tr><td>E-mail Address</td><td><input name=email 
size=30 value=<TMPL_VAR NAME=loggedinuser>@mylibrary.com></td></tr>
!                       <tr><td>Preferred Branch<br>for reserve pickups</td><td>
!                       <select name=pickupbranch>
!                       <option value=MAIN>Main Library
!                       <option value=SEDGE>Sedgewick Library
!                       <option value=HANSEN selected>Rick Hansen Library
!                       <option value=CAT>Cataline Library
!                       </select>
!                       </td></tr>
!                       <tr><td colspan=2>
!                       <input name=specialeventsbyemail type=checkbox checked> 
Notify me about Special Events by email<br>
!                       <input name=overduesbyemail type=checkbox checked> 
Notify me about overdues by email<br>
!                       <input name=recordreadingrecord type=checkbox> Keep a 
record of books I have read<br>
!                       <input name=recordreadingrecord type=checkbox> Allow 
library staff to see my reading record<br>
!                       </td></tr>
!                       <tr><td align=center colspan=2>
!                       <input type=submit value="Set Preferences">
!                       </td>
!                       </tr>
!               </table>
!               </td></tr>
!       </table>
!       </form>
  
!       </td></tr>
!       </table>
  
!       </center>
! <TMPL_ELSE>
!       <center>
!       <form method=post>
!               <table border=1 cellpadding=10>
!               <tr><th bgcolor=#99cccc background=/images/background-opac.gif 
colspan=2><font size=+2>User Preferences</font></th></tr>
!               <tr><td>Name:</td><td><input name="userid"></td></tr>
!               <tr><td>Password:</td><td><input type=password 
name=password></td></tr>
                <tr><td align=center colspan=2>
!                   <input type=submit value="Login">
                </td>
                </tr>
            </table>
!       </form>
!       </center>
! </TMPL_IF>
  
  <TMPL_INCLUDE NAME="opac-bottom.inc">