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.41 -r1.42
--- openacs-4/packages/curriculum-central/catalog/curriculum-central.en_US.ISO-8859-1.xml	16 Feb 2006 10:44:17 -0000	1.41
+++ openacs-4/packages/curriculum-central/catalog/curriculum-central.en_US.ISO-8859-1.xml	17 Feb 2006 12:50:04 -0000	1.42
@@ -2,6 +2,8 @@
 <message_catalog package_key="curriculum-central" package_version="0.1d" locale="en_US" charset="ISO-8859-1">
 
   <msg key="uos">UoS</msg>
+  <msg key="selected_uos">Selected UoS</msg>
+  <msg key="requisites">Requisites</msg>
   <msg key="edit_stream_uos_rel">Edit Stream to UoS Relation</msg>
   <msg key="add_stream_uos_rel">Add Stream to UoS Relation</msg>
   <msg key="help_enter_stream_rel_name">Enter a name for a degree stream to UoS relation.  Examples include: core; recommended; elective.</msg>
@@ -67,7 +69,9 @@
   <msg key="help_select_uos_no_longer_offered">Select (prohibited) UoS that are no longer offered for the mapped UoS.  Note: You can select multiple entries by holding down the CTRL key whilst selecting.</msg>
   <msg key="assumed_knowledge">Assumed Knowledge</msg>
   <msg key="corequisites">Co-Requisites</msg>
+  <msg key="corequisite">Co-Requisite</msg>
   <msg key="prohibitions">Prohibitions</msg>
+  <msg key="prohibition">Prohibition</msg>
   <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>
@@ -281,6 +285,7 @@
   <msg key="assessments">Assessments</msg>
   <msg key="core_uos_for">Core UoS for</msg>
   <msg key="recommended_uos_for">Recommended UoS for</msg>
+  <msg key="prerequisite">Prerequisite</msg>
   <msg key="prerequisites">Prerequisites</msg>
   <msg key="aims_and_objectives">Aims and Objectives</msg>
   <msg key="learning_outcomes">Learning Outcomes</msg>
Index: openacs-4/packages/curriculum-central/www/all-uos-map-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/all-uos-map-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/all-uos-map-postgresql.xql	16 Feb 2006 05:42:32 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/all-uos-map-postgresql.xql	17 Feb 2006 12:50:05 -0000	1.2
@@ -17,7 +17,7 @@
      <querytext>
        SELECT map.map_id, n.uos_code, n.uos_name, uos.uos_id,
            rev.year_id, y.name, rev.core_id,
-	   map.live_revision_id, uosr.session_ids
+	   map.live_revision_id, uosr.session_ids, uosr.uos_name_id
        FROM cc_uos uos, cc_uos_revisions uosr, cc_stream_uos_map map,
            cc_stream_uos_map_rev rev, cc_year y, cc_uos_name n,
 	   cc_department d
@@ -39,4 +39,14 @@
      </querytext>
    </fullquery>
 
+   <fullquery name="requisites">
+     <querytext>
+       SELECT rev.prerequisite_ids, rev.assumed_knowledge_ids,
+           rev.corequisite_ids, rev.prohibition_ids, rev.no_longer_offered_ids
+       FROM cc_uos u, cc_uos_revisions rev
+       WHERE u.uos_id = :requisites_id
+       AND u.live_revision_id = rev.uos_revision_id
+     </querytext>
+   </fullquery>
+
 </queryset>
Index: openacs-4/packages/curriculum-central/www/all-uos-map.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/all-uos-map.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/all-uos-map.adp	16 Feb 2006 05:42:32 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/all-uos-map.adp	17 Feb 2006 12:50:05 -0000	1.2
@@ -9,6 +9,20 @@
 
   <div class="spacer">&nbsp;</div>
 
+  <if @selected_uos_id@ ne "">
+  <div id="requisites-key">
+    <ul>
+      <li class="selected">#curriculum-central.selected_uos#</li>
+      <li class="prerequisite">#curriculum-central.prerequisite#</li>
+      <li class="assumed-knowledge">#curriculum-central.assumed_knowledge#</li>
+      <li class="corequisite">#curriculum-central.corequisite#</li>
+      <li class="prohibition">#curriculum-central.prohibition#</li>
+      <li class="no-longer-offered">#curriculum-central.no_longer_offered#</li>
+    </ul>
+    <h3>Requisites Key</h3>
+  </div>
+  </if>
+
   <multiple name="stream">
   <ul class="years">
     <li>@stream.year_name@</li>
