Index: openacs-4/packages/curriculum-central/www/all-uos-ga-map.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/all-uos-ga-map.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/curriculum-central/www/all-uos-ga-map.adp	18 May 2006 02:52:54 -0000	1.3
+++ openacs-4/packages/curriculum-central/www/all-uos-ga-map.adp	16 Jun 2006 03:24:29 -0000	1.4
@@ -20,18 +20,6 @@
 
   <div class="spacer">&nbsp;</div>
 
-  <div id="key">
-    #curriculum-central.ga_key_description#
-    <ul>
-      <li class="ga-very-low">#curriculum-central.very_low#</li>
-      <li class="ga-low">#curriculum-central.low#</li>
-      <li class="ga-moderate">#curriculum-central.moderate#</li>
-      <li class="ga-high">#curriculum-central.high#</li>
-      <li class="ga-very-high">#curriculum-central.very_high#</li>
-    </ul>
-    <h3>#curriculum-central.key#</h3>
-  </div>
-
   <center>
   <form name="ga_nav">
     #curriculum-central.select_a_graduate_attribute#
@@ -78,4 +66,16 @@
 
   <div class="spacer">&nbsp;</div>
 
+  <div id="key">
+    #curriculum-central.ga_key_description#
+    <ul>
+      <li class="ga-very-low">#curriculum-central.very_low#</li>
+      <li class="ga-low">#curriculum-central.low#</li>
+      <li class="ga-moderate">#curriculum-central.moderate#</li>
+      <li class="ga-high">#curriculum-central.high#</li>
+      <li class="ga-very-high">#curriculum-central.very_high#</li>
+    </ul>
+    <h3>#curriculum-central.key#</h3>
+  </div>
+
 </div>
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.3 -r1.4
--- openacs-4/packages/curriculum-central/www/all-uos-map.adp	20 Feb 2006 09:21:33 -0000	1.3
+++ openacs-4/packages/curriculum-central/www/all-uos-map.adp	16 Jun 2006 03:24:29 -0000	1.4
@@ -10,23 +10,6 @@
 
   <div class="spacer">&nbsp;</div>
 
-  <if @selected_uos_id@ ne "">
-  <div id="key">
-    #curriculum-central.requisite_key_description#
-    <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>
-    </ul>
-    <ul>
-      <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>#curriculum-central.key#</h3>
-  </div>
-  </if>
-
   <multiple name="stream">
   <ul class="years">
     <li>@stream.year_name@</li>
@@ -58,4 +41,21 @@
 
   <div class="spacer">&nbsp;</div>
 
+  <if @selected_uos_id@ ne "">
+  <div id="key">
+    #curriculum-central.requisite_key_description#
+    <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>
+    </ul>
+    <ul>
+      <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>#curriculum-central.key#</h3>
+  </div>
+  </if>
+
 </div>
Index: openacs-4/packages/curriculum-central/www/stream-ga-map.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/stream-ga-map.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/curriculum-central/www/stream-ga-map.adp	21 May 2006 03:10:38 -0000	1.2
+++ openacs-4/packages/curriculum-central/www/stream-ga-map.adp	16 Jun 2006 03:24:29 -0000	1.3
@@ -18,20 +18,6 @@
 
 <div id="cc-stream-map-container">
 
-  <div class="spacer">&nbsp;</div>
-
-  <div id="key">
-    #curriculum-central.ga_key_description#
-    <ul>
-      <li class="ga-very-low">#curriculum-central.very_low#</li>
-      <li class="ga-low">#curriculum-central.low#</li>
-      <li class="ga-moderate">#curriculum-central.moderate#</li>
-      <li class="ga-high">#curriculum-central.high#</li>
-      <li class="ga-very-high">#curriculum-central.very_high#</li>
-    </ul>
-    <h3>#curriculum-central.key#</h3>
-  </div>
-
   <center>
   <form name="ga_nav">
     #curriculum-central.select_a_graduate_attribute#
@@ -78,4 +64,18 @@
 
   <div class="spacer">&nbsp;</div>
 
+  <div class="spacer">&nbsp;</div>
+
+  <div id="key">
+    #curriculum-central.ga_key_description#
+    <ul>
+      <li class="ga-very-low">#curriculum-central.very_low#</li>
+      <li class="ga-low">#curriculum-central.low#</li>
+      <li class="ga-moderate">#curriculum-central.moderate#</li>
+      <li class="ga-high">#curriculum-central.high#</li>
+      <li class="ga-very-high">#curriculum-central.very_high#</li>
+    </ul>
+    <h3>#curriculum-central.key#</h3>
+  </div>
+
 </div>
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.8 -r1.9
--- openacs-4/packages/curriculum-central/www/stream-map.adp	2 Apr 2006 03:56:46 -0000	1.8
+++ openacs-4/packages/curriculum-central/www/stream-map.adp	16 Jun 2006 03:24:29 -0000	1.9
@@ -12,23 +12,6 @@
 
   <div class="spacer">&nbsp;</div>
 
