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.33 -r1.34
--- openacs-4/packages/curriculum-central/catalog/curriculum-central.en_US.ISO-8859-1.xml	24 Jan 2006 06:31:14 -0000	1.33
+++ openacs-4/packages/curriculum-central/catalog/curriculum-central.en_US.ISO-8859-1.xml	25 Jan 2006 03:20:27 -0000	1.34
@@ -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="uos_not_offered_in_any_years">Units of Study Not Offered in any Years</msg>
   <msg key="status_modified">Status: Modified</msg>
   <msg key="status_published">Status: Published</msg>
   <msg key="publish">Publish</msg>
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.2 -r1.3
--- openacs-4/packages/curriculum-central/www/coordinate/stream-view-postgresql.xql	24 Jan 2006 06:31:14 -0000	1.2
+++ openacs-4/packages/curriculum-central/www/coordinate/stream-view-postgresql.xql	25 Jan 2006 03:20:28 -0000	1.3
@@ -14,6 +14,7 @@
        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
      </querytext>
    </fullquery>
 
@@ -29,4 +30,16 @@
      </querytext>
    </fullquery>
 
+   <fullquery name="not_offered">
+     <querytext>
+       SELECT map.map_id, uos.uos_code, uos.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
+       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
+     </querytext>
+   </fullquery>
+
 </queryset>
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.4 -r1.5
--- openacs-4/packages/curriculum-central/www/coordinate/stream-view.adp	25 Jan 2006 01:36:03 -0000	1.4
+++ openacs-4/packages/curriculum-central/www/coordinate/stream-view.adp	25 Jan 2006 03:20:28 -0000	1.5
@@ -37,4 +37,15 @@
     </ul>
   </ul>
   </multiple>
-</div>
\ No newline at end of file
+
+  <if @not_offered:rowcount@ ne 0>
+  <h2>#curriculum-central.uos_not_offered_in_any_years#</h2>
+  <div class="cc-stream-view-not-offered">
+  <ul>
+    <multiple name="not_offered">
+    <li>@not_offered.uos_code@ @not_offered.uos_name@ (<a href="@not_offered.edit_url@">#curriculum-central.edit#</a>)</li>
+    </multiple>
+  </ul>
+  </div>
+  </if>
+</div>
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.3 -r1.4
--- openacs-4/packages/curriculum-central/www/coordinate/stream-view.tcl	24 Jan 2006 06:31:14 -0000	1.3
+++ openacs-4/packages/curriculum-central/www/coordinate/stream-view.tcl	25 Jan 2006 03:20:28 -0000	1.4
@@ -81,4 +81,11 @@
 # Sort stream info by increasing year and semester.
 template::multirow sort stream -increasing year_id semester_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.
+db_multirow -extend {edit_url} not_offered not_offered {} {
+    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}]
+}
+
 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.4 -r1.5
--- openacs-4/packages/curriculum-central/www/resources/curriculum-central.css	25 Jan 2006 01:36:03 -0000	1.4
+++ openacs-4/packages/curriculum-central/www/resources/curriculum-central.css	25 Jan 2006 03:20:28 -0000	1.5
@@ -78,6 +78,36 @@
 	font-weight: normal;
 }
 
+/* Stream view status box */
+
+#cc-stream-view-status-container {
+	text-align: center;
+	margin: 0px auto;
+	width: 180px;
+	margin-top: 2em;
+}
+
+#cc-stream-view-status-container .published {
+	color: #128812;
+	padding: 5px;
+	padding: 5px;
+	border: 1px solid #000;
+	font-weight: bold;
+}
+
+#cc-stream-view-status-container .modified ul {
+	color: #B91309;
+	list-style-type: none;
+	padding: 5px;
+	border: 1px solid #000;
+	font-weight: bold;
+}
+
+#cc-stream-view-status-container .modified ul li {
+	padding-top: 3px;
+	padding-bottom: 3px;
+}
+
 /* Stream Container */
 #cc-stream-container {
 	margin-left: 30px;
@@ -141,32 +171,25 @@
 	margin-right: 4em;
 }
 
-/* Stream view status box */
 
-#cc-stream-view-status-container {
-	text-align: center;
-	margin: 0px auto;
-	width: 180px;
-	margin-top: 2em;
+/* UoS no longer offered. Used in stream-view. */
+#cc-stream-container h2 {
+	color: #686868;
+	padding-top: 3em;
 }
 
-#cc-stream-view-status-container .published {
-	color: #128812;
-	padding: 5px;
-	padding: 5px;
-	border: 1px solid #000;
-	font-weight: bold;
+#cc-stream-container .cc-stream-view-not-offered ul li {
+	color: #000;
+	font-size: 12px;
+	padding: 3px;
+	width: 50em;
+	margin-bottom: 5px;
+	margin-left: 4em;
+	list-style-type: disc;
 }
 
-#cc-stream-view-status-container .modified ul {
-	color: #B91309;
-	list-style-type: none;
-	padding: 5px;
-	border: 1px solid #000;
-	font-weight: bold;
+#cc-stream-container .cc-stream-view-not-offered ul li a {
+	vertical-align: bottom;
+	border: 0;
+	text-decoration: none;
 }
-
-#cc-stream-view-status-container .modified ul li {
-	padding-top: 3px;
-	padding-bottom: 3px;
-}