@@ -18,12 +32,15 @@
       
       <ul id="uos">
         <group column="year_session_group">
-        <div class="float">
-          <ul>
+        <div class="@stream.float_class@">
+          <ul class="info">
             <li class="uos-code">@stream.uos_code@</li>  
             <li class="uos-name">@stream.uos_name@</li>
-            <li class="info"><a href="@stream.uos_details_url@" class="button">#curriculum-central.view_details#</a></li>
           </ul>
+	  <ul class="options">
+            <li class="info"><a href="@stream.uos_details_url@" class="button">#curriculum-central.view_details#</a></li>
+	    <li class="info"><a href="@stream.uos_requisites_url@" class="button">#curriculum-central.requisites#</a></li>
+	  </ul>
         </div>
         </group>
 
Index: openacs-4/packages/curriculum-central/www/all-uos-map.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/all-uos-map.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/all-uos-map.tcl	16 Feb 2006 05:42:32 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/all-uos-map.tcl	17 Feb 2006 12:50:05 -0000	1.2
@@ -6,6 +6,7 @@
     @cvs-id $Id$
 } {
     department_id:integer
+    requisites_id:integer,optional
 }
 
 set package_id [ad_conn package_id]
@@ -25,9 +26,17 @@
 # Retrieve a list of Units of Study.
 set units_of_study [db_list_of_lists units_of_study {}]
 
+set selected_uos_id ""
+if { [info exists requisites_id] } {
+    set selected_uos_id $requisites_id
+
+    # Query for UoS requisites for the selected UoS.
+    db_1row requisites {}
+}
+
 template::multirow create stream map_id year_id year_name \
     session_id session_name core_or_not uos_id uos_code uos_name \
-    year_session_group uos_details_url
+    year_session_group uos_details_url uos_requisites_url float_class
 
 foreach uos $units_of_study {
     set map_id [lindex $uos 0]
@@ -39,6 +48,7 @@
     set core_id [lindex $uos 6]
     set live_revision_id [lindex $uos 7]
     set session_ids [lindex $uos 8]
+    set uos_name_id [lindex $uos 9]
 
     foreach session_id $session_ids {
 	
@@ -50,14 +60,37 @@
 	set base_return_url "all-uos-map"
 	set uos_details_url [export_vars -url -base uos-details {uos_id stream_id base_return_url department_id}]
 
+	# Determine style of requisites for the selected UoS, if one was
+	# selected.
+	set float_class "float"
+	if { $selected_uos_id ne "" } {
+	    if { $selected_uos_id == $uos_id} {
+		set float_class "float selected"
+	    } elseif { [lsearch -exact $prerequisite_ids $uos_name_id] != -1 } {
+		set float_class "float prerequisite"
+	    } elseif { [lsearch -exact $assumed_knowledge_ids $uos_name_id] != -1 } {
+		set float_class "float assumed-knowledge"
+	    } elseif { [lsearch -exact $corequisite_ids $uos_name_id] != -1 } {
+		set float_class "float corequisite"
+	    } elseif { [lsearch -exact $prohibition_ids $uos_name_id] != -1 } {
+		set float_class "float prohibition"
+	    } elseif { [lsearch -exact $no_longer_offered_ids $uos_name_id] != -1 } {
+		set float_class "float no-longer-offered"
+	    }
+	}
+
+	set requisites_id $uos_id
+	set uos_requisites_url [export_vars -url -base all-uos-map {requisites_id department_id}]
+
 	template::multirow append stream $map_id $year_id $year_name \
 	    $session_id $session_name $core_id $uos_id $uos_code $uos_name \
-	    $year_session_group $uos_details_url
+	    $year_session_group $uos_details_url $uos_requisites_url \
+	    $float_class
     
     }
 }
 
 # Sort stream info by increasing year and session.
-template::multirow sort stream -increasing year_id session_id
+template::multirow sort stream -increasing year_id session_id uos_code
 
 ad_return_template
