Index: openacs-4/packages/curriculum/lib/admin-curriculums.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/admin-curriculums.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/curriculum/lib/admin-curriculums.adp	17 Jun 2003 15:43:58 -0000	1.6
+++ openacs-4/packages/curriculum/lib/admin-curriculums.adp	18 Jun 2003 15:21:51 -0000	1.7
@@ -91,7 +91,7 @@
     <else>
       Disabled
     </td>
-    <td width="5%">
+    <td width="15%">
       <a href="element-enable?@curriculums.element_id_export@">Enable</a>
       <a href="element-delete?@curriculums.element_id_export@" onclick="return confirm('Are you sure you want to delete this element?');" title="Delete">
         <img src="/shared/images/Delete16.gif" border="0" width="16" height="16">
Index: openacs-4/packages/curriculum/lib/curriculum-ave.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/curriculum-ave.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/curriculum/lib/curriculum-ave.tcl	17 Jun 2003 15:43:58 -0000	1.3
+++ openacs-4/packages/curriculum/lib/curriculum-ave.tcl	18 Jun 2003 15:21:51 -0000	1.4
@@ -151,7 +151,7 @@
 }
 
 ad_form -extend -name curriculum -form {
-    {description:text(textarea)
+    {description:richtext
 	{mode $element_mode}
 	{label Description}
 	{help_text $desc_help_text}
@@ -215,9 +215,10 @@
     curriculum::get -curriculum_id $curriculum_id -array curriculum_array
 
     template::util::array_to_vars curriculum_array
-    # FIXME.
-    set description [list $description $desc_format]
 
+    # The first list element is the description and it needs to be set to be empty.
+    set description [list {} $desc_format]
+
     # Hide elements that should be hidden because of a certain wf status.
     foreach element $curriculum_array(hide_fields) {
 	element set_properties curriculum $element -widget hidden
@@ -232,26 +233,20 @@
 
 } -new_data {
 
-#[template::util::richtext::get_property contents $description]
-#[template::util::richtext::get_property format $description]
-
     curriculum::new \
 	-name $name \
-	-description $description \
-	-desc_format text/html \
+	-description [template::util::richtext::get_property contents $description] \
+	-desc_format [template::util::richtext::get_property format $description] \
 	-owner_id $owner_id \
 	-package_id $package_id
     
 } -edit_data {
 
-#[template::util::richtext::get_property contents $description]
-#[template::util::richtext::get_property format $description]
-
     curriculum::edit \
 	-curriculum_id $curriculum_id \
 	-name $name \
-	-description $description \
-	-desc_format text/html \
+	-description [template::util::richtext::get_property contents $description] \
+	-desc_format [template::util::richtext::get_property format $description] \
 	-owner_id $owner_id \
 	-action_id $action_id \
 	-array curriculum_array
Index: openacs-4/packages/curriculum/tcl/misc-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/tcl/misc-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/curriculum/tcl/misc-procs.tcl	13 Jun 2003 11:44:33 -0000	1.5
+++ openacs-4/packages/curriculum/tcl/misc-procs.tcl	18 Jun 2003 15:21:51 -0000	1.6
@@ -49,7 +49,13 @@
 		    # "ad_conn subsite_id" does not work when called from within a filter
 		    # (which we do for the curriculum bar), so we use the following instead.
 
-		    return [site_node_closest_ancestor_package [list dotlrn acs-subsite]]
+		    set package_keys [list acs-subsite]
+
+		    if { [apm_package_installed_p dotlrn] } {
+			set package_keys [concat dotlrn $package_keys]
+		    }
+
+		    return [site_node_closest_ancestor_package $package_keys]
 		}
 		package_id -
 		package_url -