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.2 -r1.3
--- openacs-4/packages/acs-subsite/www/group-master.adp	28 Aug 2003 09:41:40 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/group-master.adp	30 Aug 2003 15:15:00 -0000	1.3
@@ -48,7 +48,7 @@
       </if>
       <if @logout_url@ not nil>
         &nbsp;
-        <span class="button-header"><a href="@logout_url@" title="Logout from @system_name@" class="button">Logout</a></span>
+        <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;
Index: openacs-4/packages/acs-subsite/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/index.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/index.adp	22 May 2003 14:07:08 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/index.adp	30 Aug 2003 15:15:00 -0000	1.7
@@ -20,4 +20,4 @@
 </ul>
 
 <if @user_id@ eq 0><a href="@login_url@">Login</a></if>
-<else><a href="register/logout">Logout</a></else>
+<else><a href="register/logout?return_url=@subsite_url@">Logout</a></else>
Index: openacs-4/packages/acs-subsite/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/index.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/index.tcl	28 Aug 2003 09:41:40 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/index.tcl	30 Aug 2003 15:15:00 -0000	1.8
@@ -11,6 +11,7 @@
 } -properties {
     context:onevalue
     subsite_name:onevalue
+    subsite_url:onevalue
     nodes:multirow
     admin_p:onevalue
     user_id:onevalue
@@ -34,6 +35,8 @@
     select acs_object.name(:package_id) from dual
 }]
 
+set subsite_url [subsite::get_element -element url]
+
 set node_id [ad_conn node_id]
 
 db_multirow nodes site_nodes {}