Index: openacs-4/packages/curriculum-central/www/stream-map-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/stream-map-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/curriculum-central/www/stream-map-postgresql.xql	13 Feb 2006 01:30:07 -0000	1.2
+++ openacs-4/packages/curriculum-central/www/stream-map-postgresql.xql	17 Feb 2006 12:50:05 -0000	1.3
@@ -19,7 +19,7 @@
      <querytext>
        SELECT map.map_id, n.uos_code, n.uos_name, uos.uos_id,
            rev.year_id, y.name, rev.core_id,
-	   map.live_revision_id, uosr.session_ids
+	   map.live_revision_id, uosr.session_ids, uos.uos_name_id
        FROM cc_uos uos, cc_uos_revisions uosr, cc_stream_uos_map map,
            cc_stream_uos_map_rev rev, cc_year y, cc_uos_name n
        WHERE uos.uos_id = map.uos_id
@@ -38,4 +38,14 @@
      </querytext>
    </fullquery>
 
+   <fullquery name="requisites">
+     <querytext>
+       SELECT rev.prerequisite_ids, rev.assumed_knowledge_ids,
+           rev.corequisite_ids, rev.prohibition_ids, rev.no_longer_offered_ids
+       FROM cc_uos u, cc_uos_revisions rev
+       WHERE u.uos_id = :requisites_id
+       AND u.live_revision_id = rev.uos_revision_id
+     </querytext>
+   </fullquery>
+
 </queryset>
Index: openacs-4/packages/curriculum-central/www/stream-map.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/stream-map.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/curriculum-central/www/stream-map.adp	10 Feb 2006 03:44:39 -0000	1.3
+++ openacs-4/packages/curriculum-central/www/stream-map.adp	17 Feb 2006 12:50:05 -0000	1.4
@@ -9,6 +9,20 @@
 
   <div class="spacer">&nbsp;</div>
 
+  <if @selected_uos_id@ ne "">
+  <div id="requisites-key">
+    <ul>
+      <li class="selected">#curriculum-central.selected_uos#</li>
+      <li class="prerequisite">#curriculum-central.prerequisite#</li>
+      <li class="assumed-knowledge">#curriculum-central.assumed_knowledge#</li>
+      <li class="corequisite">#curriculum-central.corequisite#</li>
+      <li class="prohibition">#curriculum-central.prohibition#</li>
+      <li class="no-longer-offered">#curriculum-central.no_longer_offered#</li>
+    </ul>
+    <h3>Requisites Key</h3>
+  </div>
+  </if>
+
   <multiple name="stream">
   <ul class="years">
     <li>@stream.year_name@</li>
@@ -18,11 +32,14 @@
       
       <ul id="uos">
         <group column="year_session_group">
-        <div class="float">
-          <ul>
+        <div class="@stream.float_class@">
+          <ul class="info">
             <li class="uos-code">@stream.uos_code@</li>  
             <li class="uos-name">@stream.uos_name@</li>
+          </ul>
+	  <ul class="options">
             <li class="info"><a href="@stream.uos_details_url@" class="button">#curriculum-central.view_details#</a></li>
+            <li class="info"><a href="@stream.uos_requisites_url@" class="button">#curriculum-central.requisites#</a></li>
           </ul>
         </div>
         </group>
Index: openacs-4/packages/curriculum-central/www/stream-map.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/stream-map.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/curriculum-central/www/stream-map.tcl	16 Feb 2006 05:42:32 -0000	1.6
+++ openacs-4/packages/curriculum-central/www/stream-map.tcl	17 Feb 2006 12:50:05 -0000	1.7
@@ -6,6 +6,7 @@
     @cvs-id $Id$
 } {
     stream_id:integer
+    requisites_id:integer,optional
 }
 
 set package_id [ad_conn package_id]
@@ -25,9 +26,17 @@
 # Retrieve a list of Units of Study.
 set units_of_study [db_list_of_lists units_of_study {}]
 
+set selected_uos_id ""
+if { [info exists requisites_id] } {
+    set selected_uos_id $requisites_id
+
+    # Query for UoS requisites for the selected UoS.
+    db_1row requisites {}
+}
+
 template::multirow create stream map_id year_id year_name \
     session_id session_name core_or_not uos_id uos_code uos_name \
