Index: openacs-4/packages/acs-subsite/lib/login.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/login.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/lib/login.tcl	4 Sep 2003 09:20:53 -0000	1.3
+++ openacs-4/packages/acs-subsite/lib/login.tcl	10 Sep 2003 16:45:49 -0000	1.4
@@ -60,7 +60,7 @@
     set register_url [export_vars -no_empty -base $register_url { username }]
 }
 
-ad_form -name login -html { style "margin: 0px;" } -show_required_p 0 -edit_buttons { { "Login" ok } } -form {
+ad_form -name login -html { style "margin: 0px;" } -show_required_p 0 -edit_buttons { { "Login" ok } } -action "/register/" -form {
     {return_url:text(hidden)}
     {time:text(hidden)}
     {token_id:text(hidden)}
@@ -136,11 +136,8 @@
         }
         default {
             # Display the message on a separate page
-            set page_title "Login denied"
-            set context [list [list "." [_ acs-subsite.Log_In]] "Login denied"]
-            set message $auth_info(account_message)
-            ad_return_template "display-message"
-            break
+            ad_returnredirect [export_vars -base "[subsite::get_element -element url]register/account-closed" { { message $auth_info(account_message) } }]
+            ad_script_abort
         }
     }
 } -after_submit {
@@ -149,13 +146,8 @@
 
     # Handle account_message
     if { [exists_and_not_null auth_info(account_message)] } {
-        set page_title "Logged In"
-        set context [list [list "." [_ acs-subsite.Log_In]] "Logged in"]
-        set message $auth_info(account_message)
-        set continue_url $return_url
-        set continue_label "Continue working with [ad_system_name]"
-        ad_return_template "display-message"
-        return    
+        ad_returnredirect [export_vars -base "[subsite::get_element -element url]register/account-message" { { message $auth_info(account_message) } return_url }]
+        ad_script_abort
     } else {
         # No message
         ad_returnredirect $return_url
Index: openacs-4/packages/acs-subsite/www/group-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/group-master.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/group-master.adp	10 Sep 2003 12:13:07 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/group-master.adp	10 Sep 2003 16:45:49 -0000	1.5
@@ -1,4 +1,4 @@
-<master src="/www/blank-master">
+<master src="/www/site-master">
   <if @title@ not nil>
     <property name="title">@title;noquote@</property>
   </if>
@@ -19,54 +19,11 @@
     <link rel="stylesheet" type="text/css" href="@css_url@" media="all">
   </property>
 
-
-<!-- Header -->
-
-<table cellspacing="0" cellpadding="0" width="100%" class="subsite-header" border="0">
-  <tr class="subsite-header">
-    <td class="system-name" width="34%">
-      <a href="@system_url@" class="system-name">@system_name@</a>
-    </td>
-
-    <td align="center" class="subsite-header" width="33%">
-      <if @user_id@ ne 0>
-        Welcome, @user_name@
-      </if>
-      <else>
-        Not logged in
-      </else>
-    </td>
-
-    <td align="right" class="subsite-header" style="padding-right: 8px;" width="33%">
-      <if @sw_admin_url@ not nil>
-        &nbsp;
-        <span class="button-header"><a href="@sw_admin_url@" title="Visit the site-wide administration pages where you can install new applications on to the system" class="button">Site-Wide Admin</a></span>
-      </if>
-      <if @pvt_home_url@ not nil>
-        &nbsp;
-        <span class="button-header"><a href="@pvt_home_url@" title="You can change your password, portrait, and other information from here" class="button">@pvt_home_name@</a></span>
-      </if>
-      <if @logout_url@ not nil>
-        &nbsp;
-        <span class="button-header"><a href="@logout_url@?return_url=@subsite_url@" title="Logout from @system_name@" class="button">Logout</a></span>
-      </if>
-      <if @login_url@ not nil>
-        &nbsp;
-        <span class="button-header"><a href="@login_url@" title="Log in to @system_name@" class="button">Log in</a></span>
-      </if>
-    </td>
-  </tr>
-</table>
-
-
-<!-- Body -->
-
 <div id="body">
   <div id="subsite-name">
     <a href="@subsite_url@" class="subsite-name">@subsite_name@</a>
   </div>
 
-
 <!-- Top level navigation -->
 
   <div id="navbar"> 
@@ -146,3 +103,4 @@
   </div>
 </div>
 
+ 
Index: openacs-4/packages/acs-subsite/www/register/account-closed.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/account-closed.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/register/account-closed.adp	10 Sep 2003 16:45:49 -0000	1.1
@@ -0,0 +1,6 @@
+<master>
+  <property name="title">@page_title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+
+<p> @message;noquote@ </p>
+
Index: openacs-4/packages/acs-subsite/www/register/account-closed.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/account-closed.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/register/account-closed.tcl	10 Sep 2003 16:45:49 -0000	1.1
@@ -0,0 +1,11 @@
+ad_page_contract {
+    Inform the user that his/her account is closed
+    
+    @cvs-id $Id: account-closed.tcl,v 1.1 2003/09/10 16:45:49 lars Exp $
+} {
+    {message:allhtml ""}
+}
+
+set page_title "Log Denied"
+set context [list $page_title]
+
Index: openacs-4/packages/acs-subsite/www/register/account-message.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/account-message.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/register/account-message.adp	10 Sep 2003 16:45:49 -0000	1.1
@@ -0,0 +1,10 @@
+<master>
+  <property name="title">@page_title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+
+<p> @message;noquote@ </p>
+
+<if @return_url@ not nil>
+  <b>&raquo;</b> <a href="@return_url@">Continue working with @system_name@</a>
+</if>
+
Index: openacs-4/packages/acs-subsite/www/register/account-message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/account-message.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/register/account-message.tcl	10 Sep 2003 16:45:49 -0000	1.1
@@ -0,0 +1,14 @@
+ad_page_contract {
+    Inform the user of an account status message.
+    
+    @cvs-id $Id: account-message.tcl,v 1.1 2003/09/10 16:45:49 lars Exp $
+} {
+    {message:allhtml ""}
+    {return_url ""}
+}
+
+set page_title "Logged in"
+set context [list $page_title]
+
+set system_name [ad_system_name]
+
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/display-message.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-subsite/www/register/user-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/user-new.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-subsite/www/register/user-new.tcl	4 Sep 2003 09:20:54 -0000	1.10
+++ openacs-4/packages/acs-subsite/www/register/user-new.tcl	10 Sep 2003 16:45:49 -0000	1.11
@@ -65,31 +65,22 @@
         default {
             error $creation_info(account_message)
             # Display the message on a separate page
-            set message $creation_info(account_message)
-            ad_return_template "display-message"
-            # TODO: Double-check that this actually causes us to break out of ad_form and have the template display
-            return
+            ad_returnredirect [export_vars -base "[subsite::get_element -element url]register/account-closed" { { message $creation_info(account_message) } }]
+            ad_script_abort
         }
     }
 
 } -after_submit {
     # User is registered and logged in
-
     if { ![exists_and_not_null return_url] } {
         # Redirect to subsite home page.
         set return_url [subsite::get_element -element url]
     }
 
-    # TODO: 
-    # SIMON: Handle creation_message
-
     # Handle account_message
     if { ![empty_string_p $creation_info(account_message)] } {
-        set message creation_info(account_message)
-        set continue_url $return_url
-        set continue_label "Continue working with [ad_system_name]"
-        ad_return_template "display-message"
-        return    
+        ad_returnredirect [export_vars -base "[subsite::get_element -element url]register/account-message" { { message $creation_info(account_message) } return_url }]
+        ad_script_abort
     } else {
         # No messages
         ad_returnredirect $return_url