Index: openacs-4/packages/curriculum-central/curriculum-central.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/curriculum-central.info,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/curriculum-central/curriculum-central.info	22 Jan 2006 08:43:14 -0000	1.7
+++ openacs-4/packages/curriculum-central/curriculum-central.info	2 Feb 2006 11:45:48 -0000	1.8
@@ -7,27 +7,28 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="0.3.0d" url="http://openacs.org/repository/download/apm/curriculum-central-0.3.0d.apm">
+    <version name="0.4.0d" url="http://openacs.org/repository/download/apm/curriculum-central-0.4.0d.apm">
         <owner url="mailto:ncarroll@ee.usyd.edu.au">Nick Carroll</owner>
         <summary>An application for managing the subjects comprising a course of study in a School or University.</summary>
         <vendor url="http://www.weg.ee.usyd.edu.au">WEG</vendor>
         <description format="text/html">Curriculum Central is an application for managing subjects comprising a course of study in a School or University.  The application will allow academic staff to collaborate on course syllabus and rubrics, which can then be conveyed to students using course maps.</description>
         <maturity>0</maturity>
 
-        <provides url="curriculum-central" version="0.3.0d"/>
+        <provides url="curriculum-central" version="0.4.0d"/>
         <requires url="acs-content-repository" version="5.2.0d2"/>
         <requires url="acs-kernel" version="5.2.0d2"/>
         <requires url="acs-tcl" version="5.2.0d1"/>
         <requires url="notifications" version="5.0.0b4"/>
         <requires url="workflow" version="2.0.0b3"/>
 
         <callbacks>
-            <callback type="before-uninstall"  proc="curriculum_central::install::package_uninstall"/>
             <callback type="after-install"  proc="curriculum_central::install::package_install"/>
-            <callback type="before-uninstantiate"  proc="curriculum_central::install::package_uninstantiate"/>
+            <callback type="before-uninstall"  proc="curriculum_central::install::package_uninstall"/>
             <callback type="after-instantiate"  proc="curriculum_central::install::package_instantiate"/>
+            <callback type="before-uninstantiate"  proc="curriculum_central::install::package_uninstantiate"/>
         </callbacks>
         <parameters>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="CurriculumCentralCSS"  default="/resources/curriculum-central/main-portal.css" description="Specify the location of a CSS file to use for Curriculum Central's colour scheme."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="LastNumActivityLogEntries"  default="3" description="Number of recent activity log entries to display for a Unit of Study."/>
         </parameters>
 
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.36 -r1.37
--- openacs-4/packages/curriculum-central/catalog/curriculum-central.en_US.ISO-8859-1.xml	25 Jan 2006 12:45:17 -0000	1.36
+++ openacs-4/packages/curriculum-central/catalog/curriculum-central.en_US.ISO-8859-1.xml	2 Feb 2006 11:45:49 -0000	1.37
@@ -2,6 +2,27 @@
 <message_catalog package_key="curriculum-central" package_version="0.1d" locale="en_US" charset="ISO-8859-1">
 
   <msg key="uos">UoS</msg>
+  <msg key="list_of_all_units_of_study">List of all Units of Study.</msg>
+  <msg key="all_units_of_study">All Units of Study</msg>
+  <msg key="no_uos_have_been_created">No Units of Study have been created.</msg>
+  <msg key="view_all_uos">View all Units of Study.</msg>
+  <msg key="help_select_uos_name">Select a name for this UoS.</msg>
+  <msg key="help_enter_credit_value">Enter credit value for the UoS.</msg>
+  <msg key="view_uos_names">View UoS Names</msg>
+  <msg key="add_uos_name">Add UoS Name</msg>
+  <msg key="add_uos_name_to_list">Add UoS name to list</msg>
+  <msg key="help_enter_uos_code">Enter the UoS alpha-numeric code.</msg>
+  <msg key="help_enter_uos_name">Enter the UoS name.</msg>
+  <msg key="no_uos_names_have_been_created">No UoS names have been created</msg>
+  <msg key="uos_names">Unit of Study Names</msg>
+  <msg key="no_years_created">No vocabulary for years have been created.</msg>
+  <msg key="view_uos_offered_by">View Units of Study offered by:</msg>
+  <msg key="edit_year">Edit Year</msg>
+  <msg key="edit_schedule_week">Edit Schedule Week</msg>
+  <msg key="edit_session">Edit Session</msg>
+  <msg key="overview_lc">overview</msg>
+  <msg key="map_lc">map</msg>
+  <msg key="map_view">Map View</msg>
   <msg key="add_uos">Add UoS</msg>
   <msg key="delete">Delete</msg>
   <msg key="stream_mapping_has_been_deleted">Stream mapping has been deleted.</msg>
@@ -18,7 +39,7 @@
   <msg key="stream_overview">Stream Overview</msg>
   <msg key="help_enter_year_name">Enter a name for a school year.  Eg Year 1.</msg>
   <msg key="help_select_uos_to_map">Select UoS to map to the %stream_name% degree stream.</msg>
-  <msg key="help_select_semesters_that_uos_is_offered">Select the semesters that this UoS is offered.  Note: You can select multiple entries by holding down the CTRL key whilst selecting.</msg>
+  <msg key="help_select_sessions_that_uos_is_offered">Select the sessions that this UoS is offered.  Note: You can select multiple entries by holding down the CTRL key whilst selecting.</msg>
   <msg key="help_select_years_that_uos_is_offered">Select the year that this UoS is offered.</msg>
   <msg key="help_select_prerequisites_for_uos">Select prerequisite UoS for the mapped UoS.  Note: You can select multiple entries by holding down the CTRL key whilst selecting.</msg>
   <msg key="help_select_assumed_knowledge_for_uos">Select assumed knowledge for the mapped UoS.  Note: You can select multiple entries by holding down the CTRL key whilst selecting.</msg>
@@ -31,7 +52,7 @@
   <msg key="no_longer_offered">Units no longer offered</msg>
   <msg key="map_uos_to_stream">Map UoS to Stream</msg>
   <msg key="edit_uos_to_stream_mapping">Edit UoS to Stream Mapping</msg>
-  <msg key="help_select_semesters_in_a_year">Select the semesters that apply to the school year.  Note: Hold the CTRL key down to select more than one semester.</msg>
+  <msg key="help_select_sessions_in_a_year">Select the sessions that apply to the school year.  Note: Hold the CTRL key down to select more than one session.</msg>
   <msg key="help_select_years_for_this_stream">Select years that apply to this degree stream.  Note: Hold the CTRL key down to select more than one year.</msg>
   <msg key="you_are_not_the_coordinator_for">You are not the coordinator for any degree streams.</msg>
   <msg key="map_uos_to_this_stream">Map a Unit of Study to this stream.</msg>
@@ -41,22 +62,23 @@
   <msg key="start_date">Start Date</msg>
   <msg key="end_date">End Date</msg>
   <msg key="years">Years</msg>
-  <msg key="help_enter_semester_name">Enter the name for a semester.  Eg 1st Semester, Spring, Fall, 2nd Term, etc.</msg>
+  <msg key="help_enter_session_name">Enter the name for a session.  Eg 1st Session, Spring, Fall, 2nd Term, etc.</msg>
   <msg key="help_enter_start_date">Enter a start date.</msg>
   <msg key="help_enter_end_date">Enter an end date.</msg>
   <msg key="view_years">View Years</msg>
   <msg key="add_a_year">Add a Year</msg>
   <msg key="add_year">Add Year</msg>
   <msg key="edit_year_info">Edit Year</msg>
   <msg key="add_year_to_list">Add year to list.</msg>
-  <msg key="view_semesters">View Semesters</msg>
-  <msg key="add_a_semester">Add a Semester</msg>
-  <msg key="add_semester">Add Semester</msg>
-  <msg key="no_semesters_created">No semesters created</msg>
-  <msg key="add_semester_to_list">Add semester to list.</msg>
-  <msg key="help_enter_semesters_per_year">Enter the number of semesters in a year.</msg>
-  <msg key="semesters_in_a_year">Semesters in a Year</msg>
-  <msg key="semesters">Semesters</msg>
+  <msg key="view_sessions">View Sessions</msg>
+  <msg key="add_a_session">Add a Session</msg>
+  <msg key="add_session">Add Session</msg>
+  <msg key="no_sessions_created">No sessions created</msg>
+  <msg key="add_session_to_list">Add session to list.</msg>
+  <msg key="help_enter_sessions_per_year">Enter the number of sessions in a year.</msg>
+  <msg key="sessions_in_a_year">Sessions in a Year</msg>
+  <msg key="sessions">Sessions</msg>
+  <msg key="session">Session</msg>
   <msg key="only_stream_coordinators_can_develop_a_stream">Only stream coordinators can develop a stream</msg>
   <msg key="view_graduate_attributes">View Graduate Attributes</msg>
   <msg key="add_a_graduate_attribute">Add a Graduate Attribute</msg>
@@ -227,7 +249,7 @@
   <msg key="uos_name">UoS Name</msg>
   <msg key="credit_value">Credit Value</msg>
   <msg key="edit_uos">Edit Unit of Study</msg>
-  <msg key="semester_offering">Semester Offering</msg>
+  <msg key="session_offering">Session Offering</msg>
   <msg key="online_course_content">Online Course Content</msg>
   <msg key="contact_hours">Contact Hours</msg>
   <msg key="before_getting_started">Before using Curriculum Central, you need to create at least one stream.  A stream can be a degree, diploma or even a certificate.</msg>
Index: openacs-4/packages/curriculum-central/sql/postgresql/curriculum-central-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/sql/postgresql/curriculum-central-create.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/curriculum-central/sql/postgresql/curriculum-central-create.sql	4 Dec 2005 07:30:45 -0000	1.2
+++ openacs-4/packages/curriculum-central/sql/postgresql/curriculum-central-create.sql	2 Feb 2006 11:45:49 -0000	1.3
@@ -11,5 +11,6 @@
 \i faculty-create.sql
 \i department-create.sql
 \i stream-create.sql
+\i uos-names-create.sql
 \i uos-create.sql
 \i staff-create.sql
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/curriculum-central/sql/postgresql/semester-create.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/curriculum-central/sql/postgresql/stream-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/sql/postgresql/stream-create.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/curriculum-central/sql/postgresql/stream-create.sql	22 Jan 2006 08:43:15 -0000	1.2
+++ openacs-4/packages/curriculum-central/sql/postgresql/stream-create.sql	2 Feb 2006 11:45:49 -0000	1.3
@@ -46,7 +46,6 @@
 			constraint cc_stream_stream_name_un unique,
 	stream_code 	varchar(256),
 	year_ids	varchar(256),
-	semester_ids	varchar(256),
 	department_id	integer
 			constraint cc_stream_department_id_fk
 			references cc_department(department_id)
@@ -103,10 +102,20 @@
 drop function inline_1 ();
 
 
-select define_function_args('cc_stream__new', 'stream_id,coordinator_id,object_type,stream_name,stream_code,year_ids,semester_ids,department_id,creation_user,creation_ip,package_id');
+select define_function_args('cc_stream__new', 'stream_id,coordinator_id,object_type,stream_name,stream_code,year_ids,department_id,creation_user,creation_ip,package_id');
 
-create function cc_stream__new(integer, integer, varchar, varchar, varchar, varchar, varchar, integer, integer, varchar, integer)
-returns integer as'
+create function cc_stream__new(
+	integer,	-- stream_id
+	integer,	-- coordinator_id
+	varchar,	-- object_type
+	varchar,	-- stream_name
+	varchar,	-- stream_code
+	varchar,	-- year_ids
+	integer,	-- department_id
+	integer,	-- creation_user
+	varchar,	-- creation_ip
+	integer		-- package_id
+) returns integer as'
 
 declare
 
@@ -116,11 +125,10 @@
 	p_stream_name		alias for $4;
 	p_stream_code		alias for $5;
 	p_year_ids		alias for $6;
-	p_semester_ids		alias for $7;
-	p_department_id		alias for $8;
-	p_creation_user		alias for $9;
-	p_creation_ip		alias for $10;
-	p_package_id		alias for $11;
+	p_department_id		alias for $7;
+	p_creation_user		alias for $8;
+	p_creation_ip		alias for $9;
+	p_package_id		alias for $10;
 
 	v_stream_id		cc_stream.stream_id%TYPE;
 begin
@@ -134,7 +142,7 @@
 			p_package_id
 		);
 