-  <if @selected_uos_id@ ne "">
-  <div id="key">
-    #curriculum-central.requisite_key_description#
-    <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>
-    </ul>
-    <ul>
-      <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>#curriculum-central.key#</h3>
-  </div>
-  </if>
-
   <multiple name="stream">
   <ul class="years">
     <li>@stream.year_name@</li>
@@ -60,4 +43,21 @@
 
   <div class="spacer">&nbsp;</div>
 
+  <if @selected_uos_id@ ne "">
+  <div id="key">
+    #curriculum-central.requisite_key_description#
+    <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>
+    </ul>
+    <ul>
+      <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>#curriculum-central.key#</h3>
+  </div>
+  </if>
+
 </div>
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.14 -r1.15
--- openacs-4/packages/curriculum-central/www/resources/curriculum-central.css	20 Feb 2006 09:21:33 -0000	1.14
+++ openacs-4/packages/curriculum-central/www/resources/curriculum-central.css	16 Jun 2006 03:24:29 -0000	1.15
@@ -252,55 +252,56 @@
 
 #cc-stream-map-container .float {
 	float: left;
-  	width: 120px;
-	height: 113px;
-  	padding: 10px;
-	margin: 1em;
+  	width: 100px;
+	height: 95px;
+  	padding: 0 0 0.2em 0;
+	margin: 0.5em 0.5em 0 0;
 	border: 1px solid #000;
+	background-color:white;
 }
 
 #cc-stream-map-container .selected {
 	background-color: #CCC;
 }
 
 #cc-stream-map-container .prerequisite {
-	background-color: red;
+	background-color: #FF6666;
 }
 
 #cc-stream-map-container .assumed-knowledge {
-	background-color: green;
+	background-color: #CCFF66;
 }
 
 #cc-stream-map-container .corequisite {
-	background-color: yellow;
+	background-color: #FFFF66;
 }
 
 #cc-stream-map-container .prohibition {
-	background-color: blue;
+	background-color: #6666FF;
 }
 
 #cc-stream-map-container .no-longer-offered {
-	background-color: violet;
+	background-color: #FF99FF;
 }
 
 #cc-stream-map-container .ga-very-high {
-	background-color: #FF0000;
+	background-color: #99CCFF;
 }
 
 #cc-stream-map-container .ga-high {
-	background-color: #FF9900;
+	background-color: #6699CC;
 }
 
 #cc-stream-map-container .ga-moderate {
-	background-color: #FFFF66;
+	background-color: #669999;
 }
 
 #cc-stream-map-container .ga-low {
-	background-color: #00CC33;
+	background-color: #99CC99;
 }
 
 #cc-stream-map-container .ga-very-low {
-	background-color: #0033CC;
+	background-color: #CCFFCC;
 }
 
 #cc-stream-map-container .float ul {
@@ -310,50 +311,49 @@
 }
 
 #cc-stream-map-container .float ul.info {
-	height: 80px;
-	background-color:white;
+	height: 60px;
 }
 
-#cc-stream-map-container .float ul.options {
+#cc-stream-map-container .float ul.options {	
 	height: 30px;
 }
 
 #cc-stream-map-container .float ul li.uos-code {
-	color: #E88000;
+	color: #333;
 	text-align: center;
 	font-weight: bold;
-	font-size: 12px;
+	font-size: 10px;
 	padding: 0px;
 }
 
 #cc-stream-map-container .float ul li.uos-name {
 	margin-top: 5px;
-	color: #4B832E;
-	font-size: 12px;
+	color: #666;
+	font-size: 10px;
 	text-align: center;
 	padding: 0px;
 }
 
 #cc-stream-map-container .float ul li.info {
 	color: blue;
-	font-size: 12px;
+	font-size: 11px;
 	text-align: center;
 	padding: 2px;
 }
 
 #cc-stream-map-container ul.years li {
 	list-style-type: none;
 	color: #686868;
-	font-size: 18px;
+	font-size: 16px;
         font-weight: bold;
 }
 
 #cc-stream-map-container ul.sessions li {
 	list-style-type: none;
 	color: #9B9B9B;
-        font-size: 16px;
-        padding-top: 10px;
-        padding-bottom: 6px;
+        font-size: 14px;
+        padding-top: 3px;
+        padding-bottom: 3px;
 }