Index: openacs-4/packages/curriculum/lib/bar-horizontal.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/bar-horizontal.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum/lib/bar-horizontal.adp	10 Jun 2003 09:46:20 -0000	1.1
+++ openacs-4/packages/curriculum/lib/bar-horizontal.adp	13 Jun 2003 15:50:35 -0000	1.2
@@ -11,7 +11,7 @@
       <img src="/shared/images/checkbox.gif" border="0" width="13" height="13" alt="O" title="Ongoing">
     </else>
       @elements.curriculum_name;noquote@
-      <a href="@package_url@curriculum-ave?curriculum_id=@elements.curriculum_id@" title="Info">
+      <a href="@package_url@curriculum-ave?curriculum_id=@elements.curriculum_id@" target="_top">
       <img src="@package_url@graphics/info.gif" border="0" width="12" height="12" alt="i" title="Information">
       </a>
     </th>
@@ -33,7 +33,7 @@
       <else>
         <a href="@elements.url@" target="_top" title="Visit">@elements.name@</a>
       </else>
-      <a href="@package_url@element-ave?curriculum_id=@elements.curriculum_id@&element_id=@elements.element_id@">
+      <a href="@package_url@element-ave?curriculum_id=@elements.curriculum_id@&element_id=@elements.element_id@" target="_top">
         <img src="@package_url@graphics/info.gif" border="0" width="12" height="12" alt="i" title="Information">
       </a>
     </td>
Index: openacs-4/packages/curriculum/lib/bar-vertical.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/bar-vertical.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum/lib/bar-vertical.adp	10 Jun 2003 09:46:20 -0000	1.1
+++ openacs-4/packages/curriculum/lib/bar-vertical.adp	13 Jun 2003 15:50:35 -0000	1.2
@@ -1,3 +1,61 @@
-<h3>VERTICAL</h3>
+<if @elements:rowcount@ not nil>
+<multiple name="elements">
+<table bgcolor="#cccccc" border="0" cellpadding="0" cellspacing="0" width="100%">
+  <tr>
+    <th nowrap>
+    <if @elements.completed_p@>
+      <img src="/shared/images/checkboxchecked.gif" border="0" width="13" height="13" alt="X" title="Completed">
+    </if>
+    <else>
+      <img src="/shared/images/checkbox.gif" border="0" width="13" height="13" alt="O" title="Ongoing">
+    </else>
+      @elements.curriculum_name;noquote@
+      <a href="@package_url@curriculum-ave?curriculum_id=@elements.curriculum_id@" target="_top">
+      <img src="@package_url@graphics/info.gif" border="0" width="12" height="12" alt="i" title="Information">
+      </a>
+    </th>
+  </tr>
+    <td nowrap>
 
-Staffan, please write this! 8-)
\ No newline at end of file
+<table bgcolor="#cccccc" border="0" cellspacing="2" cellpadding="2" width="100%">
+  <group column="curriculum_id">
+  <tr bgcolor="#eeeeee">
+    <td>
+      <if @elements.checked_p@>
+        <img src="/shared/images/checkboxchecked.gif" border="0" width="13" height="13" alt="X" title="Visited">
+      </if>
+      <else>
+        <img src="/shared/images/checkbox.gif" border="0" width="13" height="13" alt="O" title="Unvisited">
+      </else>
+      <if @elements.external_p@>
+        <a href="@package_url@ext?curriculum_id=@elements.curriculum_id@&element_id=@elements.element_id@&@return_url_export@&position=@position@" target="_top" title="Visit">@elements.name@</a>
+      </if>
+      <else>
+        <a href="@elements.url@" target="_top" title="Visit">@elements.name@</a>
+      </else>
+      <a href="@package_url@element-ave?curriculum_id=@elements.curriculum_id@&element_id=@elements.element_id@" target="_top">
+        <img src="@package_url@graphics/info.gif" border="0" width="12" height="12" alt="i" title="Information">
+      </a>
+    </td>
+  </tr>
+  </group>
+</table>
+
+    </td>
+  </tr>
+  <tr>
+    <th nowrap">
+      <a href="@package_url@start-over?curriculum_id=@elements.curriculum_id@&@return_url_export@">
+        <img src="@package_url@graphics/refresh.jpg" border="0" width="13" height="14" alt="Refresh" title="Refresh">
+      </a>
+      <if @logged_in_p@>
+      <a href="@package_url@remove-from-bar?curriculum_id=@elements.curriculum_id@&@return_url_export@">
+        <img src="@package_url@graphics/remove.jpg" border="0" width="15" height="13" alt="X" title="Remove">
+      </a>
+      </if>
+    </th>
+  </tr>
+</table>
+<br>
+</multiple>
+</if>
Index: openacs-4/packages/curriculum/lib/bar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/bar.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/curriculum/lib/bar.tcl	10 Jun 2003 09:28:29 -0000	1.2
+++ openacs-4/packages/curriculum/lib/bar.tcl	13 Jun 2003 15:50:35 -0000	1.3
@@ -19,7 +19,7 @@
 
 set logged_in_p [ad_conn user_id]
 
-set return_url [ad_conn url]
+set return_url [ad_return_url]
 set return_url_export [export_vars -url return_url]
 
 # Upvar the "elements" multirow datasource for the curriculum bar.