Index: openacs-4/packages/dotlrn/www/one-community-admin.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-admin.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/dotlrn/www/one-community-admin.adp	21 Jan 2002 06:30:11 -0000	1.12
+++ openacs-4/packages/dotlrn/www/one-community-admin.adp	22 Jan 2002 15:33:17 -0000	1.13
@@ -1,48 +1,8 @@
 <master src="master">
-<property name="title">Admin: @pretty_name@</property>
 <property name="context_bar">@context_bar@</property>
-<property name="portal_id">@portal_id@</property>
+<property name="title">@pretty_name@ Admin</property>
+<property name="portal_id">@admin_portal_id@</property>
 
-<ul>
+<p></p>
 
-<if @dotlrn_admin_p@ eq 1>
-  <li><a href="@dotlrn_admin_url@">dotLRN Administration</a>
-</if>
-
-  <p></p>
-  <li>
-    <a href="one-community-portal-template">Customize This Portal</a>
-  </li>
-
-  <p></p>
-  <li>
-    Membership
-    <ul>
-      <li><a href="members">Manage Membership</a> - Add/Remove @pretty_name@ members</li>
-      <li>
-        Change Enrollment Policy
-        - <if @join_policy@ eq "closed">closed</if><else><a href="join-policy-toggle?policy=closed">closed</a></else>
-        | <if @join_policy@ eq "open">open</if><else><a href="join-policy-toggle?policy=open">open</a></else>
-        | <if @join_policy@ eq "needs approval">wait</if><else><a href="join-policy-toggle?policy=needs%20approval">wait</a></else>
-      </li>
-      <li>
-        <a href="user-add?type=student&rel_type=dotlrn_user_rel&read_private_data_p=t">Add a Limited Access user to this community</a>
-        - This allows you to register new users and give them access to just this community.
-      </li>
-      <li>
-        <a href="user-add?type=student&rel_type=dotlrn_user_rel&read_private_data_p=f">Add a Limited Access Guest user to this community</a>
-        - This allows you to register new non-MIT users and give them access to just this community.
-        Information about students who are part of this community will not be available to this user.
-      </li>
-    </ul>
-  </li>
-
-<if @n_subgroups@ gt 0>
-  <p></p>
-  <li><include src="subgroups"></li>
-</if>
-
-  <p></p>
-  <li><a href="applets">Manage Applets</a></li>
-
-</ul>
+@rendered_page@
Index: openacs-4/packages/dotlrn/www/one-community-admin.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-admin.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/dotlrn/www/one-community-admin.tcl	21 Jan 2002 06:30:11 -0000	1.12
+++ openacs-4/packages/dotlrn/www/one-community-admin.tcl	22 Jan 2002 15:33:17 -0000	1.13
@@ -7,29 +7,25 @@
     @version $Id$
 } -query {
 } -properties {
-    dotlrn_admin_p:onevalue
-    dotlrn_admin_url:onevalue
     community_id:onevalue
     community_type:onevalue
     pretty_name:onevalue
     description:onevalue
-    join_policy:onevalue
-    n_subgroups:onevalue
+    portal_template_id:onevalue
+    users:multirow
 }
 
 set portal_id ""
+
 set community_id [dotlrn_community::get_community_id]
 
+# Permissions
 dotlrn::require_user_admin_community $community_id
 
-set dotlrn_admin_p [dotlrn::admin_p]
-set dotlrn_admin_url "[dotlrn::get_url]/admin"
-
 db_1row select_community_info {}
 
-set n_subgroups [db_string select_subgroups_count {
-    select 1 from dual where 1 = 0
-} -default 0]
+# render the admin page
+set rendered_page [dotlrn::render_page -render_style all_in_one $admin_portal_id]
 
 set context_bar {Admin}
 
Index: openacs-4/packages/dotlrn/www/one-community-admin.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-admin.xql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/one-community-admin.xql	20 Jan 2002 06:11:04 -0000	1.6
+++ openacs-4/packages/dotlrn/www/one-community-admin.xql	22 Jan 2002 15:33:17 -0000	1.7
@@ -3,14 +3,13 @@
 <queryset>
   <fullquery name="select_community_info">
     <querytext>
-      select dotlrn_communities.community_type,
-             dotlrn_communities.pretty_name,
-             dotlrn_communities.description,
-             groups.join_policy
-      from dotlrn_communities,
-           groups
-      where dotlrn_communities.community_id = :community_id
-      and groups.group_id = :community_id
+      select community_type,
+             pretty_name,
+             description,
+             portal_template_id,
+             admin_portal_id
+      from dotlrn_communities
+      where community_id = :community_id
     </querytext>
   </fullquery>
 </queryset>