Index: openacs-4/packages/dotlrn/dotlrn.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v
diff -u -r1.41 -r1.42
--- openacs-4/packages/dotlrn/dotlrn.info	23 Jan 2002 00:15:43 -0000	1.41
+++ openacs-4/packages/dotlrn/dotlrn.info	23 Jan 2002 04:58:08 -0000	1.42
@@ -181,6 +181,8 @@
             <file type="content_page" path="www/deregister.tcl"/>
             <file type="content_page" path="www/dotlrn-main-portlet.adp"/>
             <file type="content_page" path="www/dotlrn-main-portlet.tcl"/>
+            <file type="query_file" path="www/dotlrn-main-portlet.xql"/>
+            <file type="content_page" path="www/help.adp"/>
             <file type="content_page" path="www/help.gif"/>
             <file type="content_page" path="www/index-not-a-user.adp"/>
             <file type="content_page" path="www/index-not-a-user.tcl"/>
Index: openacs-4/packages/dotlrn/www/communities-chunk-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/communities-chunk-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/communities-chunk-oracle.xql	19 Jan 2002 22:54:20 -0000	1.1
+++ openacs-4/packages/dotlrn/www/communities-chunk-oracle.xql	23 Jan 2002 04:58:08 -0000	1.2
@@ -24,9 +24,14 @@
                             from dotlrn_member_rels_full
                             where dotlrn_member_rels_full.user_id = :user_id
                             and dotlrn_member_rels_full.community_id = dotlrn_communities.community_id)) as member_p,
-             decode(acs_permission.permission_p(:user_id, dotlrn_communities.community_id, 'admin'),'f',0,1) as admin_p
+             decode(acs_permission.permission_p(:user_id, dotlrn_communities.community_id, 'admin'),'f',0,1) as admin_p,
+             (select community_type
+              from dotlrn_community_types
+              where supertype = 'dotlrn_community'
+              start with community_type = dotlrn_communities.community_type
+              connect by community_type = prior supertype) as root_community_type
       from dotlrn_communities_not_closed dotlrn_communities
-      order by dotlrn_communities.community_type, dotlrn_communities.pretty_name
+      order by root_community_type, dotlrn_communities.community_type, dotlrn_communities.pretty_name
     </querytext>
   </fullquery>
 
@@ -44,9 +49,14 @@
                             from dotlrn_member_rels_full
                             where dotlrn_member_rels_full.user_id = :user_id
                             and dotlrn_member_rels_full.community_id = dotlrn_communities.community_id)) as member_p,
-             decode(acs_permission.permission_p(:user_id, dotlrn_communities.community_id, 'admin'),'f',0,1) as admin_p
+             decode(acs_permission.permission_p(:user_id, dotlrn_communities.community_id, 'admin'),'f',0,1) as admin_p,
+             (select community_type
+              from dotlrn_community_types
+              where supertype = 'dotlrn_community'
+              start with community_type = dotlrn_communities.community_type
+              connect by community_type = prior supertype) as root_community_type
       from dotlrn_active_comms_not_closed dotlrn_communities
-      order by dotlrn_communities.community_type, dotlrn_communities.pretty_name
+      order by root_community_type, dotlrn_communities.community_type, dotlrn_communities.pretty_name
     </querytext>
   </fullquery>
 
@@ -72,10 +82,15 @@
                             from dotlrn_member_rels_full
                             where dotlrn_member_rels_full.user_id = :user_id
                             and dotlrn_member_rels_full.community_id = dotlrn_communities.community_id)) as member_p,
-             decode(acs_permission.permission_p(:user_id, dotlrn_communities.community_id, 'admin'),'f',0,1) as admin_p
+             decode(acs_permission.permission_p(:user_id, dotlrn_communities.community_id, 'admin'),'f',0,1) as admin_p,
+             (select community_type
+              from dotlrn_community_types
+              where supertype = 'dotlrn_community'
+              start with community_type = dotlrn_communities.community_type
+              connect by community_type = prior supertype) as root_community_type
       from dotlrn_communities_not_closed dotlrn_communities
       where dotlrn_communities.community_type = :community_type
-      order by dotlrn_communities.pretty_name
+      order by root_community_type, dotlrn_communities.pretty_name
     </querytext>
   </fullquery>
 
@@ -93,10 +108,15 @@
                             from dotlrn_member_rels_full
                             where dotlrn_member_rels_full.user_id = :user_id
                             and dotlrn_member_rels_full.community_id = dotlrn_communities.community_id)) as member_p,
