[interchange-cvs] interchange - jonc modified
dist/standard/pages/login.html
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Mon Jul 25 10:01:04 EDT 2005
User: jonc
Date: 2005-07-25 14:01:04 GMT
Modified: dist/standard/pages login.html
Log:
* Tidy up the page, separate login and new account functions.
* New class for session error used.
* Fix indenting.
* Fix bad form button when already logged in and visit page.
Revision Changes Path
1.5 +112 -89 interchange/dist/standard/pages/login.html
rev 1.5, prev_rev 1.4
Index: login.html
===================================================================
RCS file: /var/cvs/interchange/dist/standard/pages/login.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- login.html 23 Apr 2005 18:10:10 -0000 1.4
+++ login.html 25 Jul 2005 14:01:04 -0000 1.5
@@ -24,75 +24,111 @@
<table width="95%">
<tr>
<td>
+<h1>[L]Please Log In[/L]</h1>
[if session failure]
- <br><br>
- <B>[calc] delete $Session->{failure}[/calc]</b>
- <br>
+ <div align="center">
+ <span class="errorbox" align="center">
+ [calc] delete $Session->{failure}[/calc]
+ </span>
+ </div>
[/if]
-[set mv_no_cache]1[/set]
-[set [L]New Account[/L]]
-mv_nextpage=new_account
-[set new]1[/set]
+[set [L]Log In[/L]]
+[userdb login]
+mv_nextpage=[either][scratchd mv_successpage][or]member/service[/either]
[/set]
[tmp cookie_username][read-cookie MV_USERNAME][/tmp]
[if !session logged_in]
- <form action="[process secure=1]" method="POST">
+ <form action="[process secure=1]" method="POST">
+ <input type="hidden" name="mv_todo" value="return">
+ <input type="hidden" name="mv_nextpage" value="login">
+ [form-session-id]
+
+ <table border="0" cellspacing="0" align="center" width="400">
+ <tr>
+ <td colspan="2" class="titletab_small">
+ [L]Existing account holders[/L]:
+ </td>
+ </tr>
+ <tr>
+ <td class="shadowbox">
+ <p>[L LOGIN_EXISTING]If you already have an account with us, please log in here.[/L]</p>
+ <table border="0" cellspacing="0" width="100%">
+ <tr>
+ <td align="right" class="contentbar1">
+ [L]Username[/L]:
+ </td>
+ <td class="">
+ <input name="mv_username" value="[scratch cookie_username]">
+ </td>
+ </tr>
+ <tr>
+ <td align="right" class="contentbar1">
+ [L]Password[/L]:
+ </td>
+ <td class="">
+ <input type="password" name="mv_password" value="">
+ </td>
+ </tr>
+ [if config CookieLogin]
+ <tr>
+ <td align="right" class="contentbar1">
+ [L]Remember me[/L]:
+ </td>
+ <td class="contentbar1">
+ <input type="hidden" name="mv_cookie_password" value="0">
+ <input type="checkbox" name="mv_cookie_password" value="1" [if scratch cookie_username]CHECKED[/if]>
+ </td>
+ </tr>
+ [/if]
+ <tr>
+ <td> </td>
+ <td>
+ <input class="button3" type="submit" name="mv_click" value="[L]Log In[/L]">
+ </td>
+ </tr>
+ </table>
+ <p align="center">
+ [page lost_password][L]Lost your password?[/L]</a>
+ </p>
+ </td>
+ </tr>
+ </table>
+ </form>
+
+[set mv_no_cache]1[/set]
+[set [L]New Account[/L]]
+mv_nextpage=new_account
+[set new]1[/set]
+[/set]
+
+ <form action="[process secure=1]" method="POST">
<input type="hidden" name="mv_todo" value="return">
- <input type="hidden" name="mv_click" value="Login">
- <input type="hidden" name="mv_failpage" value="login">
- <input type="hidden" name="mv_successpage" value="[either][scratchd mv_successpage][or]member/service[/either]">
- <input type="hidden" name="mv_nextpage" value="index">
+ <input type="hidden" name="mv_nextpage" value="new_account">
[form-session-id]
- <table border="0" align="center">
- <tr>
- <td class="contentbar1" align="center">
- <table align="center">
- <tr>
- <td align="right" class="titletab_small">
- [L]Username[/L]
- </td>
- <td class="titletab_small">
- <input name="mv_username" value="[scratch cookie_username]">
- </td>
- </tr>
- <tr>
- <td align="right" class="titletab_small">
- [L]Password[/L]
- </td>
- <td class="titletab_small">
- <input type="password" name="mv_password" VALUE="">
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <input class="button3" type=submit value="[L]Log In[/L]">
- <input class="button3" type="submit" NAME="mv_click" value="[L]New Account[/L]">
- </td>
- </tr>
- [if config CookieLogin]
- <tr>
- <td align="right" class="contentbar1">
- <input type="hidden" name="mv_cookie_password" value="0">
- <input type="checkbox" name="mv_cookie_password" value="1" [if scratch cookie_username]CHECKED[/if]>
- </td>
- <td>
- [L]Log me in automatically (sets cookie)[/L]
- </td>
- </tr>
- [/if]
- </table>
- </td>
- </tr>
- </table>
-
- </form>
+ <table border="0" cellspacing="0" align="center" width="400">
+ <tr>
+ <td colspan="2" class="titletab_small">
+ [L]Create new account[/L]:
+ </td>
+ </tr>
+ <tr>
+ <td class="shadowbox">
+ <p>[L LOGIN_NEW]Creating a new account will allow you to
+ place orders with us faster, as well as being able to check your
+ order status and look at your previous orders.[/L]</p>
+ <center>
+ <input class="button3" type="submit" name="mv_click" value="[L]New Account[/L]">
+ </center>
+ </td>
+ </tr>
+ </table>
+
[else]
@@ -101,45 +137,32 @@
<input type="hidden" name="mv_todo" value="return">
<input type="hidden" name="mv_click" value="Logout_choice">
<input type="hidden" name="mv_nextpage" value="login">
-
- <table align="center">
- <tr>
- <td class="contentbar1" align="center">
- <table>
- <tr class="titletab_small">
- <td colspan="2" class="titletab_small">
- <b>[L]You are already logged in.[/L]</b>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td class="contentbar1">
- <br> <br>
- <input name="submit" value="[L]Log Out[/L]">
- <input type="checkbox" name="clear_values" checked value="1"> [L]Clear name/address[/L][if items] <input type="checkbox" name="clear_cart" checked value="1"> [L]Clear cart[/L][/if]<BR>
- <br> <br>
- </td>
- </tr>
- <tr class="titletab_small">
- <td colspan=2>
- [msg arg.0="<a href='[area new_account]'>" arg.1="</a>"]Or you can create a %snew account%s.[/msg]
- </td>
- </tr>
- </table>
+
+ <table border="0" cellspacing="0" align="center" width="400">
+ <tr>
+ <td colspan="2" class="titletab_small">
+ [L]You are already logged in.[/L]
+ </td>
+ </tr>
+ <tr>
+ <td class="shadowbox">
+ <table align="center">
+ <tr>
+ <td class="contentbar1" align="center">
+ <input class="button3" type="submit" value="[L]Log Out[/L]">
+ <input type="checkbox" name="clear_values" checked value="1"> [L]Clear name/address[/L][if items] <input type="checkbox" name="clear_cart" checked value="1"> [L]Clear cart[/L][/if]<BR>
+ <p>
+ [msg arg.0="<a href='[area new_account]'>" arg.1="</a>"]Or you can create a %snew account%s.[/msg]
+ </p>
+ </td>
+ </tr>
+ </table>
</td>
</tr>
</table>
-
</form>
-
[/else]
[/if]
-
- <p>
- <center>
- [page lost_password][L]Lost your password?[/L]</a>
- </center>
- </p>
</td>
</tr>
More information about the interchange-cvs
mailing list