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 -N -r1.37.6.2 -r1.37.6.3
--- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp	19 Jul 2004 18:39:39 -0000	1.37.6.2
+++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp	12 Apr 2005 15:37:35 -0000	1.37.6.3
@@ -18,6 +18,7 @@
 
 %>
 
+
 <if @user_can_browse_p@>
   <small>[&nbsp;<a href="@dotlrn_url@/manage-memberships">#dotlrn.lt_JoinDrop_a_Class_or_C#</a>&nbsp;]</small>
   <br></br>
@@ -26,47 +27,24 @@
 <if @communities:rowcount@ gt 0>
 
 <multiple name="communities">
+@communities.previous_type_ul_tags;noquote@
 
-<%
-    set old_level 0
-    set new_level 0
-    set depth 0
-%>
-
-<h3>
+<ul class="mktree" style="padding-left: 5px;"><li id="dotlrn-main-@communities.simple_community_type@" remember="1">
+<h3 style="display: inline; margin: 5px 0 0 0;">
   <if @communities.simple_community_type@ eq "dotlrn_class_instance">
-    <%= [parameter::get -localize -parameter class_instances_pretty_plural] %>:
+    <%= [parameter::get -localize -parameter class_instances_pretty_plural] %>
   </if>
   <else>
-    <%= [parameter::get -localize -parameter clubs_pretty_plural] %>:
+    <%= [parameter::get -localize -parameter clubs_pretty_plural] %>
   </else>
-</h3>
 
+</h3><small>( <a href="#" style="text-decoration: none; border: 0;" onClick="expandTree('tree-@communities.simple_community_type@'); this.parentNode.parentNode.className = nodeOpenClass; return false;">++</a> | <a href="#" style="text-decoration: none; border: 0;"  onClick="collapseTree('tree-@communities.simple_community_type@'); return false;">--</a> )</small>
+
+<ul id="tree-@communities.simple_community_type@"><li>
 <group column="simple_community_type">
 
-<% set new_level $communities(tree_level) %>
+@communities.intra_type_ul_tags;noquote@
 
-  <if @new_level@ lt @old_level@>
-    <% incr depth -1 %>
-    </ul>
-	<if @new_level@ eq 1 and @depth@ gt 1>
-	<% while {$depth > 1} {	
-		append close_tags "</ul>" 
-		incr depth -1 
-	} 
-	%>
-	@close_tags;noquote@
-        </if>
-     </if>
-
-  <if @new_level@ gt @old_level@>
-<% incr depth 1 %>
-    <ul>
-	<nobr>
-  </if>
-
-      <li>
-        <nobr>
           <a href="@communities.url@">@communities.pretty_name@</a>
 	<if @communities.archived_p@><font color=red>Archived</font></if>
 	<if @show_buttons_p@ eq 1>
@@ -75,25 +53,18 @@
                         <a href="@communities.url@deregister?referer=@referer@">#dotlrn.drop_membership_link#</a>
                       </small>
            </if>
-		<if @communities.admin_p@ eq 1>
+           <if @communities.admin_p@ eq 1>
                   &nbsp; <small>
                            <a href="@communities.url@one-community-admin">#dotlrn.administer_link#</a>
                          </small>
-		</if>
+	   </if>
 	</if>
-        </nobr>
-      </li>
 
-<% set old_level $new_level %>
-
 </group>
+</li></ul></li></ul>
 
-<%
-    for {set i $depth} {$i > 0} {incr i -1} {
-        template::adp_puts "</ul>\n"
-    }
-%>
-
 </multiple>
 
+@final_ul_tags;noquote@
+
 </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 -N -r1.11.6.2 -r1.11.6.3
--- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl	19 Jul 2004 18:39:39 -0000	1.11.6.2
+++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl	12 Apr 2005 15:37:35 -0000	1.11.6.3
@@ -46,15 +46,59 @@
 }
 
 set comm_type ""
-db_multirow communities select_communities {} {
-    set tree_level [expr $tree_level - $community_type_level]
+set old_depth 0
+set depth 0
+db_multirow -extend {intra_type_ul_tags previous_type_ul_tags} communities select_communities {} {
+    set intra_type_ul_tags ""
+    set previous_type_ul_tags ""
+    set new_type_p 0
     if {![string equal $simple_community_type dotlrn_community]} {
         set comm_type $simple_community_type
     } else {
         set simple_community_type $comm_type
     }
+    #Checking for existence of old_simple_community_type gives us an
+    #easy way to detect the first row.  Don't pre-define it!
+    if { ![info exists old_simple_community_type] ||
+         ![string equal $old_simple_community_type $simple_community_type] } {
+        set base_level $tree_level
+        set new_type_p 1
+    }
+    if { [info exists old_simple_community_type] &&
+         ![string equal $old_simple_community_type $simple_community_type] } {
+        append previous_type_ul_tags [string repeat "</li></ul>" $old_depth]
+        set old_depth 0
+    }
+
+    set depth [expr $tree_level - $base_level]
+    if { $depth > $old_depth } {
+        append intra_type_ul_tags [string repeat "<ul><li>" [expr $depth - $old_depth]]
+    }
+    if { $old_depth > $depth } {
+        append intra_type_ul_tags [string repeat "</li></ul>" [expr $old_depth - $depth]]
+        append intra_type_ul_tags "</li><li>"
+    }
+    if { $depth == $old_depth && !$new_type_p } {
+        append intra_type_ul_tags "</li><li>"
+    }
+
+    set old_depth $depth
+    set old_simple_community_type $simple_community_type
 }
 
+if { $old_depth > 0 } {
+    set final_ul_tags [string repeat "</li></ul>" $old_depth]
+} else {
+    set final_ul_tags ""
+}
+
 set dotlrn_url [dotlrn::get_url]
 
+# Add the dhtml tree javascript to the HEAD.
+global dotlrn_master__header_stuff
+append dotlrn_master__header_stuff {
+     <script src="/resources/acs-templating/mktree.js" language="javascript"></SCRIPT>
+     <link rel="stylesheet" href="/resources/acs-templating/mktree.css" media="all">
+}
+
 ad_return_template