-    year_session_group uos_details_url
+    year_session_group uos_details_url uos_requisites_url float_class
 
 foreach uos $units_of_study {
     set map_id [lindex $uos 0]
@@ -39,9 +48,10 @@
     set core_id [lindex $uos 6]
     set live_revision_id [lindex $uos 7]
     set session_ids [lindex $uos 8]
+    set uos_name_id [lindex $uos 9]
 
     foreach session_id $session_ids {
-	
+
 	# Get name of session_id
 	set session_name [db_string session_name {} -default ""]
     
@@ -50,14 +60,37 @@
 	set base_return_url "stream-map"
 	set uos_details_url [export_vars -url -base uos-details {uos_id stream_id base_return_url department_id}]
 
+	# Determine style of requisites for the selected UoS, if one was
+	# selected.
+	set float_class "float"
+	if { $selected_uos_id ne "" } {
+	    if { $selected_uos_id == $uos_id} {
+		set float_class "float selected"
+	    } elseif { [lsearch -exact $prerequisite_ids $uos_name_id] != -1 } {
+		set float_class "float prerequisite"
+	    } elseif { [lsearch -exact $assumed_knowledge_ids $uos_name_id] != -1 } {
+		set float_class "float assumed-knowledge"
+	    } elseif { [lsearch -exact $corequisite_ids $uos_name_id] != -1 } {
+		set float_class "float corequisite"
+	    } elseif { [lsearch -exact $prohibition_ids $uos_name_id] != -1 } {
+		set float_class "float prohibition"
+	    } elseif { [lsearch -exact $no_longer_offered_ids $uos_name_id] != -1 } {
+		set float_class "float no-longer-offered"
+	    }
+	}
+
+	set requisites_id $uos_id
+	set uos_requisites_url [export_vars -url -base stream-map {requisites_id department_id stream_id}]
+
 	template::multirow append stream $map_id $year_id $year_name \
 	    $session_id $session_name $core_id $uos_id $uos_code $uos_name \
-	    $year_session_group $uos_details_url
+	    $year_session_group $uos_details_url $uos_requisites_url \
+	    $float_class
     
     }
 }
 
 # Sort stream info by increasing year and session.
-template::multirow sort stream -increasing year_id session_id
+template::multirow sort stream -increasing year_id session_id uos_code
 
 ad_return_template
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.12 -r1.13
--- openacs-4/packages/curriculum-central/www/resources/curriculum-central.css	13 Feb 2006 01:30:07 -0000	1.12
+++ openacs-4/packages/curriculum-central/www/resources/curriculum-central.css	17 Feb 2006 12:50:05 -0000	1.13
@@ -215,6 +215,24 @@
 	clear: both;
 }
 
+#cc-stream-map-container #requisites-key {
+	border: 1px solid #000;
+	width: 80%;
+	margin-left: 10%;
+	margin-rignt: 10%;
+	margin-bottom: 5em;
+	text-align: center;
+}
+
+#cc-stream-map-container #requisites-key ul li {
+	display:inline;
+	list-style-type: none;
+	border: 1px solid #000;
+	padding: 3px;
+	font-size: 12px;
+	font-weight: bold;
+}
+
 #cc-stream-map-container ul {
 	list-style-type: none;
 	margin-left: 1em;
@@ -224,23 +242,52 @@
 #cc-stream-map-container .float {
 	float: left;
   	width: 120px;
-	height: 100px;
+	height: 120px;
   	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 .selected {
+	background-color: #CCC;
 }
 
+#cc-stream-map-container .prerequisite {
+	background-color: red;
+}
+
+#cc-stream-map-container .assumed-knowledge {
+	background-color: green;
+}
+
+#cc-stream-map-container .corequisite {
+	background-color: yellow;
+}
+
+#cc-stream-map-container .prohibition {
+	background-color: blue;
+}
+
+#cc-stream-map-container .no-longer-offered {
+	background-color: violet;
+}
+
 #cc-stream-map-container .float ul {
 	list-style-type: none;
 	margin: 0px;
 	padding: 0px;
 }
+
+#cc-stream-map-container .float ul.info {
+	height: 80px;
+	background-color:white;
+	border: 1px solid #000;
+}
+
+#cc-stream-map-container .float ul.options {
+	height: 40px;
+}
+
 #cc-stream-map-container .float ul li.uos-code {
 	color: #E88000;
 	text-align: center;
@@ -258,11 +305,10 @@
 }
 
 #cc-stream-map-container .float ul li.info {
-	margin-top: 10px;
 	color: blue;
 	font-size: 12px;
 	text-align: center;
-	padding: 0px;
+	padding: 2px;
 }
 
 #cc-stream-map-container ul.years li {