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.5 -r1.6
--- openacs-4/packages/dotlrn/www/dotlrn-main-portlet-oracle.xql	31 May 2002 13:26:28 -0000	1.5
+++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet-oracle.xql	17 Jun 2002 21:57:20 -0000	1.6
@@ -11,6 +11,9 @@
                                                              'dotlrn_club', 'dotlrn_club',
                                                              'dotlrn_class_instance') as simple_community_type,
                    tree.tree_level(dotlrn_communities.tree_sortkey) as tree_level,
+                   nvl((select tree.tree_level(dotlrn_community_types.tree_sortkey)
+                        from dotlrn_community_types
+                        where dotlrn_community_types.community_type = dotlrn_communities.community_type), 0) as community_type_level,
                    acs_permission.permission_p(dotlrn_communities.community_id, :user_id, 'admin') as admin_p
             from dotlrn_communities,
                  dotlrn_member_rels_approved
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.7 -r1.8
--- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl	4 Jun 2002 15:00:27 -0000	1.7
+++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl	17 Jun 2002 21:57:20 -0000	1.8
@@ -28,6 +28,7 @@
 
 set comm_type ""
 db_multirow communities select_communities {} {
+    set tree_level [expr $tree_level - $community_type_level]
     if {![string equal $simple_community_type dotlrn_community]} {
         set comm_type $simple_community_type
     } else {
Index: openacs-4/packages/dotlrn/www/admin/class.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class.adp,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/dotlrn/www/admin/class.adp	5 Jun 2002 21:44:12 -0000	1.23
+++ openacs-4/packages/dotlrn/www/admin/class.adp	17 Jun 2002 21:57:20 -0000	1.24
@@ -49,7 +49,7 @@
 <if @can_instantiate@>
   <table cellpadding="5" width="95%">
     <tr>
-      <td>
+      <td align="left">
         <nobr>
           <small>[
             <a href="class-instance-new?class_key=@class_key@">New <%= [parameter::get -parameter class_instances_pretty_name] %></a>
@@ -97,8 +97,8 @@
 <else>
     <tr bgcolor="#d9e4f9">
 </else>
-      <td><a href="term?term_id=@class_instances.term_id@">@class_instances.term_name@&nbsp;@class_instances.term_year@</a></td>
-      <td><a href="@class_instances.url@">@class_instances.pretty_name@</a></td>
+      <td align="left"><a href="term?term_id=@class_instances.term_id@">@class_instances.term_name@&nbsp;@class_instances.term_year@</a></td>
+      <td align="left"><a href="@class_instances.url@">@class_instances.pretty_name@</a></td>
       <td align="center">@class_instances.n_members@</td>
       <td align="center">
         <nobr>
@@ -114,7 +114,7 @@
 </if>
 <else>
     <tr bgcolor="#eeeeee">
-      <td colspan="4">
+      <td align="left" colspan="4">
         <i>No <%= [parameter::get -parameter class_instances_pretty_plural] %></i>
       </td>
     </tr>
Index: openacs-4/packages/dotlrn/www/admin/classes-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes-chunk.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/dotlrn/www/admin/classes-chunk.adp	5 Jun 2002 21:11:51 -0000	1.13
+++ openacs-4/packages/dotlrn/www/admin/classes-chunk.adp	17 Jun 2002 21:57:20 -0000	1.14
@@ -23,7 +23,7 @@
 <if @can_create@>
   <table cellpadding="5" width="95%">
     <tr>
-      <td>
+      <td align="left">
         <nobr>
           <small>[
             <a href="class-new?department_key=@department_key@&referer=@referer@">New <%= [parameter::get -parameter classes_pretty_name] %></a>
@@ -66,8 +66,8 @@
 <else>
     <tr bgcolor="#d9e4f9">
 </else>
-      <td><a href="department?department_key=@classes.department_key@">@classes.department_name@</a></td>
-      <td><a href="class?class_key=@classes.class_key@">@classes.pretty_name@</a></td>
+      <td align="left"><a href="department?department_key=@classes.department_key@">@classes.department_name@</a></td>
+      <td align="left"><a href="class?class_key=@classes.class_key@">@classes.pretty_name@</a></td>
       <td align="center">@classes.n_instances@</td>
       <td align="center">
 <if @can_instantiate@>
@@ -84,7 +84,7 @@
 </if>
 <else>
   <tr bgcolor="#eeeeee">
-    <td colspan="4">
+    <td align="left" colspan="4">
       <i>No <%= [parameter::get -parameter classes_pretty_plural] %></i>
     </td>
   </tr>
@@ -96,7 +96,7 @@
 
   <table cellpadding="5" width="95%">
     <tr>
-      <td>
+      <td align="left">
         <nobr>
           <small>[
             <a href="class-new?department_key=@department_key@&referer=@referer@">New <%= [parameter::get -parameter classes_pretty_name] %></a>
Index: openacs-4/packages/dotlrn/www/admin/clubs.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/clubs.adp,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/dotlrn/www/admin/clubs.adp	5 Jun 2002 21:11:51 -0000	1.18
+++ openacs-4/packages/dotlrn/www/admin/clubs.adp	17 Jun 2002 21:57:20 -0000	1.19
@@ -26,7 +26,7 @@
 
   <table cellpadding="5" width="95%">
     <tr>
-      <td>
+      <td align="left">
         <nobr>
           <small>[
             <a href="club-new">New <%= [parameter::get -parameter clubs_pretty_name] %></a>
@@ -57,8 +57,8 @@
 <else>
     <tr bgcolor="#d9e4f9">
 </else>
-      <td><a href="@clubs.url@">@clubs.pretty_name@</a></td>
-      <td><pre>@clubs.description@</pre></td>
+      <td align="left"><a href="@clubs.url@">@clubs.pretty_name@</a></td>
+      <td align="left"><pre>@clubs.description@</pre></td>
       <td align="center">@clubs.n_members@</td>
       <td align="center">
         <nobr>
@@ -74,7 +74,7 @@
 </if>
 <else>
   <tr bgcolor="#eeeeee">
-    <td colspan="4">
+    <td align="left" colspan="4">
       <i>No <%= [parameter::get -parameter clubs_pretty_plural] %></i>
     </td>
   </tr>
@@ -86,7 +86,7 @@
 
   <table cellpadding="5" width="95%">
     <tr>
-      <td>
+      <td align="left">
         <nobr>
           <small>[
             <a href="club-new">New <%= [parameter::get -parameter clubs_pretty_name] %></a>
Index: openacs-4/packages/dotlrn/www/admin/departments.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/departments.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/dotlrn/www/admin/departments.adp	5 Jun 2002 21:11:51 -0000	1.13
+++ openacs-4/packages/dotlrn/www/admin/departments.adp	17 Jun 2002 21:57:20 -0000	1.14
@@ -26,7 +26,7 @@
 
   <table cellpadding="5" width="95%">
     <tr>
-      <td>
+      <td align="left">
         <nobr>
           <small>[
             <a href="department-new?referer=@referer@">New <%= [parameter::get -parameter departments_pretty_name] %></a>
@@ -55,7 +55,7 @@
 <else>
     <tr bgcolor="#d9e4f9">
 </else>
-      <td><a href="department?department_key=@departments.department_key@">@departments.pretty_name@</a></td>
+      <td align="left"><a href="department?department_key=@departments.department_key@">@departments.pretty_name@</a></td>
       <td align="center">
 <if @can_create@>
         <nobr>
@@ -72,7 +72,7 @@
 </if>
 <else>
     <tr bgcolor="#eeeeee">
-      <td colspan="2">
+      <td align="left" colspan="2">
         <i>No <%= [parameter::get -parameter clubs_pretty_plural] %></i>
       </td>
     </tr>
@@ -85,7 +85,7 @@
 
   <table cellpadding="5" width="95%">
     <tr>
-      <td>
+      <td align="left">
         <nobr>
           <small>[
             <a href="department-new?referer=@referer@">New <%= [parameter::get -parameter departments_pretty_name] %></a>
Index: openacs-4/packages/dotlrn/www/admin/term.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term.adp,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/dotlrn/www/admin/term.adp	5 Jun 2002 21:11:51 -0000	1.15
+++ openacs-4/packages/dotlrn/www/admin/term.adp	17 Jun 2002 21:57:20 -0000	1.16
@@ -97,12 +97,12 @@
 <else>
     <tr bgcolor="#d9e4f9">
 </else>
-      <td><a href="department?department_key=@classes.department_key@">@classes.department_name@</a></td>
-      <td><a href="class?class_key=@classes.class_key@">@classes.class_name@</a></td>
+      <td align="left"><a href="department?department_key=@classes.department_key@">@classes.department_name@</a></td>
+      <td align="left"><a href="class?class_key=@classes.class_key@">@classes.class_name@</a></td>
 <if @term_id@ eq -1>
-      <td>@classes.term_name@ @classes.term_year@</td>
+      <td align="left">@classes.term_name@ @classes.term_year@</td>
 </if>
-      <td><a href="@classes.url@">@classes.pretty_name@</a></td>
+      <td align="left"><a href="@classes.url@">@classes.pretty_name@</a></td>
       <td align="center">@classes.n_members@</td>
       <td align="center">
         <nobr>
Index: openacs-4/packages/dotlrn/www/admin/terms.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/terms.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/dotlrn/www/admin/terms.adp	5 Jun 2002 21:11:51 -0000	1.12
+++ openacs-4/packages/dotlrn/www/admin/terms.adp	17 Jun 2002 21:57:20 -0000	1.13
@@ -26,7 +26,7 @@
 
   <table cellpadding="5" width="95%">
     <tr>
-      <td>
+      <td align="left">
         <nobr>
           <small>[
             <a href="term-new">New Term</a>
@@ -56,7 +56,7 @@
 <else>
     <tr bgcolor="#d9e4f9">
 </else>
-      <td><a href="term?term_id=@terms.term_id@">@terms.term_name@ @terms.term_year@</a></td>
+      <td align="left"><a href="term?term_id=@terms.term_id@">@terms.term_name@ @terms.term_year@</a></td>
       <td align="center">@terms.start_date@</td>
       <td align="center">@terms.end_date@</td>
       <td align="center">@terms.n_classes@</td>
@@ -72,7 +72,7 @@
 
   <table cellpadding="5" width="95%">
     <tr>
-      <td>
+      <td align="left">
         <nobr>
           <small>[
             <a href="term-new">New Term</a>
Index: openacs-4/packages/dotlrn/www/admin/users-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk.adp,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/dotlrn/www/admin/users-chunk.adp	5 Jun 2002 05:27:55 -0000	1.15
+++ openacs-4/packages/dotlrn/www/admin/users-chunk.adp	17 Jun 2002 21:57:20 -0000	1.16
@@ -36,7 +36,7 @@
 <else>
   <tr bgcolor="#d9e4f9">
 </else>
-    <td>
+    <td align="left">
   <if @type@ eq "deactivated">
       <a href="user?user_id=@users.user_id@">@users.last_name@, @users.first_names@</a> (<a href="mailto:@users.email@">@users.email@</a>)
   </if>
@@ -68,7 +68,7 @@
 </if>
 <else>
   <tr bgcolor="#eeeeee">
-    <td colspan="4"><i>No Users</i></td>
+    <td align="left" colspan="4"><i>No Users</i></td>
   </tr>
 </else>