Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-communities-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-communities-create.sql,v
diff -u -r1.29 -r1.30
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-communities-create.sql	17 Mar 2002 19:54:18 -0000	1.29
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-communities-create.sql	18 Mar 2002 04:59:39 -0000	1.30
@@ -177,8 +177,8 @@
         acs_object_type.create_type (
             supertype => v_parent_object_type,
             object_type => community_type,
-            pretty_name => pretty_name,
-            pretty_plural => pretty_plural,
+            pretty_name => community_type,
+            pretty_plural => community_type,
             table_name => community_type,
             id_column => 'XXX',
             package_name => community_type,
Index: openacs-4/packages/dotlrn/tcl/class-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/class-procs.tcl,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/dotlrn/tcl/class-procs.tcl	16 Mar 2002 17:38:08 -0000	1.27
+++ openacs-4/packages/dotlrn/tcl/class-procs.tcl	18 Mar 2002 04:59:39 -0000	1.28
@@ -112,10 +112,11 @@
 
         db_transaction {
             set class_key [dotlrn_community::new_type \
-                -community_type_key $class_key \
+                -community_type_key "$department_key.$class_key" \
                 -parent_type $department_key \
                 -pretty_name $pretty_name \
-                -description $description]
+                -description $description \
+                -url_part $class_key]
 
             db_dml insert_class {}
         }
Index: openacs-4/packages/dotlrn/tcl/department-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/department-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/tcl/department-procs.tcl	16 Mar 2002 17:38:08 -0000	1.2
+++ openacs-4/packages/dotlrn/tcl/department-procs.tcl	18 Mar 2002 04:59:39 -0000	1.3
@@ -29,10 +29,11 @@
 
         db_transaction {
             dotlrn_community::new_type \
-                -community_type_key $department_key \
+                -community_type_key "$department_key" \
                 -parent_type "dotlrn_class_instance" \
                 -pretty_name $pretty_name \
-                -description $description
+                -description $description \
+                -url_part $department_key
 
             db_dml insert_department {}
         }
Index: openacs-4/packages/dotlrn/tcl/dotlrn-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-init.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/dotlrn/tcl/dotlrn-init.tcl	18 Mar 2002 03:39:39 -0000	1.15
+++ openacs-4/packages/dotlrn/tcl/dotlrn-init.tcl	18 Mar 2002 04:59:39 -0000	1.16
@@ -61,16 +61,15 @@
         dotlrn_community::applet_call $applet "AddApplet" [list]
     }
 
-    set portal_package_key "new-portal"
-    if {[site_nodes::mount_count -package_key $portal_package_key] == 0} {
-        ns_log notice "aks: dotlrn-init: new-portal being automounted"
+}
 
-        dotlrn::mount_package -parent_node_id [site_node_id "/"] -package_key $portal_package_key -url "portal" -directory_p "t"
-    } else {
-        ns_log notice "aks: dotlrn-init: new-portal NOT being automounted"
-    }
+set portal_package_key "new-portal"
+if {[site_nodes::mount_count -package_key $portal_package_key] == 0} {
+    ns_log notice "aks: dotlrn-init: new-portal being automounted"
 
+    dotlrn::mount_package -parent_node_id [site_node_id "/"] -package_key $portal_package_key -url "portal" -directory_p "t"
 }
 
+
 # Make sure that privacy is turned on
 acs_privacy::privacy_control_set 1
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.14 -r1.15
--- openacs-4/packages/dotlrn/www/admin/class.adp	15 Mar 2002 23:14:41 -0000	1.14
+++ openacs-4/packages/dotlrn/www/admin/class.adp	18 Mar 2002 04:59:39 -0000	1.15
@@ -17,7 +17,7 @@
   <br>
 
   <li>
-    Click <a href="class-edit?class_key=@class_key@&referer=@referer@">here</a> to edit <%= [ad_parameter "classes_pretty_name"] %> properties.
+    <a href="class-edit?class_key=@class_key@&referer=@referer@">Edit</a> <%= [ad_parameter "classes_pretty_name"] %> properties.
   </li>
 
 </ul>
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.6 -r1.7
--- openacs-4/packages/dotlrn/www/admin/classes-chunk.adp	15 Mar 2002 02:27:21 -0000	1.6
+++ openacs-4/packages/dotlrn/www/admin/classes-chunk.adp	18 Mar 2002 04:59:39 -0000	1.7
@@ -20,13 +20,11 @@
 <table width="100%">
   <tr>
     <th align="left" width="30%"><%= [ad_parameter departments_pretty_name] %></th>
-    <th align="left" width="10%"><%= [ad_parameter classes_pretty_name] %> Key</th>
     <th align="left"><%= [ad_parameter classes_pretty_name] %> Name</th>
   </tr>
 <multiple name="classes">
   <tr>
     <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_key@</a></td>
     <td><a href="class?class_key=@classes.class_key@">@classes.pretty_name@</a></td>
   </tr>
 </multiple>
Index: openacs-4/packages/dotlrn/www/admin/department.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/admin/department.adp	15 Mar 2002 23:14:41 -0000	1.5
+++ openacs-4/packages/dotlrn/www/admin/department.adp	18 Mar 2002 04:59:39 -0000	1.6
@@ -27,9 +27,9 @@
   <br>
 
   <li>
-    Click <a
-    href="department-edit?department_key=@department_key@&referer=@referer@">here</a>
-    to edit department properties.
+    <a
+    href="department-edit?department_key=@department_key@&referer=@referer@">Edit</a>
+    department properties.
   </li>
 
 </ul>
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.7 -r1.8
--- openacs-4/packages/dotlrn/www/admin/departments.adp	15 Mar 2002 23:14:41 -0000	1.7
+++ openacs-4/packages/dotlrn/www/admin/departments.adp	18 Mar 2002 04:59:39 -0000	1.8
@@ -9,12 +9,10 @@
 <if @departments:rowcount@ gt 0>
 <table width="100%">
   <tr>
-    <th align="left" width="30%"><%= [ad_parameter departments_pretty_name] %> Key</th>
     <th align="left"><%= [ad_parameter departments_pretty_name] %> Name</th>
   </tr>
 <multiple name="departments">
   <tr>
-    <td><a href="department?department_key=@departments.department_key@">@departments.department_key@</a></td>
     <td><a href="department?department_key=@departments.department_key@">@departments.pretty_name@</a></td>
   </tr>
 </multiple>
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.7 -r1.8
--- openacs-4/packages/dotlrn/www/admin/term.adp	15 Mar 2002 23:14:41 -0000	1.7
+++ openacs-4/packages/dotlrn/www/admin/term.adp	18 Mar 2002 04:59:39 -0000	1.8
@@ -28,8 +28,8 @@
   <br>
 
   <li>
-    Click <a href="term-edit?term_id=@term_id@&referer=@referer@">here</a> to
-    edit term properties.
+    <a href="term-edit?term_id=@term_id@&referer=@referer@">Edit</a> term
+    properties.
   </li>
 
 </ul>
Index: openacs-4/packages/dotlrn/www/admin/user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/admin/user.adp	15 Mar 2002 23:14:41 -0000	1.3
+++ openacs-4/packages/dotlrn/www/admin/user.adp	18 Mar 2002 04:59:39 -0000	1.4
@@ -121,9 +121,9 @@
 
   <ul>
     <li>
-      Click <a
-      href="users-add-to-community?users=@user_id@&referer=@return_url@">here</a>
-      to add this user to another group.
+      <a
+      href="users-add-to-community?users=@user_id@&referer=@return_url@">Add</a>
+      this user to another group.
     </li>
   </ul>