Index: openacs-4/packages/acs-subsite/www/register/email-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/email-confirm.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/register/email-confirm.adp	15 Aug 2003 21:18:12 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/register/email-confirm.adp	29 Aug 2003 12:25:45 -0000	1.7
@@ -1,42 +1,37 @@
 <master>
-<property name="title">#acs-subsite.Email_Confirmation#</property>
-<property name="context">#acs-subsite.Email_Confirmation#</property>
+  <property name="title">#acs-subsite.Email_Confirmation#</property>
+  <property name="context">{#acs-subsite.Email_Confirmation#}</property>
 
 <if @email_verified_p@ eq "f">
 
+  <property name="title">#acs-subsite.lt_Your_email_is_confirm#</property>
+
   <if @member_state@ eq "approved">
 
-    <h2>#acs-subsite.lt_Your_email_is_confirm#</h2>
-    #acs-subsite.at# @site_link@
-    <hr>
     #acs-subsite.lt_Your_email_has_been_c#
     <p>
     <form action="index" method=post>
-    @export_vars@
+    @export_vars;noquote@
     <input type=submit value="Continue">
     </form>
-    <p>
-    #acs-subsite.lt_Note_If_youve_forgott_1#</a>.
 
+    <p> #acs-subsite.lt_Note_If_youve_forgott_1#</a>. </p>
+
   </if>
   <else>
 
-    <h2>#acs-subsite.lt_Your_email_is_confirm#</h2>
-    #acs-subsite.at# @site_link@
-    <hr>
-    #acs-subsite.lt_Your_email_has_been_c_1#    
+    <p> #acs-subsite.lt_Your_email_has_been_c_1# </p>
 
   </else>
 
 </if>
 <else>
 
-  <h2>#acs-subsite.Email_not_Requested#</h2>
-  <hr>
-  
-  <p>#acs-subsite.lt_We_were_not_awaiting_#
+  <property name="title">#acs-subsite.Email_not_Requested#</property>
 
-  <p>#acs-subsite.lt_Please_try_to_a_hrefi#
+  <p> #acs-subsite.lt_We_were_not_awaiting_# </p>
+
+  <p> #acs-subsite.lt_Please_try_to_a_hrefi# </p>
     
 </else>