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.38 -r1.39
--- openacs-4/packages/curriculum-central/catalog/curriculum-central.en_US.ISO-8859-1.xml	9 Feb 2006 11:41:36 -0000	1.38
+++ openacs-4/packages/curriculum-central/catalog/curriculum-central.en_US.ISO-8859-1.xml	13 Feb 2006 01:30:06 -0000	1.39
@@ -2,6 +2,7 @@
 <message_catalog package_key="curriculum-central" package_version="0.1d" locale="en_US" charset="ISO-8859-1">
 
   <msg key="uos">UoS</msg>
+  <msg key="overview">Overview</msg>
   <msg key="edit_uos_name">Edit UoS Name</msg>
   <msg key="general_description">General Description</msg>
   <msg key="help_enter_ga_general_description">Enter a general description for this Graduate Attribute.</msg>
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.3 -r1.4
--- openacs-4/packages/curriculum-central/www/dept-streams.adp	2 Feb 2006 11:45:49 -0000	1.3
+++ openacs-4/packages/curriculum-central/www/dept-streams.adp	13 Feb 2006 01:30:07 -0000	1.4
@@ -5,7 +5,7 @@
 #curriculum-central.view_uos_for#
 <ul>
 <multiple name="streams">
-<li>@streams.stream_name@ [#curriculum-central.overview_lc# | <a href="@streams.stream_uos_url@">#curriculum-central.map_lc#</a>]</li>
+<li>@streams.stream_name@ [<a href="@streams.stream_view_url@">#curriculum-central.overview_lc#</a> | <a href="@streams.stream_map_url@">#curriculum-central.map_lc#</a>]</li>
 </multiple>
 </ul>
 
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.2 -r1.3
--- openacs-4/packages/curriculum-central/www/dept-streams.tcl	2 Feb 2006 11:45:49 -0000	1.2
+++ openacs-4/packages/curriculum-central/www/dept-streams.tcl	13 Feb 2006 01:30:07 -0000	1.3
@@ -26,9 +26,11 @@
 }
 
 # Get list of streams.
-db_multirow -extend {stream_uos_url} streams streams {} {
-    set stream_uos_url [export_vars -url -base stream-map \
-			     {stream_id stream_name}]
+db_multirow -extend {stream_map_url stream_view_url} streams streams {} {
+    set stream_map_url [export_vars -url -base stream-map {stream_id}]
+
+    set stream_view_url [export_vars -url -base stream-view \
+			     {stream_id}]
 }
 
 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.1 -r1.2
--- openacs-4/packages/curriculum-central/www/stream-map-postgresql.xql	2 Feb 2006 11:52:15 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/stream-map-postgresql.xql	13 Feb 2006 01:30:07 -0000	1.2
@@ -5,12 +5,13 @@
 
    <fullquery name="context">
      <querytext>
-       SELECT f.faculty_id, f.faculty_name, d.department_id, d.department_name
-           FROM cc_faculty f, cc_department d, cc_stream s
-	   WHERE f.faculty_id = d.faculty_id
-	       AND d.department_id = s.department_id
-	       AND s.stream_id = :stream_id
-	       AND s.package_id = :package_id
+       SELECT f.faculty_id, f.faculty_name, d.department_id, d.department_name,
+           s.stream_name
+       FROM cc_faculty f, cc_department d, cc_stream s
+       WHERE f.faculty_id = d.faculty_id
+           AND d.department_id = s.department_id
+	   AND s.stream_id = :stream_id
+	   AND s.package_id = :package_id
      </querytext>
    </fullquery>
 
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.3 -r1.4
--- openacs-4/packages/curriculum-central/www/stream-map.tcl	10 Feb 2006 03:44:39 -0000	1.3
+++ openacs-4/packages/curriculum-central/www/stream-map.tcl	13 Feb 2006 01:30:07 -0000	1.4
@@ -6,7 +6,6 @@
     @cvs-id $Id$
 } {
     stream_id:integer
-    stream_name
 }
 
 set package_id [ad_conn package_id]
Index: openacs-4/packages/curriculum-central/www/stream-view-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/stream-view-postgresql.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/curriculum-central/www/stream-view-postgresql.xql	13 Feb 2006 01:30:07 -0000	1.1
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+
+   <fullquery name="context">
+     <querytext>
+       SELECT f.faculty_id, f.faculty_name, d.department_id, d.department_name,
+           s.stream_name
+       FROM cc_faculty f, cc_department d, cc_stream s
+       WHERE f.faculty_id = d.faculty_id
+           AND d.department_id = s.department_id
+	   AND s.stream_id = :stream_id
+	   AND s.package_id = :package_id
+     </querytext>
+   </fullquery>
+
+   <fullquery name="units_of_study">
+     <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
+       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
+       AND map.stream_id = :stream_id
+       AND map.live_revision_id = rev.map_rev_id
+       AND rev.year_id = y.year_id
+       AND rev.year_id != 0
+       AND uos.live_revision_id = uosr.uos_revision_id
+       AND n.name_id = uos.uos_name_id
+     </querytext>
+   </fullquery>
+
+   <fullquery name="session_name">
+     <querytext>
+       SELECT cc_session__name(:session_id)
+     </querytext>
+   </fullquery>
+
+</queryset>
Index: openacs-4/packages/curriculum-central/www/stream-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/stream-view.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/curriculum-central/www/stream-view.adp	13 Feb 2006 01:30:07 -0000	1.1
@@ -0,0 +1,25 @@
+<master src="resources/main-portal">
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
+<property name="header_stuff">
+<link rel="stylesheet" type="text/css" href="/resources/curriculum-central/curriculum-central.css" media="all">
+</property>
+
+
+<div id="cc-stream-container">
+  <multiple name="stream">
+  <ul id="years">
+    <li>@stream.year_name@</li>
+    <ul id="sessions">
+      <group column="year_id">
+      <li>@stream.session_name@</li>
+      <ul id="uos">
+        <group column="year_session_group">
+        <li><span class="label">@stream.uos_code@ @stream.uos_name@ (@stream.core_or_not@)</span><span class="options"><a href="@stream.uos_details_url@" class="button">#curriculum-central.view_details#</a></span><div class="spacer"></div></li>
+        </group>
+      </ul>
+      </group>
+    </ul>
+  </ul>
+  </multiple>
+</div>
Index: openacs-4/packages/curriculum-central/www/stream-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/stream-view.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/curriculum-central/www/stream-view.tcl	13 Feb 2006 01:30:07 -0000	1.1
@@ -0,0 +1,65 @@
+ad_page_contract {
+    Displays the UoS map for the specified stream ID.
+
+    @author Nick Carroll (nick.c@rroll.net)
+    @creation-date 2005-11-15
+    @cvs-id $Id: stream-view.tcl,v 1.1 2006/02/13 01:30:07 ncarroll Exp $
+} {
+    stream_id:integer
+}
+
+set package_id [ad_conn package_id]
+set user_id [ad_conn user_id]
+
+# Retrieve info about the faculty, department and stream.
+db_1row context {}
+
+set page_title "$stream_name - [_ curriculum-central.overview]"
+set context [list \
+    [list [export_vars -url -base faculty-depts {faculty_name faculty_id}] \
+        $faculty_name] \
+    [list [export_vars -url -base dept-streams \
+	{department_name department_id}] $department_name] \
+    $page_title]
+
+# Retrieve a list of Units of Study.
+set units_of_study [db_list_of_lists units_of_study {}]
+
+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
+
+foreach uos $units_of_study {
+    set map_id [lindex $uos 0]
+    set uos_code [lindex $uos 1]
+    set uos_name [lindex $uos 2]
+    set uos_id [lindex $uos 3]
+    set year_id [lindex $uos 4]
+    set year_name [lindex $uos 5]
+    set core_id [lindex $uos 6]
+    set live_revision_id [lindex $uos 7]
+    set session_ids [lindex $uos 8]
+
+    foreach session_id $session_ids {
+	
+	# Get name of session_id
+	set session_name [db_string session_name {} -default ""]
+    
+	set year_session_group "${year_id}${session_id}"
+
+	set uos_details_url [export_vars -url -base uos-details {uos_id stream_id}]
+
+	set core_id [curriculum_central::stream::stream_uos_relation_name \
+			 -id $core_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
+    
+    }
+}
+
+# Sort stream info by increasing year and session.
+template::multirow sort stream -increasing year_id session_id
+
+ad_return_template
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.8 -r1.9
--- openacs-4/packages/curriculum-central/www/coordinate/stream-view.adp	2 Feb 2006 11:45:49 -0000	1.8
+++ openacs-4/packages/curriculum-central/www/coordinate/stream-view.adp	13 Feb 2006 01:30:07 -0000	1.9
@@ -32,7 +32,7 @@
       <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>
+        <li><span class="label">@stream.uos_code@ @stream.uos_name@ (@stream.core_or_not@)</span><span class="options"><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><div class="spacer"></div></li>
         </group>
       </ul>
       </group>
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.11 -r1.12
--- openacs-4/packages/curriculum-central/www/resources/curriculum-central.css	12 Feb 2006 12:42:48 -0000	1.11
+++ openacs-4/packages/curriculum-central/www/resources/curriculum-central.css	13 Feb 2006 01:30:07 -0000	1.12
@@ -173,10 +173,15 @@
 	margin-left: 3px;
 }
 
-#cc-stream-container ul ul ul li span {
+#cc-stream-container ul ul ul li span.label {
 	margin-left: 3em;
+	float:left;
 }
 
+#cc-stream-container ul ul ul li span.options {
+	float: right;
+}
+
 /* UoS no longer offered. Used in stream-view. */
 #cc-stream-container h2 {
 	color: #686868;
@@ -297,3 +302,7 @@
 #cc-list-container table tr td.value {
 	background-color: #F0F0F0;
 }
+
+.spacer {
+	clear: both;
+}