Index: openacs-4/packages/curriculum-central/catalog/curriculum-central.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/catalog/curriculum-central.en_US.ISO-8859-1.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/curriculum-central/catalog/curriculum-central.en_US.ISO-8859-1.xml	21 Nov 2005 01:10:53 -0000	1.2
+++ openacs-4/packages/curriculum-central/catalog/curriculum-central.en_US.ISO-8859-1.xml	21 Nov 2005 04:28:37 -0000	1.3
@@ -67,5 +67,15 @@
   <msg key="dept_name">Department Name</msg>
   <msg key="add_dept_to_list">Add a department to the list</msg>
   <msg key="edit_dept_info">Edit department information</msg>
+  <msg key="delete_dept">Delete department</msg>
+  <msg key="want_to_delete_department">Are you sure you want to delete @depts.department_name@?</msg>
+  <msg key="help_select_a_dept">Select a department.  Note: A &lt;a href=faculties&gt;faculty&lt;/a&gt; and department must be created before a list of departments appears in the drop-down box.</msg>
+  <msg key="help_select_stream_coordinator">Select a coordinator for the stream.</msg>
+  <msg key="help_enter_stream_code">Enter a code for this stream.</msg>
+  <msg key="help_enter_stream_name">Enter a name for this stream.  Examples: Bachelor of Engineering; or Diploma of Applied Finance.</msg>
+  <msg key="help_enter_department_name">Enter a name for this department.  Examples: School of Electrical and Information Engineering; or Department of Chemical Engineering.</msg>
+  <msg key="help_select_hod">Select the Head of Department.  Note: The Head of Department must have an account on the system.</msg>
+  <msg key="help_select_dean">Select the Dean.  Note: The Dean must have an account on the system.</msg>
+  <msg key="help_enter_faculty_name">Enter a name for this faculty.  Example: Faculty of Engineering.</msg>
 
 </message_catalog>
Index: openacs-4/packages/curriculum-central/www/admin/dept-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/dept-ae.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/admin/dept-ae.tcl	21 Nov 2005 01:10:54 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/admin/dept-ae.tcl	21 Nov 2005 04:28:38 -0000	1.2
@@ -30,10 +30,12 @@
     {department_name:text
 	{html {size 50}}
 	{label "#curriculum-central.dept_name#" }
+	{help_text "[_ curriculum-central.help_enter_department_name]"}
     }
     {hod_id:integer(select)
 	{label "#curriculum-central.hod#" }
 	{options [curriculum_central::users_get_options] }
+	{help_text "[_ curriculum-central.help_select_hod]"}
     }
 } -select_query {
        SELECT hod_id, department_name
Index: openacs-4/packages/curriculum-central/www/admin/dept-del-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/dept-del-postgresql.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/curriculum-central/www/admin/dept-del-postgresql.xql	21 Nov 2005 04:28:38 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+
+   <fullquery name="dept_delete">
+     <querytext>
+       SELECT cc_department__delete(:department_id)
+     </querytext>
+   </fullquery>
+
+</queryset>
Index: openacs-4/packages/curriculum-central/www/admin/dept-del.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/dept-del.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/curriculum-central/www/admin/dept-del.tcl	21 Nov 2005 04:28:38 -0000	1.1
@@ -0,0 +1,32 @@
+ad_page_contract {
+    Deletes a department and redirects back to listing of faculty
+    departments.  Able to specify a return_url if the default is
+    not suitable.
+
+    @param faculty_id The ID of the faculty that the department belongs to.
+    @param department_id The ID of the department to delete.
+    @param return_url Optional url to redirect to when the delete operation
+    is complete.
+
+    @author Nick Carroll (nick.c@rroll.net)
+    @creation-date 2005-11-20
+    @cvs-id $Id: dept-del.tcl,v 1.1 2005/11/21 04:28:38 ncarroll Exp $
+} {
+    faculty_id:integer
+    department_id:integer
+    return_url:optional
+}
+
+if { ![info exists return_url] } {
+    set return_url [export_vars -base faculty-depts {faculty_id}]
+}
+
+set package_id [ad_conn package_id]
+
+db_transaction {
+    db_exec_plsql dept_delete {}
+}
+
+ad_returnredirect $return_url
+ad_script_abort
+
Index: openacs-4/packages/curriculum-central/www/admin/faculty-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/faculty-ae.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/admin/faculty-ae.tcl	20 Nov 2005 23:51:11 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/admin/faculty-ae.tcl	21 Nov 2005 04:28:38 -0000	1.2
@@ -24,12 +24,12 @@
     {faculty_name:text
 	{html {size 50}}
 	{label "#curriculum-central.faculty_name#" }
+	{help_text "[_ curriculum-central.help_enter_faculty_name]"}
     }
-    {dean_id:search
-	{result_datatype integer}
+    {dean_id:integer(select)
 	{label "#curriculum-central.dean#" }
 	{options [curriculum_central::users_get_options] }
-	{search_query {}}
+	{help_text "[_ curriculum-central.help_select_dean]"}
     }
 } -select_query {
        SELECT dean_id, faculty_name
Index: openacs-4/packages/curriculum-central/www/admin/faculty-depts.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/faculty-depts.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/curriculum-central/www/admin/faculty-depts.tcl	21 Nov 2005 01:10:54 -0000	1.2
+++ openacs-4/packages/curriculum-central/www/admin/faculty-depts.tcl	21 Nov 2005 04:28:38 -0000	1.3
@@ -42,6 +42,9 @@
 	display_template {
 	    <img src="/shared/images/Delete16.gif" height="16" width="16" border="0">
 	}
+	link_url_eval {[export_vars -base dept-del { faculty_id department_id }]}
+	link_html {title "#curriculum-central.delete_dept#" \
+		   onclick "return confirm(\'[_ curriculum-central.want_to_delete_department]\');"}
     }
 }
 
Index: openacs-4/packages/curriculum-central/www/admin/stream-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/stream-ae.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/admin/stream-ae.tcl	20 Nov 2005 23:51:11 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/admin/stream-ae.tcl	21 Nov 2005 04:28:38 -0000	1.2
@@ -24,18 +24,22 @@
     {stream_name:text
 	{html {size 50}}
 	{label "#curriculum-central.stream_name#" }
+	{help_text "[_ curriculum-central.help_enter_stream_name]"}
     }
     {stream_code:text
 	{html {size 25}}
 	{label "#curriculum-central.stream_code#" }
+	{help_text "[_ curriculum-central.help_enter_stream_code]"}
     }
     {department_id:integer(select)
 	{label "#curriculum-central.department#" }
 	{options [curriculum_central::departments_get_options] }
+	{help_text "[_ curriculum-central.help_select_a_dept]"}
     }
     {coordinator_id:integer(select)
 	{label "#curriculum-central.stream_coordinator#" }
 	{options [curriculum_central::users_get_options] }
+	{help_text "[_ curriculum-central.help_select_stream_coordinator]"}
     }
 } -select_query {
        SELECT coordinator_id, stream_name, stream_code,
@@ -45,6 +49,7 @@
     package_instantiate_object \
 	-var_list [list [list package_id $package_id] \
 		        [list object_type cc_stream] \
+		        [list department_id $department_id] \
 		        [list coordinator_id $coordinator_id]] \
 	-form_id stream cc_stream