-	insert into cc_stream values(v_stream_id, p_coordinator_id, p_stream_name, p_stream_code, p_year_ids, p_semester_ids, p_department_id,  p_package_id);
+	insert into cc_stream values(v_stream_id, p_coordinator_id, p_stream_name, p_stream_code, p_year_ids, p_department_id,  p_package_id);
 	
 	PERFORM acs_permission__grant_permission(
           v_stream_id,
Index: openacs-4/packages/curriculum-central/sql/postgresql/stream-uos-map-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/sql/postgresql/stream-uos-map-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/curriculum-central/sql/postgresql/stream-uos-map-create.sql	25 Jan 2006 12:25:52 -0000	1.3
+++ openacs-4/packages/curriculum-central/sql/postgresql/stream-uos-map-create.sql	2 Feb 2006 11:45:49 -0000	1.4
@@ -55,13 +55,7 @@
 				references cr_revisions(revision_id)
 				on delete cascade,
 	year_id			integer,
-	semester_ids		varchar(256),
-	core_id			integer,      -- core, elective, or recommended
-	prerequisite_ids	varchar(256),
-	assumed_knowledge_ids	varchar(256),
-	corequisite_ids		varchar(256),
-	prohibition_ids		varchar(256),
-	no_longer_offered_ids	varchar(256)
+	core_id			integer      -- core, elective, or recommended
 );
 
 -- Create the UoS revision content type.
@@ -76,20 +70,14 @@
 );
 
 
-select define_function_args('cc_stream_uos_map__new', 'map_id,stream_id,uos_id,year_id,semester_ids,core_id,prerequisite_ids,assumed_knowledge_ids,corequisite_ids,prohibition_ids,no_longer_offered_ids,creation_user,creation_ip,context_id,item_subtype;cc_stream_uos_map,content_type;cc_stream_uos_map_rev,object_type,package_id');
+select define_function_args('cc_stream_uos_map__new', 'map_id,stream_id,uos_id,year_id,core_id,creation_user,creation_ip,context_id,item_subtype;cc_stream_uos_map,content_type;cc_stream_uos_map_rev,object_type,package_id');
 
 create function cc_stream_uos_map__new(
 	integer,	-- map_id
 	integer,	-- stream_id
 	integer,	-- uos_id
 	integer,	-- year_id
-	varchar,	-- semester_ids
 	integer,	-- core_id
-	varchar,	-- prerequisite_ids
-	varchar,	-- assumed_knowledge_ids
-	varchar,	-- corequisite_ids
-	varchar,	-- prohibition_ids
-	varchar,	-- no_longer_offered_ids
 	integer,	-- creation_user
 	varchar,	-- creation_ip
 	integer,	-- context_id
@@ -104,20 +92,14 @@
 	p_stream_id			alias for $2;
 	p_uos_id			alias for $3;
 	p_year_id			alias for $4;
-	p_semester_ids			alias for $5;
-	p_core_id			alias for $6;
-	p_prerequisite_ids		alias for $7;
-	p_assumed_knowledge_ids		alias for $8;
-	p_corequisite_ids		alias for $9;
-	p_prohibition_ids		alias for $10;
-	p_no_longer_offered_ids		alias for $11;
-	p_creation_user			alias for $12;
-	p_creation_ip			alias for $13;
-	p_context_id			alias for $14;
-	p_item_subtype			alias for $15;
-	p_content_type			alias for $16;
-	p_object_type			alias for $17;
-	p_package_id			alias for $18;
+	p_core_id			alias for $5;
+	p_creation_user			alias for $6;
+	p_creation_ip			alias for $7;
+	p_context_id			alias for $8;
+	p_item_subtype			alias for $9;
+	p_content_type			alias for $10;
+	p_object_type			alias for $11;
+	p_package_id			alias for $12;
 
 	v_map_id			cc_stream_uos_map.map_id%TYPE;
 	v_folder_id			integer;
@@ -164,13 +146,7 @@
 		null,				-- revision_id
 		v_map_id,			-- map_id
 		p_year_id,			-- year_id
-		p_semester_ids,			-- semester_ids
 		p_core_id,			-- core_id
-		p_prerequisite_ids,		-- requisite_ids
-		p_assumed_knowledge_ids,	-- assumed_knowledge_ids
-		p_corequisite_ids,		-- corequisite_ids
-		p_prohibition_ids,		-- prohibition_ids
-		p_no_longer_offered_ids,	-- no_longer_offered_ids
 		now(),				-- creation_date
 		p_creation_user,		-- creation_user
 		p_creation_ip			-- creation_ip
@@ -209,13 +185,7 @@
 	integer,			-- revision_id
 	integer,			-- map_id
 	integer,			-- year_id
-	varchar,			-- semester_ids
 	integer,			-- core_id
-	varchar,			-- prerequisite_ids
-	varchar,			-- assumed_knowledge_ids
-	varchar,			-- corequisite_ids
-	varchar,			-- prohibition_ids
-	varchar,			-- no_longer_offered_ids
 	timestamptz,			-- creation_date
 	integer,			-- creation_user
 	varchar				-- creation_ip
@@ -225,16 +195,10 @@
 	p_revision_id				alias for $1;
 	p_map_id				alias for $2;
 	p_year_id				alias for $3;
-	p_semester_ids				alias for $4;
-	p_core_id				alias for $5;
-	p_prerequisite_ids			alias for $6;
-	p_assumed_knowledge_ids			alias for $7;
-	p_corequisite_ids			alias for $8;
-	p_prohibition_ids			alias for $9;
-	p_no_longer_offered_ids			alias for $10;
-	p_creation_date				alias for $11;
-	p_creation_user				alias for $12;
-	p_creation_ip				alias for $13;
+	p_core_id				alias for $4;
+	p_creation_date				alias for $5;
+	p_creation_user				alias for $6;
+	p_creation_ip				alias for $7;
 
 	v_revision_id				integer;
 begin
@@ -255,26 +219,14 @@
 	);
 
 	-- Insert into the uos-specific revision table
-	INSERT into cc_stream_uos_map_rev (
+	INSERT INTO cc_stream_uos_map_rev (
 		map_rev_id,
 		year_id,
-		semester_ids,
-		core_id,
-		prerequisite_ids,
-		assumed_knowledge_ids,
-		corequisite_ids,
-		prohibition_ids,
-		no_longer_offered_ids
+		core_id
 	) VALUES (
 		v_revision_id,
 		p_year_id,
-		p_semester_ids,
-		p_core_id,
-		p_prerequisite_ids,
-		p_assumed_knowledge_ids,
-		p_corequisite_ids,
-		p_prohibition_ids,
-		p_no_longer_offered_ids
+		p_core_id
 	);
 
 	-- Update the latest revision id in cc_stream_uos_map
Index: openacs-4/packages/curriculum-central/sql/postgresql/uos-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/sql/postgresql/uos-create.sql,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/curriculum-central/sql/postgresql/uos-create.sql	22 Jan 2006 08:43:15 -0000	1.13
+++ openacs-4/packages/curriculum-central/sql/postgresql/uos-create.sql	2 Feb 2006 11:45:49 -0000	1.14
@@ -44,12 +44,7 @@
 	parent_id		integer,
 	live_revision_id	integer,
 	-- denormalised from cc_uos_revisions	
-	uos_code 		varchar(256)
-				constraint cc_uos_uos_code_nn not null
-				constraint cc_uos_uos_code_un unique,
-	uos_name 		varchar(256)
-				constraint cc_uos_uos_name_nn not null
-				constraint cc_uos_uos_name_un unique,
+	uos_name_id 		integer,    -- references cc_uos_name(name_id)
 	unit_coordinator_id	integer
 				constraint cc_uos_coordinator_id_fk
 				references users(user_id)
@@ -66,18 +61,28 @@
 				constraint cc_uos_rev_uos_id_fk
 				references cr_revisions(revision_id)
 				on delete cascade,
-	uos_code 		varchar(256)
-				constraint cc_uos_rev_uos_code_nn not null,
-	uos_name 		varchar(256)
-				constraint cc_uos_rev_uos_name_nn not null,
+	uos_name_id 		integer
+				constraint cc_uos_rev_uos_name_id_fk
+				references cc_uos_name(name_id)
+				constraint cc_uos_rev_uos_name_id_nn not null,
 	credit_value		integer,
+	department_id		integer
+				constraint cc_stream_department_id_fk
+				references cc_department(department_id)
+				constraint cc_stream_department_id_nn
+				not null,
 	unit_coordinator_id	integer
 				constraint cc_uos_rev_coordinator_id_fk
 				references users(user_id)
 				constraint cc_uos_rev_coordinator_id_nn
                         	not null,
-	activity_log		text,
-	activity_log_format	varchar(256)
+	session_ids		varchar(256),
+	prerequisite_ids	varchar(256),
+	assumed_knowledge_ids	varchar(256),
+	corequisite_ids		varchar(256),
+	prohibition_ids		varchar(256),
+	no_longer_offered_ids	varchar(256),
+	activity_log		text
 );
 
 -- Create the UoS revision content type.
@@ -92,16 +97,21 @@
 );
 
 
