Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-main-portlet-oracle.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/dotlrn-main-portlet-oracle.xql	31 May 2002 06:23:49 -0000	1.4
+++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet-oracle.xql	31 May 2002 13:26:28 -0000	1.5
@@ -16,8 +16,7 @@
                  dotlrn_member_rels_approved
             where dotlrn_communities.community_id = dotlrn_member_rels_approved.community_id
             and dotlrn_member_rels_approved.user_id = :user_id
-            order by decode(dotlrn_communities.community_type, 'dotlrn_community', 2, 'dotlrn_club', 1, 0),
-                     tree_level
+            order by dotlrn_communities.tree_sortkey
         </querytext>
     </fullquery>
 
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.28 -r1.29
--- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp	31 May 2002 06:23:49 -0000	1.28
+++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp	31 May 2002 13:26:28 -0000	1.29
@@ -40,16 +40,10 @@
         set new_simple_community_type $communities(simple_community_type)
     }
 
-#    if {[string equal $communities(simple_community_type) dotlrn_club]} {
-#        set new_level [expr $communities(tree_level) - 1]
-#    } elseif {[string equal $communities(simple_community_type) dotlrn_class_instance]} {
-#        set new_level [expr $communities(tree_level) - 3]
-#    }
-
     set new_level $communities(tree_level)
 %>
 
-    <if @new_level@ lt @old_level@ and @old_simple_community_type@ eq @new_simple_community_type@>
+    <if @new_level@ lt @old_level@>
       </ul>
     </if>