Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v
diff -u -r1.61 -r1.62
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl	25 Feb 2002 20:38:37 -0000	1.61
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl	4 Mar 2002 23:54:00 -0000	1.62
@@ -681,6 +681,21 @@
         return $subcomm_list
     }
 
+    ad_proc -public get_subcomm_chunk {
+        {-community_id:required}
+    } {
+        Returns a html fragment of the subcommunities of this community or 
+        if none, the empty list
+    } {
+        set subcomm_chunk "<ul>"
+
+        db_foreach select_subcomms {} {
+            append subcomm_chunk "<li><a href=[get_community_url $subcomm_id]>[get_community_name $subcomm_id]</a></li>"
+        } 
+
+        return [append subcomm_chunk "</ul>"]
+    }
+
     ad_proc -public get_community_type_url {
         community_type
     } {
Index: openacs-4/packages/dotlrn/tcl/community-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.xql,v
diff -u -r1.29 -r1.30
--- openacs-4/packages/dotlrn/tcl/community-procs.xql	21 Feb 2002 17:28:17 -0000	1.29
+++ openacs-4/packages/dotlrn/tcl/community-procs.xql	4 Mar 2002 23:54:00 -0000	1.30
@@ -197,6 +197,13 @@
 </querytext>
 </fullquery>
 
+<fullquery name="dotlrn_community::get_subcomm_chunk.select_subcomms">
+<querytext>
+select community_id as subcomm_id from dotlrn_communities where parent_community_id = :community_id
+</querytext>
+</fullquery>
+
+
 <fullquery name="dotlrn_community::get_community_type_package_id.select_package_id">
 <querytext>
 select package_id from dotlrn_community_types where community_type= :community_type
Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp	25 Feb 2002 22:19:15 -0000	1.8
+++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp	4 Mar 2002 23:54:00 -0000	1.9
@@ -10,9 +10,8 @@
   <%= [ad_parameter classes_pretty_plural] %>
   <ul>
     <multiple name="classes">
-      <li><a href="@classes.url@">@classes.pretty_name@</a>
-      <ul></ul>
-      </li>
+      <li><a href="@classes.url@">@classes.pretty_name@</a></li>
+      <%=  [dotlrn_community::get_subcomm_chunk -community_id $classes(community_id)] %>
       
     </multiple>
   </ul>
@@ -26,6 +25,7 @@
         <a href="@clubs.url@">@clubs.pretty_name@</a>
         <if @clubs.admin_p@ eq t> - <a href="@clubs.url@one-community-admin">admin</a></if>
       </li>
+      <%=  [dotlrn_community::get_subcomm_chunk -community_id $clubs(community_id)] %>
     </multiple>
   </ul>
 </if>
Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/dotlrn-main-portlet.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.xql	25 Feb 2002 20:47:15 -0000	1.2
+++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.xql	4 Mar 2002 23:54:00 -0000	1.3
@@ -3,7 +3,8 @@
 <queryset>
   <fullquery name="select_classes">
     <querytext>
-      select dotlrn_class_instances_full.pretty_name,
+      select community_id, 
+             dotlrn_class_instances_full.pretty_name,
              dotlrn_class_instances_full.url,
              acs_permission.permission_p(community_id, :user_id, 'admin') as admin_p
       from dotlrn_class_instances_full,
@@ -15,7 +16,8 @@
 
   <fullquery name="select_clubs">
     <querytext>
-      select dotlrn_clubs_full.pretty_name,
+      select community_id, 
+             dotlrn_clubs_full.pretty_name,
              dotlrn_clubs_full.url,
              acs_permission.permission_p(community_id, :user_id, 'admin') as admin_p
       from dotlrn_clubs_full,