-select define_function_args('cc_uos__new', 'uos_id,uos_code,uos_name,unit_coordinator_id,credit_value,activity_log,activity_log_format,creation_user,creation_ip,context_id,item_subtype;cc_uos,content_type;cc_uos_revision,object_type,package_id');
+select define_function_args('cc_uos__new', 'uos_id,uos_name_id,unit_coordinator_id,credit_value,department_id,session_ids,prerequisite_ids,assumed_knowledge_ids,corequisite_ids,prohibition_ids,no_longer_offered_ids,activity_log,creation_user,creation_ip,context_id,item_subtype;cc_uos,content_type;cc_uos_revision,object_type,package_id');
 
 create function cc_uos__new(
 	integer,	-- uos_id
-	varchar,	-- uos_code
-	varchar,	-- uos_name
+	integer,	-- uos_name_id
 	integer,	-- unit_coordinator_id
 	integer,	-- credit_value
+	integer,	-- department_id
+	varchar,	-- session_ids
+	varchar,	-- prerequisite_ids
+	varchar,	-- assumed_knowledge_ids
+	varchar,	-- corequisite_ids
+	varchar,	-- prohibition_ids
+	varchar,	-- no_longer_offered_ids
 	text,		-- activity_log
-	varchar,	-- activity_log_format
 	integer,	-- creation_user
 	varchar,	-- creation_ip
 	integer,	-- context_id
@@ -113,32 +123,41 @@
 declare
 
 	p_uos_id			alias for $1;
-	p_uos_code			alias for $2;
-	p_uos_name			alias for $3;
-	p_unit_coordinator_id		alias for $4;
-	p_credit_value			alias for $5;
-	p_activity_log			alias for $6;
-	p_activity_log_format		alias for $7;
-	p_creation_user			alias for $8;
-	p_creation_ip			alias for $9;
-	p_context_id			alias for $10;
-	p_item_subtype			alias for $11;
-	p_content_type			alias for $12;
-	p_object_type			alias for $13;
-	p_package_id			alias for $14;
+	p_uos_name_id			alias for $2;
+	p_unit_coordinator_id		alias for $3;
+	p_credit_value			alias for $4;
+	p_department_id			alias for $5;
+	p_session_ids			alias for $6;
+	p_prerequisite_ids		alias for $7;
+	p_assumed_knowledge_ids		alias for $8;
+	p_corequisite_ids		alias for $9;
+	p_prohibition_ids		alias for $10;
+	p_no_longer_offered_ids		alias for $11;
+	p_activity_log			alias for $12;
+	p_creation_user			alias for $13;
+	p_creation_ip			alias for $14;
+	p_context_id			alias for $15;
+	p_item_subtype			alias for $16;
+	p_content_type			alias for $17;
+	p_object_type			alias for $18;
+	p_package_id			alias for $19;
 
 	v_uos_id			cc_uos.uos_id%TYPE;
 	v_folder_id			integer;
 	v_revision_id			integer;
+	v_uos_name			varchar;
 begin
 	-- get the content folder for this instance
 	select folder_id into v_folder_id
 	    from cc_curriculum
 	    where curriculum_id = p_package_id;
 
+	select uos_name into v_uos_name from cc_uos_name
+	    where name_id = p_uos_name_id;
+
 	-- create the content item
 	v_uos_id := content_item__new (
-			p_uos_name,		-- name
+			v_uos_name,		-- name
 			v_folder_Id,		-- parent_id
 			p_uos_id,		-- item_id
 			null,			-- locale
@@ -158,20 +177,25 @@
 
 	-- create the item type row
 	insert into cc_uos (uos_id, package_id, parent_id,
-	    uos_code, uos_name, unit_coordinator_id)
-	VALUES (v_uos_id, p_package_id, v_folder_id, p_uos_code,
-            p_uos_name, p_unit_coordinator_id);
+	    uos_name_id, unit_coordinator_id)
+	VALUES (v_uos_id, p_package_id, v_folder_id,
+            p_uos_name_id, p_unit_coordinator_id);
 
 	-- create the initial revision
 	v_revision_id := cc_uos_revision__new (
 		null,				-- uos_revision_id
 		v_uos_id,			-- uos_id
-		p_uos_code,			-- uos_code
-		p_uos_name,			-- uos_name
+		p_uos_name_id,			-- uos_name_id
 		p_credit_value,			-- credit_value
+		p_department_id,		-- department_id
 		p_unit_coordinator_id,		-- unit_coordinator_id
+		p_session_ids,			-- session_ids
+		p_prerequisite_ids,		-- requisite_ids
+		p_assumed_knowledge_ids,	-- assumed_knowledge_ids
+		p_corequisite_ids,		-- corequisite_ids
+		p_prohibition_ids,		-- prohibition_ids
+		p_no_longer_offered_ids,	-- no_longer_offered_ids
 		p_activity_log,			-- activity_log
-		p_activity_log_format,		-- activity_log_format
 		now(),				-- creation_date
 		p_creation_user,		-- creation_user
 		p_creation_ip			-- creation_ip
@@ -223,13 +247,16 @@
 create function cc_uos__name (integer)
 returns varchar as '
 declare
-    p_uos_id      alias for $1;
-    v_uos_name    cc_uos.uos_name%TYPE;
+    p_uos_id      	alias for $1;
+    v_uos_name    	varchar;
+    v_uos_name_id 	cc_uos.uos_name_id%TYPE;
 begin
-	select uos_name into v_uos_name
-		from cc_uos
+	select uos_name_id into v_uos_name_id from cc_uos
 		where uos_id = p_uos_id;
 
+	select uos_name into v_uos_name from cc_uos_name
+		where name_id = v_uos_name_id;
+
     return v_uos_name;
 end;
 ' language 'plpgsql';
@@ -238,12 +265,17 @@
 create or replace function cc_uos_revision__new (
 	integer,			-- uos_revision_id
 	integer,			-- uos_id
-	varchar,			-- uos_code
-	varchar,			-- uos_name
+	integer,			-- uos_name_id
 	integer,			-- credit_value
+	integer,			-- department_id
 	integer,			-- unit_coordinator_id
+	varchar,			-- session_ids
+	varchar,			-- prerequisite_ids
+	varchar,			-- assumed_knowledge_ids
+	varchar,			-- corequisite_ids
+	varchar,			-- prohibition_ids
+	varchar,			-- no_longer_offered_ids
 	text,				-- activity_log
-	varchar,			-- activity_log_format
 	timestamptz,			-- creation_date
 	integer,			-- creation_user
 	varchar				-- creation_ip
@@ -252,21 +284,30 @@
 declare
 	p_uos_revision_id		alias for $1;
 	p_uos_id			alias for $2;
-	p_uos_code			alias for $3;
-	p_uos_name			alias for $4;
-	p_credit_value			alias for $5;
+	p_uos_name_id			alias for $3;
+	p_credit_value			alias for $4;
+	p_department_id			alias for $5;
 	p_unit_coordinator_id		alias for $6;
-	p_activity_log			alias for $7;
-	p_activity_log_format		alias for $8;
-	p_creation_date			alias for $9;
-	p_creation_user			alias for $10;
-	p_creation_ip			alias for $11;
+	p_session_ids			alias for $7;
+	p_prerequisite_ids		alias for $8;
+	p_assumed_knowledge_ids		alias for $9;
+	p_corequisite_ids		alias for $10;
+	p_prohibition_ids		alias for $11;
+	p_no_longer_offered_ids		alias for $12;
+	p_activity_log			alias for $13;
+	p_creation_date			alias for $14;
+	p_creation_user			alias for $15;
+	p_creation_ip			alias for $16;
 
 	v_revision_id			integer;
+	v_uos_name			varchar;
 begin
+	select uos_name into v_uos_name from cc_uos_name
+		where name_id = p_uos_name_id;
+
 	-- create the initial revision
 	v_revision_id := content_revision__new (
-		p_uos_name,		-- title
+		v_uos_name,		-- title
 		null,			-- description
 		current_timestamp,	-- publish_date
 		null,			-- mime_type
@@ -280,14 +321,33 @@
 	);
 
 	-- insert into the uos-specific revision table
-	insert into cc_uos_revisions
-		(uos_revision_id, uos_code, uos_name, credit_value,
-		unit_coordinator_id, activity_log,
-		activity_log_format)
-	values
-		(v_revision_id, p_uos_code, p_uos_name, p_credit_value,
-		p_unit_coordinator_id, p_activity_log,
-		p_activity_log_format);
+	INSERT INTO cc_uos_revisions (
+		uos_revision_id,
+		uos_name_id,
+		credit_value,
+		department_id,
+		unit_coordinator_id,
+		session_ids,
+		prerequisite_ids,
+		assumed_knowledge_ids,
+		corequisite_ids,
+		prohibition_ids,
+		no_longer_offered_ids,
+		activity_log
+	) VALUES (
+		v_revision_id,
+		p_uos_name_id,
+		p_credit_value,
+		p_department_id,
+		p_unit_coordinator_id,
+		p_session_ids,
+		p_prerequisite_ids,
+		p_assumed_knowledge_ids,
+		p_corequisite_ids,
+		p_prohibition_ids,
+		p_no_longer_offered_ids,
+		p_activity_log
+	);
 
 	return v_revision_id;
 end;
@@ -324,8 +384,8 @@
 -- UoS Schedule
 \i uos-schedule-create.sql
 
--- Semester
-\i semester-create.sql
+-- Session
+\i session-create.sql
 
 -- Year: 1st Year, 2nd Year, 3rd Year or Freshman, Sophomore, etc.
 \i year-create.sql
Index: openacs-4/packages/curriculum-central/tcl/staff-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/tcl/staff-procs-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/curriculum-central/tcl/staff-procs-postgresql.xql	19 Dec 2005 11:55:25 -0000	1.2
+++ openacs-4/packages/curriculum-central/tcl/staff-procs-postgresql.xql	2 Feb 2006 11:45:49 -0000	1.3
@@ -18,4 +18,11 @@
 	SELECT * FROM cc_stream WHERE coordinator_id = :user_id LIMIT 1
       </querytext>
     </fullquery>
+
+    <fullquery name="curriculum_central::staff::staff_p.staff_p">
+      <querytext>
+	SELECT * FROM cc_staff WHERE staff_id = :user_id LIMIT 1
+      </querytext>
+    </fullquery>
+
 </queryset>
Index: openacs-4/packages/curriculum-central/tcl/staff-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/tcl/staff-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/curriculum-central/tcl/staff-procs.tcl	19 Dec 2005 11:55:25 -0000	1.2
+++ openacs-4/packages/curriculum-central/tcl/staff-procs.tcl	2 Feb 2006 11:45:49 -0000	1.3
@@ -40,3 +40,17 @@
     # stream, then the user is a stream coordinator.
     return [db_0or1row is_stream_coordinator {}]
 }
+
+
+ad_proc -public curriculum_central::staff::staff_p {
+    user_id
+} {
+    Checks if the given user is a member of staff or not.
+
+    @param user_id ID of a user.
+    @return Returns 1 if the user is a staff member, otherwise
+    0 is returned.
+} {
+
+    return [db_0or1row staff_p {}]
+}
Index: openacs-4/packages/curriculum-central/tcl/stream-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/tcl/stream-procs-postgresql.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/curriculum-central/tcl/stream-procs-postgresql.xql	23 Jan 2006 10:38:47 -0000	1.4
+++ openacs-4/packages/curriculum-central/tcl/stream-procs-postgresql.xql	2 Feb 2006 11:45:49 -0000	1.5
@@ -33,15 +33,15 @@
      </querytext>
    </fullquery>
 
-   <fullquery name="curriculum_central::stream::semesters_in_a_year_get_options.semester_ids">
+   <fullquery name="curriculum_central::stream::sessions_get_options.session_ids">
      <querytext>
-       SELECT semester_ids FROM cc_stream WHERE stream_id = :stream_id
+       SELECT session_id FROM cc_session WHERE package_id = :package_id
      </querytext>
    </fullquery>
 
-   <fullquery name="curriculum_central::stream::semesters_in_a_year_get_options.semester_name">
+   <fullquery name="curriculum_central::stream::sessions_get_options.session_name">
      <querytext>
-       SELECT name from cc_semester WHERE semester_id = :semester_id
+       SELECT name from cc_session WHERE session_id = :session_id
      </querytext>
    </fullquery>
 
@@ -54,12 +54,21 @@
      </querytext>
    </fullquery>
 
-   <fullquery name="curriculum_central::stream::all_stream_uos.all_stream_uos">
+   <fullquery name="curriculum_central::stream::all_uos_get_options.all_uos">
      <querytext>
-       SELECT uos.uos_code || ' ' ||uos.uos_name AS name, uos.uos_id
-           FROM cc_uos uos
+       SELECT n.uos_code || ' ' || n.uos_name AS name, uos.uos_id
+           FROM cc_uos uos, cc_uos_name n
 	   WHERE uos.package_id = :package_id
+	   AND uos.uos_name_id = n.name_id
      </querytext>
    </fullquery>
 
+   <fullquery name="curriculum_central::stream::all_uos_names_get_options.all_uos_names">
+     <querytext>
+       SELECT n.uos_code || ' ' || n.uos_name AS name, n.name_id
+           FROM cc_uos_name n
+	   WHERE n.package_id = :package_id
+     </querytext>
+   </fullquery>
+
 </queryset>
Index: openacs-4/packages/curriculum-central/tcl/stream-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/tcl/stream-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/curriculum-central/tcl/stream-procs.tcl	25 Jan 2006 12:25:52 -0000	1.5
+++ openacs-4/packages/curriculum-central/tcl/stream-procs.tcl	2 Feb 2006 11:45:49 -0000	1.6
@@ -57,7 +57,7 @@
 ad_proc curriculum_central::stream::semesters_get_options {
     {-package_id ""}
 } {
-    Returns a two-column list of years that a stream runs for.
+    Returns a two-column list of semesters that a stream runs for.
 
     @param package_id ID of the current package instance.
 
@@ -106,33 +106,31 @@
 }
 
 
-ad_proc curriculum_central::stream::semesters_in_a_year_get_options {
+ad_proc curriculum_central::stream::sessions_get_options {
     {-package_id ""}
-    {-stream_id:required}
 } {
-    Returns a two-column list of years that a stream runs for.
+    Returns a two-column list of all available sessions.
 
     @param package_id ID of the current package instance.
-    @param stream_id Stream ID to retrieve valid semesters for.
 
-    @return Returns a two-column list of registered semesters.
+    @return Returns a two-column list of registered sessions.
 } {
     if { $package_id eq ""} {
 	set package_id [ad_conn package_id]
     }
 
     # Create an empty option that the user can select.  The value of
     # which is an empty string.
-    set semester_list [list [list [list [_ curriculum-central.none]] 0]]
+    set session_list [list [list [list [_ curriculum-central.none]] 0]]
 
-    set semester_ids [db_string semester_ids {} -default ""]
+    #set session_ids [db_string session_ids {} -default ""]
 
-    foreach semester_id $semester_ids {
-	set semester_name [db_string semester_name {} -default ""]
-	lappend semester_list "[list $semester_name] $semester_id"
+    db_foreach session_ids {} {
+	set session_name [db_string session_name {} -default ""]
+	lappend session_list "[list $session_name] $session_id"
     }
 
-    return $semester_list
+    return $session_list
 }
 
 
@@ -168,26 +166,44 @@
 }
 
 
-ad_proc curriculum_central::stream::all_stream_uos {
+ad_proc curriculum_central::stream::all_uos_get_options {
     {-package_id ""}
 } {
     Returns a two-column list of the names of all UoS and
-    corresponding UoS ID for the given Stream ID.
+    corresponding UoS ID from a package_id.
 
-    @param stream_id Stream ID.
     @param package_id ID of the current package instance.
 
-    @return Returns a two-column list of all UoS that have been mapped to
-    the given Stream ID.
+    @return Returns a two-column list of all UoS.
 } {
     if { $package_id eq ""} {
 	set package_id [ad_conn package_id]
     }
 
-    return [db_list_of_lists all_stream_uos {}]
+    return [db_list_of_lists all_uos {}]
 }
 
 
+ad_proc curriculum_central::stream::all_uos_names_get_options {
+    {-package_id ""}
+} {
+    Returns a two-column list of the names of all UoS names and
+    corresponding UoS name ID from a package_id.
+
+    @param package_id ID of the current package instance.
+
+    @return Returns a two-column list of all UoS names.
+} {
+    if { $package_id eq ""} {
+	set package_id [ad_conn package_id]
+    }
+
+    set empty [list [list [list [_ curriculum-central.none]] 0]]
+
+    return [concat $empty [db_list_of_lists all_uos_names {}]]
+}
+
+
 ad_proc curriculum_central::stream::stream_uos_relation_get_options {} {
     Returns a two-column list of UoS to Stream relations.  The list
     contains hard coded values for Core, Recommended and Elective, with
Index: openacs-4/packages/curriculum-central/tcl/uos-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/tcl/uos-procs-postgresql.xql,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/curriculum-central/tcl/uos-procs-postgresql.xql	22 Jan 2006 08:43:15 -0000	1.19
+++ openacs-4/packages/curriculum-central/tcl/uos-procs-postgresql.xql	2 Feb 2006 11:45:49 -0000	1.20
@@ -6,19 +6,31 @@
    <fullquery name="curriculum_central::uos::get.select_latest_uos_data">
      <querytext>
        SELECT *
-       FROM cc_uos u, cc_uos_revisions r, cr_items i
+       FROM cc_uos u, cc_uos_revisions r, cr_items i, cc_uos_name n
        WHERE u.uos_id = :uos_id
        AND i.item_id = u.uos_id
        AND r.uos_revision_id = i.latest_revision
+       AND n.name_id = u.uos_name_id
      </querytext>
    </fullquery>
 
    <fullquery name="curriculum_central::uos::get_pretty_name.pretty_name">
      <querytext>
-       SELECT uos_code || ' ' ||uos_name FROM cc_uos WHERE uos_id = :uos_id
+       SELECT n.uos_code || ' ' || n.uos_name
+           FROM cc_uos u, cc_uos_name n
+	   WHERE u.uos_id = :uos_id
+	   AND n.name_id = u.uos_name_id
      </querytext>
    </fullquery>
 
+   <fullquery name="curriculum_central::uos::uos_name_get_options.names">
+     <querytext>
+       SELECT n.uos_code || ' ' || n.uos_name AS name, n.name_id
+       FROM cc_uos_name n
+       WHERE n.package_id = :package_id
+     </querytext>
+   </fullquery>
+
    <fullquery name="curriculum_central::uos::get_details.latest_details">
      <querytext>
        SELECT d.detail_id, dr.lecturer_id, dr.objectives,
@@ -224,12 +236,17 @@
        SELECT cc_uos_revision__new (
            null,
            :uos_id,
-	   :uos_code,
-	   :uos_name,
+	   :uos_name_id,
 	   :credit_value,
+	   :department_id,
 	   :unit_coordinator_id,
+	   :session_ids,
+	   :prerequisite_ids,
+	   :assumed_knowledge_ids,
+	   :corequisite_ids,
+	   :prohibition_ids,
+	   :no_longer_offered_ids,
 	   :activity_log,
-	   :activity_log_format,
 	   now(),
 	   :creation_user,
 	   :creation_ip
Index: openacs-4/packages/curriculum-central/tcl/uos-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/tcl/uos-procs.tcl,v
diff -u -r1.26 -r1.27
--- openacs-4/packages/curriculum-central/tcl/uos-procs.tcl	22 Jan 2006 08:43:15 -0000	1.26
+++ openacs-4/packages/curriculum-central/tcl/uos-procs.tcl	2 Feb 2006 11:45:49 -0000	1.27
@@ -83,6 +83,9 @@
                     pretty_past_tense "#curriculum-central.opened#"
 		    allowed_roles { stream_coordinator }
                     new_state open
+		    edit_fields {
+			activity_log
+		    }
                     initial_action_p t
                 }
                 comment {
@@ -93,6 +96,9 @@
 			unit_coordinator
 			lecturer
 		    }
+		    edit_fields {
+			activity_log
+		    }
                     privileges { read write }
                     always_enabled_p t
                 }
@@ -105,10 +111,16 @@
                     privileges { write }
 		    assigned_states { open }
                     edit_fields { 
-			uos_code
 			uos_name
 			role_unit_coordinator
 			credit_value
+			department_id
+			session_ids
+			prerequisite_ids
+			assumed_knowledge_ids
+			corequisite_ids
+			prohibition_ids
+			no_longer_offered_ids
                     }
                 }
                 edit_tl {
@@ -170,6 +182,9 @@
                     assigned_role { unit_coordinator }
                     assigned_states { open }
                     new_state { submitted }
+		    edit_fields {
+			activity_log
+		    }
                     privileges { write }
                 }
                 close {
@@ -179,6 +194,9 @@
                     assigned_states { submitted }
                     new_state closed
                     privileges { write }
+		    edit_fields {
+			activity_log
+		    }
 		    callbacks {
 			curriculum-central.UoSGoLive
 		    }
@@ -189,6 +207,9 @@
                     allowed_roles { stream_coordinator unit_coordinator }
                     enabled_states { submitted closed }
                     new_state { open }
+		    edit_fields {
+			activity_log
+		    }
                     privileges { write }
                 }
             }
@@ -298,12 +319,17 @@
 ad_proc -public curriculum_central::uos::new {
     -uos_id:required
     -package_id:required
-    -uos_code:required
-    -uos_name:required
+    -uos_name_id:required
     -credit_value:required
+    -department_id:required
     -unit_coordinator_id:required
+    -session_ids:required
+    -prerequisite_ids:required
+    -assumed_knowledge_ids:required
+    -corequisite_ids:required
+    -prohibition_ids:required
+    -no_longer_offered_ids:required
     -activity_log:required
-    -activity_log_format:required
     {-user_id ""}
 } {
     Create a new Unit of Study, then send out notifications, starts
@@ -327,12 +353,17 @@
 			-uos_id $uos_id \
 			-package_id $package_id \
 			-user_id $user_id \
-			-uos_code $uos_code \
-			-uos_name $uos_name \
+			-uos_name_id $uos_name_id \
 			-credit_value $credit_value \
+			-department_id $department_id \
 			-unit_coordinator_id $unit_coordinator_id \
-			-activity_log $activity_log \
-			-activity_log_format $activity_log_format ]
+			-session_ids $session_ids \
+			-prerequisite_ids $prerequisite_ids \
+			-assumed_knowledge_ids $assumed_knowledge_ids \
+			-corequisite_ids $corequisite_ids \
+			-prohibition_ids $prohibition_ids \
+			-no_longer_offered_ids $no_longer_offered_ids \
+			-activity_log $activity_log ]
 
 	array set assign_array [list unit_coordinator $unit_coordinator_id]
 
@@ -345,7 +376,7 @@
 			 -workflow_id $workflow_id \
 			 -object_id $uos_id \
 			 -comment $activity_log \
-			 -comment_mime_type $activity_log_format \
+			 -comment_mime_type "text/plain" \
 			 -user_id $user_id \
 			 -assignment [array get assign_array]]
 
