Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp	29 Mar 2002 19:20:50 -0000	1.7
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp	28 Apr 2002 18:58:18 -0000	1.8
@@ -21,16 +21,14 @@
 
 <ul>
 
-<if @dotlrn_admin_p@ eq 1>
-  <li><a href="@dotlrn_admin_url@">dotLRN Administration</a>
-</if>
+  <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>
@@ -53,17 +51,16 @@
     </ul>
   </li>
 
-  <p></p>
   <li>@sub_pretty_plural@
-        <ul>
-        <multiple name="subgroups">
-        <li> <a href=@subgroups.community_url@>@subgroups.pretty_name@</a>
-        </multiple>
-        <li> <a href=subcommunity-new>New @sub_pretty_name@</a>
-        </ul>
+    <ul>
+      <multiple name="subgroups">
+        <li><a href=@subgroups.url@>@subgroups.pretty_name@</a><small>
+            [<a href=@subgroups.url@one-community-admin>Admin</a> |
+            <a href=subcommunity-delete>Delete</a>]</small>
+      </multiple>
+      <li><a href=subcommunity-new>New @sub_pretty_name@</a></ul>
   </li>
-
-  <p></p>
+  
   <li><a href="applets">Manage Applets</a></li>
 
 </ul>
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.tcl	29 Mar 2002 19:20:50 -0000	1.7
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.tcl	28 Apr 2002 18:58:18 -0000	1.8
@@ -15,9 +15,10 @@
 #
 
 
-# www/news-portlet.tcl
+# www/dotlrn-admin-portlet.tcl
 ad_page_contract {
-    The display logic for the dotlrn admin portlet
+    The display logic for the dotlrn admin portlet. This shows the 
+    "Group Administration" section of the group admin page.
 
     @author Arjun Sanyal (arjun@openforce.net)
     @author Ben Adida (ben@openforce)
@@ -26,23 +27,22 @@
     
 }
 
+# get some basics
 array set config $cf	
 set community_id $config(community_id)
-
 set dotlrn_admin_p [dotlrn::admin_p]
 set dotlrn_admin_url "[dotlrn::get_url]/admin"
+set sub_pretty_name [ad_parameter subcommunities_pretty_name dotlrn]
+set sub_pretty_plural [ad_parameter subcommunities_pretty_plural dotlrn]
 
+# get the community info 
 db_1row select_community_info {}
 
-db_multirow subgroups select_subgroups {}
+# get the subcomm info
+set rows [dotlrn_community::get_subcomm_info_list -community_id $community_id]
+template::util::list_of_ns_sets_to_multirow \
+	-rows $rows \
+	-var_name subgroups
 
-# hack for now
-set n_subgroups 0
 
-# get the right pretty name, plural for subgroups
-set sub_pretty_name [ad_parameter subcommunities_pretty_name dotlrn]
-set sub_pretty_plural [ad_parameter subcommunities_pretty_plural dotlrn]
 
-
-ad_return_template
-