-             decode(acs_permission.permission_p(:user_id, dotlrn_communities.community_id, 'admin'),'f',0,1) as admin_p
+             decode(acs_permission.permission_p(:user_id, dotlrn_communities.community_id, 'admin'),'f',0,1) as admin_p,
+             (select community_type
+              from dotlrn_community_types
+              where supertype = 'dotlrn_community'
+              start with community_type = dotlrn_communities.community_type
+              connect by community_type = prior supertype) as root_community_type
       from dotlrn_active_comms_not_closed dotlrn_communities
       where dotlrn_communities.community_type = :community_type
-      order by dotlrn_communities.pretty_name
+      order by root_community_type, dotlrn_communities.pretty_name
     </querytext>
   </fullquery>
 </queryset>
Index: openacs-4/packages/dotlrn/www/communities-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/communities-chunk.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/communities-chunk.adp	23 Jan 2002 00:15:43 -0000	1.3
+++ openacs-4/packages/dotlrn/www/communities-chunk.adp	23 Jan 2002 04:58:08 -0000	1.4
@@ -4,10 +4,11 @@
   <p>@filter_bar@</p>
 
 <if @communities:rowcount@ gt 0>
-  <table cellpadding="5" cellspacing="5">
 <multiple name="communities">
+  <table width="85%" cellpadding="5" cellspacing="5">
+<group column="root_community_type">
     <tr>
-      <td><a href="@communities.url@">@communities.pretty_name@</a></td>
+      <td width="65%"><a href="@communities.url@">@communities.pretty_name@</a></td>
       <td>
 <if @communities.member_p@ eq 0>
         (<include src="register-link" url="register?community_id=@communities.community_id@&referer=@referer@">)
@@ -22,7 +23,10 @@
 </if>
       </td>
     </tr>
-</multiple>
+</group>
   </table>
+
+  <p></p>
+</multiple>
 </if>
 </if>
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.4 -r1.5
--- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp	23 Jan 2002 00:15:43 -0000	1.4
+++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp	23 Jan 2002 04:58:08 -0000	1.5
@@ -6,15 +6,20 @@
 
 <p></p>
 
-<table border="0" cellpadding="2" cellspacing="2" width="100%">
-<multiple name="communities">
-<group column="community_type">
-  <tr>
-    <td>
-      <font face="arial,helvetica" size="-1" color="black">
-        <a href="@communities.url@">@communities.pretty_name@</a></td>
-      </font>
-  </tr>
-</group>
+<if @classes:rowcount@ gt 0>
+  <%= [ad_parameter classes_pretty_plural] %>
+  <ul>
+<multiple name="classes">
+  <li><a href="@classes.url@">@classes.pretty_name@</a></li>
 </multiple>
-</table>
+  </ul>
+</if>
+
+<if @clubs:rowcount@ gt 0>
+  <%= [ad_parameter clubs_pretty_plural] %>
+  <ul>
+<multiple name="clubs">
+  <li><a href="@clubs.url@">@clubs.pretty_name@</a></li>
+</multiple>
+  </ul>
+</if>
Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl	23 Jan 2002 00:15:43 -0000	1.2
+++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl	23 Jan 2002 04:58:08 -0000	1.3
@@ -9,20 +9,7 @@
 
 set user_id [ad_conn user_id]
 
-set sql {
-    select dotlrn_communities.community_id,
-           dotlrn_communities.community_type,
-           dotlrn_communities.community_key,
-           dotlrn_communities.pretty_name,
-           dotlrn_communities.package_id
-    from dotlrn_communities,
-         dotlrn_member_rels_full
-    where dotlrn_communities.community_id = dotlrn_member_rels_full.community_id
-    and dotlrn_member_rels_full.user_id = :user_id
-}
+db_multirow classes select_classes {}
+db_multirow clubs select_clubs {}
 
-db_multirow -local communities select_communities $sql {
-    set communities(url) [dotlrn_community::get_url_from_package_id -package_id ${communities(package_id)}]
-}
-
 ad_return_template
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.xql	23 Jan 2002 04:58:08 -0000	1.1
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+
+<queryset>
+  <fullquery name="select_classes">
+    <querytext>
+      select dotlrn_class_instances_full.pretty_name,
+             dotlrn_class_instances_full.url
+      from dotlrn_class_instances_full,
+           dotlrn_member_rels_full
+      where dotlrn_member_rels_full.user_id = :user_id
+      and dotlrn_member_rels_full.community_id = dotlrn_class_instances_full.class_instance_id
+    </querytext>
+  </fullquery>
+
+  <fullquery name="select_clubs">
+    <querytext>
+      select dotlrn_clubs_full.pretty_name,
+             dotlrn_clubs_full.url
+      from dotlrn_clubs_full,
+           dotlrn_member_rels_full
+      where dotlrn_member_rels_full.user_id = :user_id
+      and dotlrn_member_rels_full.community_id = dotlrn_clubs_full.club_id
+    </querytext>
+  </fullquery>
+</queryset>