@@ -371,12 +402,17 @@
 ad_proc -public curriculum_central::uos::insert {
     -uos_id:required
     -package_id:required
-    -uos_code:required
-    -uos_name:required
+    -uos_name_id:required
     -credit_value:required
+    -department_id:required
     -unit_coordinator_id:required
+    -session_ids:required
+    -prerequisite_ids:required
+    -assumed_knowledge_ids:required
+    -corequisite_ids:required
+    -prohibition_ids:required
+    -no_longer_offered_ids:required
     -activity_log:required
-    -activity_log_format:required
     {-user_id ""}
 } {
     Inserts a new Unit of Study into the content repository.  You should
@@ -389,12 +425,17 @@
         -var_list [list [list uos_id $uos_id] \
 		       [list package_id $package_id] \
 		       [list user_id $user_id] \
-		       [list uos_code $uos_code] \
-		       [list uos_name $uos_name] \
+		       [list uos_name_id $uos_name_id] \
 		       [list credit_value $credit_value] \
+		       [list department_id $department_id] \
 		       [list unit_coordinator_id $unit_coordinator_id] \
+		       [list session_ids $session_ids] \
+		       [list prerequisite_ids $prerequisite_ids] \
+		       [list assumed_knowledge_ids $assumed_knowledge_ids] \
+		       [list corequisite_ids $corequisite_ids] \
+		       [list prohibition_ids $prohibition_ids] \
+		       [list no_longer_offered_ids $no_longer_offered_ids] \
 		       [list activity_log $activity_log] \
-		       [list activity_log_format $activity_log_format] \
 		       [list object_type "cc_uos"]] \
 		    -package_name "cc_uos" \
 		    "cc_uos"]
@@ -463,7 +504,6 @@
     -uos_id:required
     -enabled_action_id:required
     -activity_log:required
-    -activity_log_format:required
     -array:required
     {-user_id ""}
     {-creation_ip ""}
@@ -521,7 +561,7 @@
 	workflow::case::action::execute \
 	    -enabled_action_id $enabled_action_id \
 	    -comment $activity_log \
-	    -comment_mime_type $activity_log_format \
+	    -comment_mime_type "text/plain" \
 	    -user_id $user_id \
 	    -entry_id $entry_id
 	    
@@ -963,6 +1003,25 @@
 }
 
 
