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.138 -r1.139
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl	31 May 2002 19:23:01 -0000	1.138
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl	31 May 2002 21:31:18 -0000	1.139
@@ -1143,24 +1143,23 @@
 
                 append chunk "$pretext <a href=$url>[get_community_name $sc_id]</a>\n"
 
-                if {![member_p $sc_id $user_id]
-                  && [not_closed_p -community_id $sc_id]} {
+                if {![member_p $sc_id $user_id] && [not_closed_p -community_id $sc_id]} {
 
-                      append chunk "\[<small>"
+                      append chunk "<nobr>\[<small> "
 
                       if {[member_pending_p -community_id $sc_id -user_id $user_id]} {
-                          append chunk "waiting&nbsp;for&nbsp;approval"
+                          append chunk "Pending Approval"
                       } elseif {[needs_approval_p -community_id $sc_id]} {
-                          append chunk "<a href=${url}${join_target}?referer=[ad_conn url]>request&nbsp;membership</a>"
+                          append chunk "<a href=\"${url}${join_target}?referer=[ad_conn url]\">Request Membership</a>"
                       } else {
-                          append chunk "<a href=${url}${join_target}>join</a>"
+                          append chunk "<a href=\"${url}${join_target}\">Join</a>"
                       }
 
-                      append chunk "</small>\]\n"
+                      append chunk " </small>\]</nobr>\n"
                 }
 
                 if {[dotlrn::user_can_admin_community_p $sc_id]} {
-                    append chunk " \[<small> <a href=${url}one-community-admin>Administer</a> </small>\]\n"
+                    append chunk "<nobr>\[<small> <a href=\"${url}one-community-admin\">Administer</a> </small>\]</nobr>\n"
                 }
             }
         }
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.29 -r1.30
--- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp	31 May 2002 13:26:28 -0000	1.29
+++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp	31 May 2002 21:31:18 -0000	1.30
@@ -25,46 +25,35 @@
 <if @communities:rowcount@ gt 0>
 
   <ul>
+<multiple name="communities">
 
 <%
-    set old_simple_community_type ""
-    set new_simple_community_type ""
     set old_level 0
     set new_level 0
+    set depth 0
 %>
 
-<multiple name="communities">
+  <if @communities.simple_community_type@ eq "dotlrn_class_instance">
+    <li><%= [parameter::get -parameter class_instances_pretty_plural] %>:
+  </if>
+  <else>
+    <li><%= [parameter::get -parameter clubs_pretty_plural] %>:
+  </else>
 
-<%
-    if {![string equal $communities(simple_community_type) dotlrn_community]} {
-        set new_simple_community_type $communities(simple_community_type)
-    }
+<group column="simple_community_type">
 
-    set new_level $communities(tree_level)
-%>
+<% set new_level $communities(tree_level) %>
 
-    <if @new_level@ lt @old_level@>
-      </ul>
-    </if>
+  <if @new_level@ lt @old_level@>
+<% incr depth -1 %>
+    </ul>
+  </if>
 
-    <if @new_simple_community_type@ ne @old_simple_community_type@>
-      <if @old_simple_community_type@ ne "">
-        </ul>
-        <br>
-<% set old_level [expr $new_level - 1] %>
-      </if>
-      <if @new_simple_community_type@ eq "dotlrn_class_instance">
-        <li><%= [parameter::get -parameter class_instances_pretty_plural] %>:
-      </if>
-      <else>
-        <li><%= [parameter::get -parameter clubs_pretty_plural] %>:
-      </else>
-    </if>
+  <if @new_level@ gt @old_level@>
+<% incr depth 1 %>
+    <ul>
+  </if>
 
-    <if @new_level@ gt @old_level@>
-      <ul>
-    </if>
-
       <li>
         <nobr>
           <a href="@communities.url@">@communities.pretty_name@</a>
@@ -76,19 +65,17 @@
         </nobr>
       </li>
 
-<%
-    set old_simple_community_type $new_simple_community_type
-    set old_level $new_level
-%>
+<% set old_level $new_level %>
 
-</multiple>
+</group>
 
 <%
-    for {set i $new_level} {$i > 0} {incr i -1} {
+    for {set i $depth} {$i > 0} {incr i -1} {
         template::adp_puts "</ul>\n"
     }
 %>
 
+</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.5 -r1.6
--- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl	7 Apr 2002 06:09:35 -0000	1.5
+++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl	31 May 2002 21:31:18 -0000	1.6
@@ -24,6 +24,20 @@
 }
 
 set user_id [ad_conn user_id]
-db_multirow communities select_communities {}
 
+set comm_type ""
+db_multirow communities select_communities {} {
+
+    ns_log notice "XXX0 $simple_community_type $comm_type"
+
+    if {![string equal $simple_community_type dotlrn_community]} {
+        set comm_type $simple_community_type
+    } else {
+        set simple_community_type $comm_type
+    }
+
+    ns_log notice "XXX1 $simple_community_type $comm_type"
+
+}
+
 ad_return_template