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.1 -r1.2
--- openacs-4/packages/curriculum-central/www/coordinate/stream-view.adp	23 Jan 2006 10:38:47 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/coordinate/stream-view.adp	23 Jan 2006 12:36:17 -0000	1.2
@@ -1,13 +1,26 @@
 <master>
 <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>
 
-<multiple name="stream">
-@stream.year_name@<br />
-<group column="year_id">
-@stream.semester_name@<br />
-<group column="semester_id">
-@stream.uos_code@ @stream.uos_name@ <a href="stream-map-ae?stream_id=@stream_id@&uos_id=@stream.uos_id@&map_id=@stream.map_id@"><img src="/shared/images/Edit16.gif" height="16" width="16" border="0"></a><p />
-</group>
-</group>
-</multiple>
\ No newline at end of file
+
+
+<div id="cc-stream-container">
+  <multiple name="stream">
+  <ul id="years">
+    <li>@stream.year_name@</li>
+    <ul id="semesters">
+      <group column="year_id">
+      <li>@stream.semester_name@</li>
+      <ul id="uos">
+        <group column="group">
+        <li><a href="@stream.edit_url@"><img src="/shared/images/Edit16.gif" height="16" width="16" border="0"></a>@stream.uos_code@ @stream.uos_name@</li>
+        </group>
+      </ul>
+      </group>
+    </ul>
+  </ul>
+  </multiple>
+</div>
\ No newline at end of file
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.1 -r1.2
--- openacs-4/packages/curriculum-central/www/coordinate/stream-view.tcl	23 Jan 2006 10:38:47 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/coordinate/stream-view.tcl	23 Jan 2006 12:36:17 -0000	1.2
@@ -29,7 +29,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 uos_id uos_code uos_name
+    semester_id semester_name uos_id uos_code uos_name group edit_url
 
 foreach uos $units_of_study {
     set map_id [lindex $uos 0]
@@ -44,8 +44,19 @@
 	# Get name for semester_id
 	set semester_name [db_string semester_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
+	# 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 return_url [export_vars -base stream-view {stream_id}]
+	set edit_url [export_vars -base stream-map-ae \
+			  {stream_id uos_id map_id return_url}]
+
 	template::multirow append stream $map_id $year_id $year_name \
-	    $semester_id $semester_name $uos_id $uos_code $uos_name
+	    $semester_id $semester_name $uos_id $uos_code $uos_name \
+	    $group $edit_url
     }
 }
 
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.2 -r1.3
--- openacs-4/packages/curriculum-central/www/resources/curriculum-central.css	9 Jan 2006 05:52:06 -0000	1.2
+++ openacs-4/packages/curriculum-central/www/resources/curriculum-central.css	23 Jan 2006 12:36:18 -0000	1.3
@@ -77,3 +77,66 @@
 	border-bottom: 1px solid #fff;
 	font-weight: normal;
 }
+
+/* Stream Container */
+#cc-stream-container {
+	margin-left: 30px;
+}
+
+#cc-stream-container ul {
+	margin: 0;
+	padding: 0;
+	list-style-type: none;
+	font-family: verdana, arial, sans-serif;
+}
+
+#cc-stream-container li {
+	margin: 0;
+}
+
+/* Year */
+#cc-stream-container ul li {
+	color: #686868;
+	font-size: 18px;
+	font-weight: bold;
+	padding-top: 20px;
+}
+
+#cc-stream-container ul ul {
+	margin-left: 30px;
+	padding: 0;
+	list-style-type: none;
+}
+
+/* Semester */
+#cc-stream-container ul ul li {
+	color: #9B9B9B;
+	font-size: 16px;
+	padding-top: 10px;
+	padding-bottom: 6px;
+}
+
+#cc-stream-container ul ul ul {
+	margin-left: 30px;
+	padding: 0;
+	list-style-type: none;
+}
+
+/* UoS */
+#cc-stream-container ul ul ul li {
+	color: #000;
+	font-size: 12px;
+	display: block;
+	border-left: 1em solid #686868;
+	border-bottom: 1px solid #686868;
+	padding: 4px 8px;
+	width: 50em;
+	margin-bottom: 5px;
+}
+
+#cc-stream-container ul ul ul li a {
+	vertical-align: bottom;
+	border: 0;
+	text-decoration: none;
+	margin-right: 4em;
+}
\ No newline at end of file