+ad_proc curriculum_central::uos::uos_name_get_options {
+    {-package_id ""}
+} {
+    Returns a two-column list of registered UoS names.
+
+    @param package_id ID of the current package instance.
+
+    @return Returns a two-column list of registered UoS names.
+} {
+    if { $package_id eq ""} {
+	set package_id [ad_conn package_id]
+    }
+
+    set names_list [db_list_of_lists names {}]
+
+    return $names_list
+}
+
+
 ad_proc -public curriculum_central::uos::get_details {
     {-uos_id:required}
     {-array:required}
@@ -1605,11 +1664,13 @@
 	set description [lindex $grade_descriptors 1]
 
 	ad_form -extend -name $form_name -form {
-	    {${prefix}${type_id}:text(textarea)
+	    {${prefix}${type_id}:richtext(richtext)
 		{label "[curriculum_central::uos::get_grade_descriptor_pretty_name -type_id $type_id]"}
 		{html {cols 50 rows 4}}
 		{mode display}
 		{value $description}
+		{htmlarea_p 0}
+		{nospell}
 		{help_text "[_ curriculum-central.help_enter_details_of_what_a_student_must_achieve_to_earn_this_grade]"}
 	    }
 	}
@@ -1716,10 +1777,12 @@
 	set assessment_ids [lindex $week 2]
 
 	ad_form -extend -name $form_name -form {
-	    {${content_prefix}${week_id}:text(textarea)
+	    {${content_prefix}${week_id}:richtext(richtext)
 		{label "[curriculum_central::uos::get_schedule_pretty_name -week_id $week_id] [_ curriculum-central.course_content]"}
 		{html {cols 50 rows 4}}
 		{mode display}
+		{htmlarea_p 0}
+		{nospell}
 		{value $course_content}
 	    }
 	    {${assessment_prefix}${week_id}:text(multiselect),multiple,optional
Index: openacs-4/packages/curriculum-central/www/dept-streams.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/dept-streams.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/curriculum-central/www/dept-streams.adp	11 Dec 2005 22:55:29 -0000	1.2
+++ openacs-4/packages/curriculum-central/www/dept-streams.adp	2 Feb 2006 11:45:49 -0000	1.3
@@ -1,10 +1,12 @@
-<master>
+<master src="resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
 #curriculum-central.view_uos_for#
 <ul>
 <multiple name="streams">
-<li><a href="@streams.stream_uos_url@">@streams.stream_name@</a></li>
+<li>@streams.stream_name@ [#curriculum-central.overview_lc# | <a href="@streams.stream_uos_url@">#curriculum-central.map_lc#</a>]</li>
 </multiple>
 </ul>
+
+View all Units of Study offered by @department_name@
\ No newline at end of file
Index: openacs-4/packages/curriculum-central/www/dept-streams.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/dept-streams.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/dept-streams.tcl	11 Dec 2005 07:47:41 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/dept-streams.tcl	2 Feb 2006 11:45:49 -0000	1.2
@@ -15,7 +15,7 @@
 
 set page_title $department_name
 set context [list [list [export_vars -url -base faculty-depts \
-			     {faculty_name faculty_id}] $faculty_name] \
+			     {faculty_id faculty_name}] $faculty_name] \
 		 $page_title]
 set package_id [ad_conn package_id]
 
@@ -27,7 +27,7 @@
 
 # Get list of streams.
 db_multirow -extend {stream_uos_url} streams streams {} {
-    set stream_uos_url [export_vars -url -base stream-uos \
+    set stream_uos_url [export_vars -url -base stream-map \
 			     {stream_id stream_name}]
 }
 
Index: openacs-4/packages/curriculum-central/www/faculty-depts.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/faculty-depts.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/curriculum-central/www/faculty-depts.adp	11 Dec 2005 22:55:29 -0000	1.2
+++ openacs-4/packages/curriculum-central/www/faculty-depts.adp	2 Feb 2006 11:45:49 -0000	1.3
@@ -1,8 +1,8 @@
-<master>
+<master src="resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-#curriculum-central.view_degree_streams_for#
+#curriculum-central.view_uos_offered_by#
 <ul>
 <multiple name="depts">
 <li><a href="@depts.dept_streams_url@">@depts.department_name@</a></li>
Index: openacs-4/packages/curriculum-central/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/index.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/curriculum-central/www/index.adp	18 Dec 2005 13:28:22 -0000	1.8
+++ openacs-4/packages/curriculum-central/www/index.adp	2 Feb 2006 11:45:49 -0000	1.9
@@ -1,24 +1,13 @@
-<master>
+<master src="resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
+<property name="admin_options">[<a href="admin/">#curriculum-central.admin#</a>]</property>
+<property name="staff_options">[<a href="coordinate/">#curriculum-central.coordinate#</a>]</property>
 
-<if @admin_p@>[<a href="admin">admin</a>]</if>
 
-<ul>
-<li><a href="coordinate/">#curriculum-central.coordinate#</a></li>
-</ul>
-
 #curriculum-central.view_curriculum_for#
 <ul>
 <multiple name="faculties">
 <li><a href="@faculties.faculty_dept_url@">@faculties.faculty_name@</a></li>
 </multiple>
 </ul>
-
-<h3>Things To Do</h3>
-<ul>
-<li>View Unit Coordinators</li>
-<li>View Catalog of Units of Study</li>
-<li>View all Units of Study by Streams</li>
-<li>View Course Maps</li>
-</ul>
Index: openacs-4/packages/curriculum-central/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/index.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/curriculum-central/www/index.tcl	11 Dec 2005 07:47:41 -0000	1.4
+++ openacs-4/packages/curriculum-central/www/index.tcl	2 Feb 2006 11:45:49 -0000	1.5
@@ -8,8 +8,8 @@
 
 set page_title [ad_conn instance_name]
 set context [list]
-set admin_p [permission::permission_p -object_id [ad_conn package_id] -privilege admin]
 set package_id [ad_conn package_id]
+set admin_p [permission::permission_p -object_id $package_id -privilege admin]
 
 # Check for streams.  If no streams, then display no-streams template.
 if { ![curriculum_central::stream::streams_exist_p] } {
Index: openacs-4/packages/curriculum-central/www/no-streams.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/no-streams.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/no-streams.adp	20 Nov 2005 23:51:11 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/no-streams.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/curriculum-central/www/admin/dept-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/dept-ae.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/admin/dept-ae.adp	21 Nov 2005 01:10:54 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/admin/dept-ae.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 <property name="focus">dept.department_name</property>
Index: openacs-4/packages/curriculum-central/www/admin/faculties.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/faculties.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/admin/faculties.adp	20 Nov 2005 23:51:11 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/admin/faculties.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/curriculum-central/www/admin/faculty-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/faculty-ae.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/admin/faculty-ae.adp	20 Nov 2005 23:51:11 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/admin/faculty-ae.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 <property name="focus">faculty.faculty_name</property>
Index: openacs-4/packages/curriculum-central/www/admin/faculty-depts.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/faculty-depts.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/admin/faculty-depts.adp	20 Nov 2005 23:51:11 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/admin/faculty-depts.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/curriculum-central/www/admin/gradattr-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/gradattr-ae.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/admin/gradattr-ae.adp	12 Jan 2006 07:15:24 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/admin/gradattr-ae.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 <property name="focus">gradattr.name</property>
Index: openacs-4/packages/curriculum-central/www/admin/gradattrs.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/gradattrs.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/admin/gradattrs.adp	12 Jan 2006 07:15:24 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/admin/gradattrs.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/curriculum-central/www/admin/grade-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/grade-ae.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/admin/grade-ae.adp	9 Jan 2006 05:46:50 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/admin/grade-ae.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 <property name="focus">grade.name</property>
Index: openacs-4/packages/curriculum-central/www/admin/grades.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/grades.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/admin/grades.adp	9 Jan 2006 05:46:50 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/admin/grades.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/curriculum-central/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/index.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/curriculum-central/www/admin/index.adp	22 Jan 2006 08:43:15 -0000	1.7
+++ openacs-4/packages/curriculum-central/www/admin/index.adp	2 Feb 2006 11:45:49 -0000	1.8
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 <property name="header_stuff">
@@ -26,10 +26,10 @@
   <li><a href="year-ae">#curriculum-central.add_a_year#</a></li>
   </ul>
 </li>
-<li><span>#curriculum-central.semesters#</span>
+<li><span>#curriculum-central.sessions#</span>
   <ul>
-  <li><a href="semesters">#curriculum-central.view_semesters#</a></li>
-  <li><a href="semester-ae">#curriculum-central.add_a_semester#</a></li>
+  <li><a href="sessions">#curriculum-central.view_sessions#</a></li>
+  <li><a href="session-ae">#curriculum-central.add_a_session#</a></li>
   </ul>
 </li>
 <li><span>#curriculum-central.streams#</span>
Index: openacs-4/packages/curriculum-central/www/admin/no-faculties.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/no-faculties.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/admin/no-faculties.adp	30 Nov 2005 04:55:20 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/admin/no-faculties.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/curriculum-central/www/admin/schedule-week-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/schedule-week-ae.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/admin/schedule-week-ae.adp	11 Jan 2006 00:49:17 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/admin/schedule-week-ae.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 <property name="focus">week.name</property>
Index: openacs-4/packages/curriculum-central/www/admin/schedule.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/schedule.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/admin/schedule.adp	11 Jan 2006 00:49:17 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/admin/schedule.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/curriculum-central/www/admin/semester-ae-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/curriculum-central/www/admin/semester-ae.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/curriculum-central/www/admin/semester-ae.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/curriculum-central/www/admin/semesters-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/curriculum-central/www/admin/semesters.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/curriculum-central/www/admin/semesters.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/curriculum-central/www/admin/session-ae-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/session-ae-postgresql.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/curriculum-central/www/admin/session-ae-postgresql.xql	2 Feb 2006 11:45:49 -0000	1.1
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+
+   <fullquery name="object_new">
+     <querytext>
+       SELECT cc_session__new (NULL, :name, $start_date, $end_date,
+           :user_id, :peeraddr, :package_id)
+     </querytext>
+   </fullquery>
+
+   <fullquery name="session_update">
+     <querytext>
+       UPDATE cc_session
+	   name = :name,
+	   start_date = :start_date,
+	   end_date = :end_date
+	   WHERE session_id = :session_id
+     </querytext>
+   </fullquery>
+
+   <fullquery name="object_update">
+     <querytext>
+       UPDATE acs_objects
+           SET modifying_user = :modifying_user,
+	   modifying_ip = :modifying_ip
+	   WHERE object_id = :session_id
+     </querytext>
+   </fullquery>
+
+</queryset>
Index: openacs-4/packages/curriculum-central/www/admin/session-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/session-ae.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/curriculum-central/www/admin/session-ae.adp	2 Feb 2006 11:45:49 -0000	1.1
@@ -0,0 +1,6 @@
+<master src="../resources/main-portal">
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
+<property name="focus">session.name</property>
+
+<formtemplate id="session"></formtemplate>
\ No newline at end of file
Index: openacs-4/packages/curriculum-central/www/admin/session-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/session-ae.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/curriculum-central/www/admin/session-ae.tcl	2 Feb 2006 11:45:49 -0000	1.1
@@ -0,0 +1,66 @@
+ad_page_contract {
+    Add/Edit a session.
+
+    @author Nick Carroll (nick.c@rroll.net)
+    @creation-date 2005-11-20
+    @cvs-id $Id: session-ae.tcl,v 1.1 2006/02/02 11:45:49 ncarroll Exp $
+} {
+    session_id:integer,optional
+    {return_url "sessions"}
+}
+
+if { [info exists session_id] } {
+    set page_title [_ curriculum-central.edit_session]
+} else {
+    set page_title [_ curriculum-central.add_session]
+}
+
+set context [list $page_title]
+set package_id [ad_conn package_id]
+set user_id [ad_conn user_id]
+set peeraddr [ad_conn peeraddr]
+
+ad_form -name session -cancel_url $return_url -form {
+    {session_id:key(acs_object_id_seq)}
+    {return_url:text(hidden) {value $return_url}}
+    {name:text
+	{html {size 50}}
+	{label "#curriculum-central.name#" }
+	{help_text "[_ curriculum-central.help_enter_session_name]"}
+    }
+    {start_date:date,to_sql(sql_date),to_html(display_date)
+	{label "#curriculum-central.start_date#" }
+	{help_text "[_ curriculum-central.help_enter_start_date]"}
+	{format "[lc_get formbuilder_date_format]"}
+    }
+    {end_date:date,to_sql(sql_date),to_html(display_date)
+	{label "#curriculum-central.end_date#"}
+	{help_text "[_ curriculum-central.help_enter_end_date]"}
+	{format "[lc_get formbuilder_date_format]"}
+    }
+} -select_query {
+       SELECT name, start_date, end_date
+	   FROM cc_session WHERE session_id = :session_id
+} -validate {
+    {start_date
+        { [template::util::date::compare $start_date $end_date] <= 0 }
+        "#curriculum-central.start_date_must_be_set_before_end_date#"
+    }
+} -new_data {
+ns_log Warning "NC: start_date: $start_date end_date $end_date"
+
+    # Can't use package_instantiate_object because the underlying
+    # db_exec_plsql can't know that the contents of the start_date and
+    # end_date contain functions and not variables
+    db_exec_plsql object_new {}
+
+} -edit_data {
+    set modifying_user [ad_conn user_id]
+    set modifying_ip [ad_conn peeraddr]
+
+    db_dml session_update {}
+    db_dml object_update {}
+} -after_submit {
+    ad_returnredirect $return_url
+    ad_script_abort
+}
Index: openacs-4/packages/curriculum-central/www/admin/sessions-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/sessions-postgresql.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/curriculum-central/www/admin/sessions-postgresql.xql	2 Feb 2006 11:45:49 -0000	1.1
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+
+   <fullquery name="get_sessions">
+     <querytext>
+       SELECT s.session_id, s.name, s.start_date, s.end_date
+	   FROM cc_session s
+	   WHERE package_id = :package_id
+	   [template::list::orderby_clause -orderby -name "sessions"]
+     </querytext>
+   </fullquery>
+
+</queryset>
Index: openacs-4/packages/curriculum-central/www/admin/sessions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/sessions.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/curriculum-central/www/admin/sessions.adp	2 Feb 2006 11:45:49 -0000	1.1
@@ -0,0 +1,5 @@
+<master src="../resources/main-portal">
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
+
+<listtemplate name="sessions"></listtemplate>
\ No newline at end of file
Index: openacs-4/packages/curriculum-central/www/admin/sessions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/sessions.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/curriculum-central/www/admin/sessions.tcl	2 Feb 2006 11:45:49 -0000	1.1
@@ -0,0 +1,57 @@
+ad_page_contract {
+    Page for creating sessions.
+
+    @author Nick Carroll (nick.c@rroll.net)
+    @creation-date 2005-11-15
+    @cvs-id $Id: sessions.tcl,v 1.1 2006/02/02 11:45:49 ncarroll Exp $
+} {
+    {orderby "name,asc"}
+}
+
+set page_title "[_ curriculum-central.sessions]"
+set context [list [_ curriculum-central.sessions]]
+set package_id [ad_conn package_id]
+
+set elements {
+    edit {
+	sub_class narrow
+	display_template {
+	    <img src="/shared/images/Edit16.gif" height="16" width="16" border="0">
+	}
+	link_url_eval {[export_vars -base session-ae { session_id }]}
+	link_html {title "#curriculum-central.edit_session_info#"}
+    }
+    name {
+	label "#curriculum-central.name#"
+    }
+    start_date {
+	label "#curriculum-central.start_date#"
+	display_eval { [lc_time_fmt $start_date %d/%m/%y] }
+    }
+    end_date {
+	label "#curriculum-central.end_date#"
+	display_eval { [lc_time_fmt $end_date %d/%m/%y] }
+    }
+    delete {
+	sub_class narrow
+	display_template {
+	    <img src="/shared/images/Delete16.gif" height="16" width="16" border="0">
+	}
+    }
+}
+
+template::list::create \
+    -name sessions \
+    -actions [list "#curriculum-central.add_session#" [export_vars -base session-ae {}] "#curriculum-central.add_session_to_list#"] \
+    -multirow sessions \
+    -no_data "#curriculum-central.no_sessions_created#" \
+    -elements $elements \
+    -orderby {
+        name {orderby {lower(name)}}
+	start_date {orderby {start_date}}
+	end_date {orderby {end_date}}
+    }
+
+db_multirow sessions get_sessions {}
+
+ad_return_template
\ No newline at end of file
Index: openacs-4/packages/curriculum-central/www/admin/staff-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/staff-ae.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/admin/staff-ae.adp	4 Dec 2005 06:50:31 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/admin/staff-ae.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 <property name="focus">staff.staff_id</property>
Index: openacs-4/packages/curriculum-central/www/admin/staff.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/staff.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/admin/staff.adp	4 Dec 2005 06:50:31 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/admin/staff.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/curriculum-central/www/admin/stream-ae-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/stream-ae-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/curriculum-central/www/admin/stream-ae-postgresql.xql	22 Jan 2006 08:43:15 -0000	1.2
+++ openacs-4/packages/curriculum-central/www/admin/stream-ae-postgresql.xql	2 Feb 2006 11:45:49 -0000	1.3
@@ -10,7 +10,6 @@
 	   stream_name = :stream_name,
 	   stream_code = :stream_code,
 	   year_ids = :year_ids,
-	   semester_ids = :semester_ids,
 	   department_id = :department_id
 	   WHERE stream_id = :stream_id
      </querytext>
Index: openacs-4/packages/curriculum-central/www/admin/stream-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/stream-ae.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/admin/stream-ae.adp	20 Nov 2005 23:51:11 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/admin/stream-ae.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 <property name="focus">stream.stream_name</property>
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.4 -r1.5
--- openacs-4/packages/curriculum-central/www/admin/stream-ae.tcl	22 Jan 2006 08:43:15 -0000	1.4
+++ openacs-4/packages/curriculum-central/www/admin/stream-ae.tcl	2 Feb 2006 11:45:49 -0000	1.5
@@ -37,12 +37,6 @@
 	{html {size 5}}
 	{help_text "[_ curriculum-central.help_select_years_for_this_stream]"}
     }
-    {semester_ids:text(multiselect),multiple
-	{label "#curriculum-central.semesters_in_a_year#"}
-	{options [curriculum_central::stream::semesters_get_options]}
-	{html {size 5}}
-	{help_text "[_ curriculum-central.help_select_semesters_in_a_year]"}
-    }
     {department_id:integer(select)
 	{label "#curriculum-central.department#" }
 	{options [curriculum_central::departments_get_options] }
@@ -55,7 +49,7 @@
     }
 } -select_query {
        SELECT coordinator_id, stream_name, stream_code,
-           year_ids, semester_ids, department_id
+           year_ids, department_id
 	   FROM cc_stream WHERE stream_id = :stream_id
 } -new_data {
     
@@ -66,7 +60,6 @@
 		        [list stream_name $stream_name] \
 		        [list stream_code $stream_code] \
 		        [list year_ids $year_ids] \
-		        [list semester_ids $semester_ids] \
 		        [list department_id $department_id] \
 		        [list coordinator_id $coordinator_id]] \
 	-form_id stream cc_stream
Index: openacs-4/packages/curriculum-central/www/admin/streams.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/streams.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/admin/streams.adp	20 Nov 2005 23:51:11 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/admin/streams.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/curriculum-central/www/admin/year-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/year-ae.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/admin/year-ae.adp	22 Jan 2006 08:43:15 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/admin/year-ae.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 <property name="focus">year.name</property>
Index: openacs-4/packages/curriculum-central/www/admin/years.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/years.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/admin/years.adp	22 Jan 2006 08:43:15 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/admin/years.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/curriculum-central/www/coordinate/assess-method-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/assess-method-ae.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/coordinate/assess-method-ae.adp	6 Jan 2006 04:50:18 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/coordinate/assess-method-ae.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 <property name="focus">assess_method.name</property>
Index: openacs-4/packages/curriculum-central/www/coordinate/assess-methods.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/assess-methods.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/coordinate/assess-methods.adp	6 Jan 2006 04:50:18 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/coordinate/assess-methods.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/curriculum-central/www/coordinate/gradattr-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/gradattr-ae.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/coordinate/gradattr-ae.adp	4 Jan 2006 23:32:36 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/coordinate/gradattr-ae.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 <property name="focus">gradattr.name</property>
Index: openacs-4/packages/curriculum-central/www/coordinate/gradattrs.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/gradattrs.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/coordinate/gradattrs.adp	4 Jan 2006 23:32:36 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/coordinate/gradattrs.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/curriculum-central/www/coordinate/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/index.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/curriculum-central/www/coordinate/index.adp	22 Jan 2006 08:43:15 -0000	1.8
+++ openacs-4/packages/curriculum-central/www/coordinate/index.adp	2 Feb 2006 11:45:49 -0000	1.9
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
@@ -11,9 +11,22 @@
 
 <ul>
 <if @stream_coordinator_p@>
-<li><a href="uos-add">#curriculum-central.add_unit_of_study#</a></li>
+<li><a href="uos-names">#curriculum-central.view_uos_names#</a></li>
+<li><a href="uos-name-ae">#curriculum-central.add_uos_name#</a></li>
+</ul>
+
+<ul>
 <li><a href="streams">#curriculum-central.view_streams#</a></li>
+</ul>
+
+<ul>
+<li><a href="uos-all">#curriculum-central.view_all_uos#</a></li>
+<li><a href="uos-add">#curriculum-central.add_unit_of_study#</a></li>
+<li><a href="uos-all-pending">#curriculum-central.all_pending_units_of_study#</a> (@num_all_pending@ #curriculum-central.pending#)</li>
+</ul>
+
 </if>
+
+<ul>
 <li><a href="uos-pending">#curriculum-central.your_pending_units_of_study#</a> (@num_users_pending@ #curriculum-central.pending#)</li>
-<li><a href="uos-all-pending">#curriculum-central.all_pending_units_of_study#</a> (@num_all_pending@ #curriculum-central.pending#)</li>
 </ul>
Index: openacs-4/packages/curriculum-central/www/coordinate/stream-map-ae-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/stream-map-ae-postgresql.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/curriculum-central/www/coordinate/stream-map-ae-postgresql.xql	25 Jan 2006 12:25:52 -0000	1.4
+++ openacs-4/packages/curriculum-central/www/coordinate/stream-map-ae-postgresql.xql	2 Feb 2006 11:45:49 -0000	1.5
@@ -11,9 +11,7 @@
 
    <fullquery name="form_info">
      <querytext>
-	SELECT map.uos_id, rev.year_id, rev.semester_ids, rev.core_id,
-   	    rev.prerequisite_ids, rev.assumed_knowledge_ids,
-	    rev.corequisite_ids, rev.prohibition_ids, rev.no_longer_offered_ids
+	SELECT map.uos_id, rev.year_id, rev.core_id
 	FROM cc_stream_uos_map map, cc_stream_uos_map_rev rev
 	WHERE map.map_id = :map_id
 	AND rev.map_rev_id = map.latest_revision_id
@@ -26,13 +24,7 @@
            NULL,
 	   :map_id,
 	   :year_id,
-	   :semester_ids,
 	   :core_id,
-	   :prerequisite_ids,
-	   :assumed_knowledge_ids,
-	   :corequisite_ids,
-	   :prohibition_ids,
-	   :no_longer_offered_ids,
 	   now(),
 	   :modifying_user,
 	   :modifying_ip
Index: openacs-4/packages/curriculum-central/www/coordinate/stream-map-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/stream-map-ae.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/coordinate/stream-map-ae.adp	22 Jan 2006 08:43:15 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/coordinate/stream-map-ae.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/curriculum-central/www/coordinate/stream-map-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/stream-map-ae.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/curriculum-central/www/coordinate/stream-map-ae.tcl	25 Jan 2006 12:25:52 -0000	1.4
+++ openacs-4/packages/curriculum-central/www/coordinate/stream-map-ae.tcl	2 Feb 2006 11:45:49 -0000	1.5
@@ -29,10 +29,6 @@
 if { [info exists uos_id] } {
     set page_title "[_ curriculum-central.edit_uos_to_stream_mapping]: $stream_name"
 
-    set requisite_uos_options \
-	[curriculum_central::stream::all_uos_except_get_options \
-	     -empty_option -except_uos_id $uos_id]
-
     # Create form for mapping a Unit of Study to the given stream_id.
     ad_form -name stream_map -cancel_url $return_url -form {
 	{map_id:key}
@@ -48,47 +44,11 @@
 	    {options "[curriculum_central::stream::years_for_uos_get_options -stream_id $stream_id]"}
 	    {help_text "[_ curriculum-central.help_select_years_that_uos_is_offered]"}
 	}
-	{semester_ids:text(multiselect),multiple
-	    {label "[_ curriculum-central.semesters]"}
-	    {options "[curriculum_central::stream::semesters_in_a_year_get_options -stream_id $stream_id]"}
-	    {html {size 5}}
-	    {help_text "[_ curriculum-central.help_select_semesters_that_uos_is_offered]"}
-	}
 	{core_id:integer(select)
 	    {label "[_ curriculum-central.core_recommended_or_elective]"}
 	    {options "[curriculum_central::stream::stream_uos_relation_get_options]"}
 	    {help_text "[_ curriculum-central.help_select_core_recommended_or_elective]"}
 	}
-	{prerequisite_ids:text(multiselect),multiple
-	    {label "[_ curriculum-central.prerequisites]"}
-	    {options $requisite_uos_options}
-	    {html {size 5}}
-	    {help_text "[_ curriculum-central.help_select_prerequisites_for_uos]"}
-	}
-	{assumed_knowledge_ids:text(multiselect),multiple
-	    {label "[_ curriculum-central.assumed_knowledge]"}
-	    {options $requisite_uos_options}
-	    {html {size 5}}
-	    {help_text "[_ curriculum-central.help_select_assumed_knowledge_for_uos]"}
-	}
-	{corequisite_ids:text(multiselect),multiple
-	    {label "[_ curriculum-central.corequisites]"}
-	    {options $requisite_uos_options}
-	    {html {size 5}}
-	    {help_text "[_ curriculum-central.help_select_corequisites_for_uos]"}
-	}
-	{prohibition_ids:text(multiselect),multiple
-	    {label "[_ curriculum-central.prohibitions]"}
-	    {options $requisite_uos_options}
-	    {html {size 5}}
-	    {help_text "[_ curriculum-central.help_select_prohibitions_for_uos]"}
-	}
-	{no_longer_offered_ids:text(multiselect),multiple
-	    {label "[_ curriculum-central.no_longer_offered]"}
-	    {options $requisite_uos_options}
-	    {html {size 5}}
-	    {help_text "[_ curriculum-central.help_select_uos_no_longer_offered]"}
-	}
     } -select_query_name {form_info} -new_data {
 	# Create new CR object
 	set map_id [package_instantiate_object \
@@ -97,13 +57,7 @@
 		[list stream_id $stream_id] \
 		[list uos_id $uos_id] \
 		[list year_id $year_id] \
-		[list semester_ids $semester_ids] \
 		[list core_id $core_id] \
-		[list prerequisite_ids $prerequisite_ids] \
-		[list assumed_knowledge_ids $assumed_knowledge_ids] \
-		[list corequisite_ids $corequisite_ids] \
-		[list prohibition_ids $prohibition_ids] \
-		[list no_longer_offered_ids $no_longer_offered_ids] \
 		[list object_type "cc_stream_uos_map"]] \
 			       "cc_stream_uos_map"]
 	
@@ -130,7 +84,7 @@
 	{return_url:text(hidden) {value $return_url}}
 	{uos_id:integer(select)
 	    {label "[_ curriculum-central.uos]"}
-	    {options "[curriculum_central::stream::all_stream_uos]"}
+	    {options "[curriculum_central::stream::all_uos_get_options]"}
 	    {help_text "[_ curriculum-central.help_select_uos_to_map]"}
 	    {mode edit}
 	}
Index: openacs-4/packages/curriculum-central/www/coordinate/stream-view-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/stream-view-postgresql.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/curriculum-central/www/coordinate/stream-view-postgresql.xql	25 Jan 2006 12:25:52 -0000	1.4
+++ openacs-4/packages/curriculum-central/www/coordinate/stream-view-postgresql.xql	2 Feb 2006 11:45:49 -0000	1.5
@@ -5,16 +5,19 @@
 
    <fullquery name="units_of_study">
      <querytext>
-       SELECT map.map_id, uos.uos_code, uos.uos_name, uos.uos_id,
-           rev.year_id, y.name, rev.semester_ids, rev.core_id,
+       SELECT map.map_id, n.uos_code, n.uos_name, uos.uos_id,
+           rev.year_id, y.name, uosr.session_ids, rev.core_id,
 	   map.live_revision_id, map.latest_revision_id
        FROM cc_uos uos, cc_stream_uos_map map, cc_stream_uos_map_rev rev,
-           cc_year y
+           cc_year y, cc_uos_name n, cc_uos_revisions uosr, cr_items i
        WHERE uos.uos_id = map.uos_id
        AND map.stream_id = :stream_id
        AND map.latest_revision_id = rev.map_rev_id
        AND rev.year_id = y.year_id
        AND rev.year_id != 0
+       AND n.name_id = uos.uos_name_id
+       AND uosr.uos_revision_id = i.latest_revision
+       AND i.item_id = uos.uos_id
      </querytext>
    </fullquery>
 
@@ -24,21 +27,23 @@
      </querytext>
    </fullquery>
 
-   <fullquery name="semester_name">
+   <fullquery name="session_name">
      <querytext>
-       SELECT cc_semester__name(:semester_id)
+       SELECT cc_session__name(:session_id)
      </querytext>
    </fullquery>
 
    <fullquery name="not_offered">
      <querytext>
-       SELECT map.map_id, uos.uos_code, uos.uos_name, uos.uos_id,
+       SELECT map.map_id, n.uos_code, n.uos_name, uos.uos_id,
            rev.year_id, map.live_revision_id, map.latest_revision_id
-       FROM cc_uos uos, cc_stream_uos_map map, cc_stream_uos_map_rev rev
+       FROM cc_uos uos, cc_stream_uos_map map, cc_stream_uos_map_rev rev,
+       cc_uos_name n
        WHERE uos.uos_id = map.uos_id
        AND map.stream_id = :stream_id
        AND map.latest_revision_id = rev.map_rev_id
        AND rev.year_id = 0
+       AND n.name_id = uos.uos_name_id
      </querytext>
    </fullquery>
 
Index: openacs-4/packages/curriculum-central/www/coordinate/stream-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/stream-view.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/curriculum-central/www/coordinate/stream-view.adp	25 Jan 2006 12:45:17 -0000	1.7
+++ openacs-4/packages/curriculum-central/www/coordinate/stream-view.adp	2 Feb 2006 11:45:49 -0000	1.8
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 <property name="header_stuff">
@@ -27,9 +27,9 @@
   <multiple name="stream">
   <ul id="years">
     <li>@stream.year_name@</li>
-    <ul id="semesters">
+    <ul id="sessions">
       <group column="year_id">
-      <li>@stream.semester_name@</li>
+      <li>@stream.session_name@</li>
       <ul id="uos">
         <group column="group">
         <li><a href="@stream.edit_url@"><img src="/shared/images/Edit16.gif" /></a> | <a href="@stream.delete_url@"><img src="/shared/images/Delete16.gif" /></a><span>@stream.uos_code@ @stream.uos_name@ (@stream.core_or_not@)</span></li>
Index: openacs-4/packages/curriculum-central/www/coordinate/stream-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/stream-view.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/curriculum-central/www/coordinate/stream-view.tcl	25 Jan 2006 12:45:17 -0000	1.6
+++ openacs-4/packages/curriculum-central/www/coordinate/stream-view.tcl	2 Feb 2006 11:45:49 -0000	1.7
@@ -25,7 +25,7 @@
 set units_of_study [db_list_of_lists units_of_study {}]
 
 template::multirow create stream map_id year_id year_name \
-    semester_id semester_name core_or_not uos_id uos_code uos_name \
+    session_id session_name core_or_not uos_id uos_code uos_name \
     group edit_url delete_url
 
 # Set the modified state to 0 by default.  This means the stream
@@ -43,7 +43,7 @@
     set uos_id [lindex $uos 3]
     set year_id [lindex $uos 4]
     set year_name [lindex $uos 5]
-    set semester_ids [lindex $uos 6]
+    set session_ids [lindex $uos 6]
     set core_id [lindex $uos 7]
     set live_revision_id [lindex $uos 8]
     set latest_revision_id [lindex $uos 9]
@@ -59,32 +59,32 @@
 	lappend modified_list $map_id
     }
 
-    foreach semester_id $semester_ids {
-	# Get name for semester_id
-	set semester_name [db_string semester_name {} -default ""]
+    foreach session_id $session_ids {
+	# Get name for session_id
+	set session_name [db_string session_name {} -default ""]
 	
 	# Create a "derived column" called group that is the amalgamation
-	# of the year_id and semester_id.  It is used as a workaround for
+	# of the year_id and session_id.  It is used as a workaround for
 	# bug 428 (http://openacs.org/bugtracker/openacs/bug?bug%5fnumber=428),
 	# when using the <group> tag in the template.
-	set group "$year_id$semester_id"
+	set group "$year_id$session_id"
 
 	set edit_url [export_vars -base stream-map-ae \
 			  {stream_id uos_id map_id return_url}]
 	set delete_url [export_vars -base stream-map-del \
 			    {stream_id map_id return_url}]
 
 	template::multirow append stream $map_id $year_id $year_name \
-	    $semester_id $semester_name $core_or_not $uos_id $uos_code \
+	    $session_id $session_name $core_or_not $uos_id $uos_code \
 	    $uos_name $group $edit_url $delete_url
     }
 }
 
 set add_url [export_vars -base stream-map-ae {stream_id return_url}]
 set publish_url [export_vars -base stream-publish {stream_id modified_list}]
 
-# Sort stream info by increasing year and semester.
-template::multirow sort stream -increasing year_id semester_id
+# Sort stream info by increasing year and session.
+template::multirow sort stream -increasing year_id session_id
 
 # Get all UoS that are no longer offered.  These are UoS that were
 # previously mapped, but now have a year_id that is set to 0.
Index: openacs-4/packages/curriculum-central/www/coordinate/streams.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/streams.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/coordinate/streams.adp	22 Jan 2006 08:43:15 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/coordinate/streams.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/curriculum-central/www/coordinate/textbook-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/textbook-ae.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/coordinate/textbook-ae.adp	6 Jan 2006 12:37:39 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/coordinate/textbook-ae.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 <property name="focus">textbook.title</property>
Index: openacs-4/packages/curriculum-central/www/coordinate/textbooks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/textbooks.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/coordinate/textbooks.adp	6 Jan 2006 12:37:39 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/coordinate/textbooks.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/curriculum-central/www/coordinate/tl-method-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/tl-method-ae.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/curriculum-central/www/coordinate/tl-method-ae.adp	4 Jan 2006 23:32:36 -0000	1.2
+++ openacs-4/packages/curriculum-central/www/coordinate/tl-method-ae.adp	2 Feb 2006 11:45:49 -0000	1.3
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 <property name="focus">tl_method.name</property>
Index: openacs-4/packages/curriculum-central/www/coordinate/tl-methods.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/tl-methods.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/coordinate/tl-methods.adp	3 Jan 2006 03:23:28 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/coordinate/tl-methods.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/curriculum-central/www/coordinate/uos-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/uos-add.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/coordinate/uos-add.adp	11 Dec 2005 23:02:19 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/coordinate/uos-add.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 <property name="focus">uos.uos_code</property>
Index: openacs-4/packages/curriculum-central/www/coordinate/uos-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/uos-add.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/curriculum-central/www/coordinate/uos-add.tcl	22 Jan 2006 08:43:15 -0000	1.7
+++ openacs-4/packages/curriculum-central/www/coordinate/uos-add.tcl	2 Feb 2006 11:45:49 -0000	1.8
@@ -35,30 +35,73 @@
 set page_title "[_ curriculum-central.add_unit_of_study]"
 set context [list [list . [_ curriculum-central.coordinate]] $page_title]
 
+set requisite_uos_options \
+    [curriculum_central::stream::all_uos_names_get_options]
+
+
 # Create the form.
 ad_form -name uos -cancel_url $return_url -form {
     {uos_id:key(acs_object_id_seq)}
 
-    {uos_code:text
-	{label "#curriculum-central.uos_code#"}
-	{html {size 50}}
-    }
-    {uos_name:text
+    {uos_name_id:integer(select)
 	{label "#curriculum-central.uos_name#"}
-	{html {size 50}}
+	{options [curriculum_central::uos::uos_name_get_options]}
+	{help_text "[_ curriculum-central.help_select_uos_name]"}
     }
     {credit_value:integer
 	{label "#curriculum-central.credit_value#"}
-	{html {size 50}}	
+	{html {size 3}}
+	{help_text "[_ curriculum-central.help_enter_credit_value]"}
     }
+    {department_id:integer(select)
+	{label "#curriculum-central.department#" }
+	{options [curriculum_central::departments_get_options] }
+	{help_text "[_ curriculum-central.help_select_a_dept]"}
+    }
     {unit_coordinator_id:integer(select)
 	{label "#curriculum-central.unit_coordinator#"}
 	{options [curriculum_central::staff_get_options] }
         {help_text "[_ curriculum-central.help_select_unit_coordinator]"}
     }
-    {activity_log:richtext(richtext)
+    {session_ids:text(multiselect),multiple
+	{label "[_ curriculum-central.sessions]"}
+	{options "[curriculum_central::stream::sessions_get_options]"}
+	{html {size 5}}
+	{help_text "[_ curriculum-central.help_select_sessions_that_uos_is_offered]"}
+    }
+    {prerequisite_ids:text(multiselect),multiple
+	{label "[_ curriculum-central.prerequisites]"}
+	{options $requisite_uos_options}
+	{html {size 5}}
+	{help_text "[_ curriculum-central.help_select_prerequisites_for_uos]"}
+    }
+    {assumed_knowledge_ids:text(multiselect),multiple
+	{label "[_ curriculum-central.assumed_knowledge]"}
+	{options $requisite_uos_options}
+	{html {size 5}}
+	{help_text "[_ curriculum-central.help_select_assumed_knowledge_for_uos]"}
+    }
+    {corequisite_ids:text(multiselect),multiple
+	{label "[_ curriculum-central.corequisites]"}
+	{options $requisite_uos_options}
+	{html {size 5}}
+	{help_text "[_ curriculum-central.help_select_corequisites_for_uos]"}
+    }
+    {prohibition_ids:text(multiselect),multiple
+	{label "[_ curriculum-central.prohibitions]"}
+	{options $requisite_uos_options}
+	{html {size 5}}
+	{help_text "[_ curriculum-central.help_select_prohibitions_for_uos]"}
+    }
+    {no_longer_offered_ids:text(multiselect),multiple
+	{label "[_ curriculum-central.no_longer_offered]"}
+	{options $requisite_uos_options}
+	{html {size 5}}
+	{help_text "[_ curriculum-central.help_select_uos_no_longer_offered]"}
+    }
+    {activity_log:text(textarea)
 	{label "#curriculum-central.activity_log#"}
-	{html {cols 50 rows 13}}
+	{html {cols 50 rows 4}}
     }
     {return_url:text(hidden)
 	{value $return_url}
@@ -70,12 +113,17 @@
 	-uos_id $uos_id \
 	-package_id $package_id \
 	-user_id $user_id \
-	-uos_code $uos_code \
-	-uos_name $uos_name \
+	-uos_name_id $uos_name_id \
 	-credit_value $credit_value \
+	-department_id $department_id \
 	-unit_coordinator_id $unit_coordinator_id \
-	-activity_log [template::util::richtext::get_property contents $activity_log] \
-	-activity_log_format [template::util::richtext::get_property format $activity_log]
+	-session_ids $session_ids \
+	-prerequisite_ids $prerequisite_ids \
+	-assumed_knowledge_ids $assumed_knowledge_ids \
+	-corequisite_ids $corequisite_ids \
+	-prohibition_ids $prohibition_ids \
+	-no_longer_offered_ids $no_longer_offered_ids \
+	-activity_log $activity_log
 
 } -after_submit {
     ad_returnredirect $return_url
Index: openacs-4/packages/curriculum-central/www/coordinate/uos-all-pending-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/uos-all-pending-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/coordinate/uos-all-pending-postgresql.xql	18 Dec 2005 13:28:22 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/coordinate/uos-all-pending-postgresql.xql	2 Feb 2006 11:45:49 -0000	1.2
@@ -5,9 +5,10 @@
 
     <fullquery name="get_all_pending_uos">
       <querytext>
-        SELECT u.uos_code, u.uos_name, u.uos_id, u.unit_coordinator_id,
+        SELECT n.uos_code, n.uos_name, u.uos_id, u.unit_coordinator_id,
 	    s.short_name, s.pretty_name
         FROM cc_uos u,
+	    cc_uos_name n,
 	    workflow_cases c,
 	    workflow_case_fsm f,
 	    workflow_fsm_states s
@@ -16,6 +17,7 @@
 	AND c.workflow_id = :workflow_id
 	AND u.uos_id = c.object_id
 	AND s.short_name != 'closed'
+	AND n.name_id = u.uos_name_id
       </querytext>
     </fullquery>
 
Index: openacs-4/packages/curriculum-central/www/coordinate/uos-all-pending.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/uos-all-pending.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/coordinate/uos-all-pending.adp	18 Dec 2005 13:28:22 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/coordinate/uos-all-pending.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/curriculum-central/www/coordinate/uos-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/uos-edit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/coordinate/uos-edit.adp	15 Dec 2005 06:27:41 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/coordinate/uos-edit.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/curriculum-central/www/coordinate/uos-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/uos-edit.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/curriculum-central/www/coordinate/uos-edit.tcl	22 Jan 2006 08:43:15 -0000	1.16
+++ openacs-4/packages/curriculum-central/www/coordinate/uos-edit.tcl	2 Feb 2006 11:45:49 -0000	1.17
@@ -87,13 +87,71 @@
     -role_ids [workflow::role::get_id -workflow_id $workflow_id \
 		   -short_name unit_coordinator]
 
+set requisite_uos_options \
+    [curriculum_central::stream::all_uos_names_get_options]
+
 ad_form -extend -name uos -form {
     {credit_value:integer
 	{label "[_ curriculum-central.credit_value]"}
 	{value $uos(credit_value)}
         {html {size 3}}
 	{mode display}
     }
+    {department_id:integer(select)
+	{label "[_ curriculum-central.department]"}
+	{value $uos(department_id)}
+	{options [curriculum_central::departments_get_options] }
+	{help_text "[_ curriculum-central.help_select_a_dept]"}
+	{mode display}
+    }
+    {session_ids:text(multiselect),multiple
+	{label "[_ curriculum-central.sessions]"}
+	{values $uos(session_ids)}
+	{options "[curriculum_central::stream::sessions_get_options]"}
+	{html {size 5}}
+	{help_text "[_ curriculum-central.help_select_sessions_that_uos_is_offered]"}
+	{mode display}
+    }
+    {prerequisite_ids:text(multiselect),multiple
+	{label "[_ curriculum-central.prerequisites]"}
+	{values $uos(prerequisite_ids)}
+	{options $requisite_uos_options}
+	{html {size 5}}
+	{help_text "[_ curriculum-central.help_select_prerequisites_for_uos]"}
+	{mode display}
+    }
+    {assumed_knowledge_ids:text(multiselect),multiple
+	{label "[_ curriculum-central.assumed_knowledge]"}
+	{values $uos(assumed_knowledge_ids)}
+	{options $requisite_uos_options}
+	{html {size 5}}
+	{help_text "[_ curriculum-central.help_select_assumed_knowledge_for_uos]"}
+	{mode display}
+    }
+    {corequisite_ids:text(multiselect),multiple
+	{label "[_ curriculum-central.corequisites]"}
+	{values $uos(corequisite_ids)}
+	{options $requisite_uos_options}
+	{html {size 5}}
+	{help_text "[_ curriculum-central.help_select_corequisites_for_uos]"}
+	{mode display}
+    }
+    {prohibition_ids:text(multiselect),multiple
+	{label "[_ curriculum-central.prohibitions]"}
+	{values $uos(prohibition_ids)}
+	{options $requisite_uos_options}
+	{html {size 5}}
+	{help_text "[_ curriculum-central.help_select_prohibitions_for_uos]"}
+	{mode display}
+    }
+    {no_longer_offered_ids:text(multiselect),multiple
+	{label "[_ curriculum-central.no_longer_offered]"}
+	{values $uos(no_longer_offered_ids)}
+	{options $requisite_uos_options}
+	{html {size 5}}
+	{help_text "[_ curriculum-central.help_select_uos_no_longer_offered]"}
+	{mode display}
+    }
 }
 
 
@@ -116,32 +174,40 @@
 	{mode display}
         {help_text "[_ curriculum-central.help_lecturer_id]"}
     }
-    {objectives:text(textarea),optional
+    {objectives:richtext(richtext),optional
         {label "[_ curriculum-central.aims_and_objectives]"}
 	{html {cols 50 rows 4}}
 	{value $uos_details(objectives)}
 	{mode display}
+	{htmlarea_p 0}
+	{nospell}
         {help_text "[_ curriculum-central.help_objectives]"}
     }
-    {learning_outcomes:text(textarea),optional
+    {learning_outcomes:richtext(richtext),optional
         {label "[_ curriculum-central.learning_outcomes]"}
 	{html {cols 50 rows 4}}
 	{value $uos_details(learning_outcomes)}
 	{mode display}
+	{htmlarea_p 0}
+	{nospell}
         {help_text "[_ curriculum-central.help_learning_outcomes]"}
     }
-    {syllabus:text(textarea),optional
+    {syllabus:richtext(richtext),optional
         {label "[_ curriculum-central.syllabus]"}
 	{html {cols 50 rows 4}}
 	{value $uos_details(syllabus)}
 	{mode display}
+	{htmlarea_p 0}
+	{nospell}
         {help_text "[_ curriculum-central.help_syllabus]"}
     }
-    {relevance:text(textarea),optional
+    {relevance:richtext(richtext),optional
         {label "[_ curriculum-central.relevance]"}
 	{html {cols 50 rows 4}}
 	{value $uos_details(relevance)}
 	{mode display}
+	{htmlarea_p 0}
+	{nospell}
         {help_text "[_ curriculum-central.help_relevance]"}
     }
     {online_course_content:text,optional
@@ -226,46 +292,58 @@
     {workload_id:integer(hidden),optional
 	{value $uos_workload(workload_id)}
     }
-    {formal_contact_hrs:text(textarea),optional
+    {formal_contact_hrs:richtext(richtext),optional
         {label "[_ curriculum-central.formal_contact_hrs]"}
 	{html {cols 50 rows 4}}
 	{value $uos_workload(formal_contact_hrs)}
 	{mode display}
+	{htmlarea_p 0}
+	{nospell}
         {help_text "[_ curriculum-central.help_formal_contact_hrs]"}
     }
-    {informal_study_hrs:text(textarea),optional
+    {informal_study_hrs:richtext(richtext),optional
         {label "[_ curriculum-central.informal_study_hrs]"}
 	{html {cols 50 rows 4}}
 	{value $uos_workload(informal_study_hrs)}
 	{mode display}
+	{htmlarea_p 0}
+	{nospell}
         {help_text "[_ curriculum-central.help_informal_study_hrs]"}
     }
-    {student_commitment:text(textarea),optional
+    {student_commitment:richtext(richtext),optional
         {label "[_ curriculum-central.student_commitment]"}
 	{html {cols 50 rows 4}}
 	{value $uos_workload(student_commitment)}
 	{mode display}
+	{htmlarea_p 0}
+	{nospell}
         {help_text "[_ curriculum-central.help_student_commitment]"}
     }
-    {expected_feedback:text(textarea),optional
+    {expected_feedback:richtext(richtext),optional
         {label "[_ curriculum-central.expected_feedback]"}
 	{html {cols 50 rows 4}}
 	{value $uos_workload(expected_feedback)}
 	{mode display}
+	{htmlarea_p 0}
+	{nospell}
         {help_text "[_ curriculum-central.help_expected_feedback]"}
     }
-    {student_feedback:text(textarea),optional
+    {student_feedback:richtext(richtext),optional
         {label "[_ curriculum-central.student_feedback]"}
 	{html {cols 50 rows 4}}
 	{value $uos_workload(student_feedback)}
 	{mode display}
+	{htmlarea_p 0}
+	{nospell}
         {help_text "[_ curriculum-central.help_student_feedback]"}
     }
-    {assumed_concepts:text(textarea),optional
+    {assumed_concepts:richtext(richtext),optional
         {label "[_ curriculum-central.assumed_concepts]"}
 	{html {cols 50 rows 4}}
 	{value $uos_workload(assumed_concepts)}
 	{mode display}
+	{htmlarea_p 0}
+	{nospell}
         {help_text "[_ curriculum-central.help_assumed_concepts]"}
     }
 }
@@ -318,10 +396,12 @@
 
 # Add widgets for fields that the Unit Coordinator must enter data into.
 ad_form -extend -name uos -form {
-    {activity_log:richtext(richtext)
+    {activity_log:text(textarea)
 	{label "#curriculum-central.activity_log#"}
-	{html {cols 50 rows 13}}
+	{html {cols 50 rows 4}}
         {help_text "[_ curriculum-central.help_activity_log]"}
+	{mode display}
+	{nospell}
     }
     {return_url:text(hidden)
         {value $return_url}
@@ -393,7 +473,15 @@
     if { $enabled_action_id ne "" } {
         foreach field [workflow::action::get_element \
 			   -action_id $action_id -element edit_fields] {
-            set row($field) [element get_value uos $field]
+	    if { $field eq "session_ids" || $field eq "prerequisite_ids" ||
+		 $field eq "assumed_knowledge_ids" ||
+		 $field eq "corequisite_ids" ||
+		 $field eq "prohibition_ids" ||
+		 $field eq "no_longer_offered_ids"} {
+		set row($field) [element get_values uos $field]
+	    } else {
+		set row($field) [element get_value uos $field]
+	    }
         }
     }
 
@@ -499,10 +587,7 @@
     curriculum_central::uos::edit \
 	-uos_id $uos(uos_id) \
 	-enabled_action_id $enabled_action_id \
-	-activity_log \
-	    [template::util::richtext::get_property contents $activity_log] \
-	-activity_log_format \
-  	    [template::util::richtext::get_property format $activity_log] \
+	-activity_log $activity_log \
 	-array row \
 	-entry_id [element get_value uos entry_id]
 
Index: openacs-4/packages/curriculum-central/www/coordinate/uos-pending-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/uos-pending-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/coordinate/uos-pending-postgresql.xql	18 Dec 2005 13:28:22 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/coordinate/uos-pending-postgresql.xql	2 Feb 2006 11:45:49 -0000	1.2
@@ -5,8 +5,9 @@
 
     <fullquery name="get_users_pending_uos">
       <querytext>
-        SELECT u.uos_code, u.uos_name, u.uos_id, s.short_name, s.pretty_name
+        SELECT n.uos_code, n.uos_name, u.uos_id, s.short_name, s.pretty_name
         FROM cc_uos u,
+	    cc_uos_name n,
 	    workflow_cases c,
 	    workflow_case_fsm f,
 	    workflow_fsm_states s
@@ -16,6 +17,7 @@
 	AND u.uos_id = c.object_id
 	AND s.short_name != 'closed'
 	AND u.unit_coordinator_id = :user_id
+	AND n.name_id = u.uos_name_id
       </querytext>
     </fullquery>
 
Index: openacs-4/packages/curriculum-central/www/coordinate/uos-pending.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/uos-pending.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/coordinate/uos-pending.adp	18 Dec 2005 13:28:22 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/coordinate/uos-pending.adp	2 Feb 2006 11:45:49 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="../resources/main-portal">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/curriculum-central/www/resources/curriculum-central.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/resources/curriculum-central.css,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/curriculum-central/www/resources/curriculum-central.css	25 Jan 2006 12:45:17 -0000	1.7
+++ openacs-4/packages/curriculum-central/www/resources/curriculum-central.css	2 Feb 2006 11:45:50 -0000	1.8
@@ -139,7 +139,7 @@
 	list-style-type: none;
 }
 
-/* Semester */
+/* Session */
 #cc-stream-container ul ul li {
 	color: #9B9B9B;
 	font-size: 16px;
@@ -198,3 +198,50 @@
 	border: 0;
 	text-decoration: none;
 }
+
+
+/* Styles for stream maps. */
+
+#cc-stream-map-container {
+	border: 1px solid #000;
+}
+
+#cc-stream-map-container .spacer {
+	clear: both;
+}
+
+#cc-stream-map-container .float {
+	float: left;
+  	width: 120px;
+	height: 80px;
+  	padding: 10px;
+	margin: 1em;
+	border: 1px solid #000;
+}
+
+#cc-stream-map-container .float ul {
+	list-style-type: none;
+	margin: 0px;
+	padding: 0px;
+}
+
+#cc-stream-map-container .float ul li.uos-code {
+	color: red;
+	text-align: center;
+	font-weight: bold;
+	font-size: 12px;
+}
+
+#cc-stream-map-container .float ul li.uos-name {
+	margin-top: 5px;
+	color: green;
+	font-size: 12px;
+	text-align: center;
+}
+
+#cc-stream-map-container .float ul li.session {
+	margin-top: 10px;
+	color: blue;
+	font-size: 12px;
+	text-align: center;
+}