Index: openacs-4/packages/acs-subsite/www/register/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/register/index.adp	16 Mar 2002 21:08:37 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/register/index.adp	3 Sep 2002 16:29:13 -0000	1.3
@@ -1,63 +1,56 @@
-<master>
+<master src="master">
 <property name=title>Log In</property>
 <property name=focus>login.email</property>
+<property name="context_bar">to <a href="/">@system_name@</a></property>
 
-<h2>Log In</h2>
-
-to <a href=/>@system_name@</a>
-
-<hr>
-
-<p><b>Current users:</b> Please enter your email and password below.</p>
-<p><b>New users:</b>  Welcome to @system_name@.  Please begin the
+<p><strong>Current users:</strong> Please enter your email and password below.</p>
+<p><strong>New users:</strong>  Welcome to @system_name@.  Please begin the
 registration process by entering a valid email address and a
 password for signing into the system.  We will direct you to another form to 
 complete your registration.</p>
 
-<FORM method=post action=user-login name=login>
+<form method="post" action="user-login" name="login">
 @export_vars@
 <table>
-<tr><td>Your email address:</td><td><INPUT type=text name=email value="@email@"></tr>
+<tr><td>Your email address:</td><td><input type="text" name="email" value="@email@" /></td></tr>
 
 <if @old_login_process@ eq 0>
 
  <tr><td>Your password:</td>
-     <td><input type=password name=password></td></tr>
+     <td><input type="password" name="password" /></td></tr>
  <if @allow_persistent_login_p@ eq 1>
 
-   <tr><td colspan=2>
+   <tr><td colspan="2">
  
    <if @persistent_login_p@ eq 1>
-       <input type=checkbox name=persistent_cookie_p value=1 CHECKED> 
+       <input type="checkbox" name="persistent_cookie_p" value="1" checked="checked" /> 
    </if>
    <else>
-       <input type=checkbox name=persistent_cookie_p value=1> 
+       <input type="checkbox" name="persistent_cookie_p" value="1" /> 
    </else>
-
        	Remember this address and password?
 	(<a href="explain-persistent-cookies">help</a>)</td></tr>
  </if>
 
 </if>
 
 
-<tr><td colspan=2 align=center><INPUT TYPE=submit value="Submit"></td></tr>
+<tr><td colspan="2" align="center"><input type="submit" value="Submit" /></td></tr>
 </table>
 
-</FORM>
+</form>
 
-<p>
 <if @email_forgotten_password_p@ eq 1>
-Have you <a href=email-for-password>forgotten your password?</a>
 <p>
+Have you <a href="email-for-password">forgotten your password?</a>
+</p>
 </if>
-If you keep getting thrown back here, it is probably because your
+<p>If you keep getting thrown back here, it is probably because your
 browser does not accept cookies.  We're sorry for the inconvenience
 but it really is impossible to program a system like this without
-keeping track of who is posting what.
+keeping track of who is posting what.</p>
 
 <p>
-
 In Netscape 4.0, you can enable cookies from Edit -&gt; Preferences
 -&gt; Advanced.  In Microsoft Internet Explorer 4.0, you can enable cookies from View -&gt; Internet Options -&gt; Advanced -&gt; Security.
-
+</p>