Index: openacs-4/packages/acs-subsite/www/user/password-update.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/password-update.adp,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-subsite/www/user/password-update.adp	3 Sep 2003 08:33:34 -0000	1.14
+++ openacs-4/packages/acs-subsite/www/user/password-update.adp	4 Sep 2003 16:35:04 -0000	1.15
@@ -1,42 +1,6 @@
 <master>
   <property name="title">#acs-subsite.Update_Password#</property>
-  <property name="context_bar">#acs-subsite.lt_for_first_names_last_#</property>
-  <property name="context">#acs-subsite.Update_Password#</property>
-  <property name="focus">pwd.old_password</property>
-<if @expired_p@ true>
-  <p>
-    Welcome to @system_name@. 
-  </p>
-  <p>
-    Your login was successful, but your password has expired, and must
-    be updated now, before you can proceed to use @system_name@.
-  </p>
-</if>
+  <property name="context">@context;noquote@</property>
+  <property name="focus">@focus;noquote@</property>
 
-<form method="post" action="password-update-2" name="pwd">
- <input type="hidden" name="return_url" value="@return_url@" /> <input type="hidden" name="user_id" value="@user_id@" />
-<table>
-
-<tr>
-  <th>#acs-subsite.Current_Password#</th>
-  <td><input type="password" name="old_password" size="15" /></td>
-</tr>
-
-<tr>
-  <th>#acs-subsite.New_Password#</th>
-  <td><input type="password" name="password_1" size="15" /></td>
-</tr>
-
-<tr>
-  <th>#acs-subsite.Confirm#</th>
-  <td><input type="password" name="password_2" size="15" /></td>
-</tr>
-
-<tr>
-  <th></th>
-  <td><input type="submit" value="#acs-subsite.Update#" /></td>
-</tr>
-
-</table>
-
-</form>
+<formtemplate id="update"></formtemplate>