Index: openacs-4/packages/curriculum/www/ext.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/www/ext.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/curriculum/www/ext.adp	10 Jun 2003 09:30:07 -0000	1.2
+++ openacs-4/packages/curriculum/www/ext.adp	10 Jun 2003 15:38:25 -0000	1.3
@@ -6,27 +6,27 @@
 <switch @position@>
  <case value="top">
   <frameset rows="20%,*">
-    <frame src="horizontal" frameborder="1">
+    <frame src="horizontal?@export_vars@" frameborder="1">
     <frame src="@destination_url@">
  </case>
  <case value="bottom">
   <frameset rows="*,20%">
     <frame src="@destination_url@">
-    <frame src="horizontal" frameborder="1">
+    <frame src="horizontal?@export_vars@" frameborder="1">
  </case>
  <case value="left">
   <frameset cols="20%,*">
-    <frame src="vertical" frameborder="1">
+    <frame src="vertical?@export_vars@" frameborder="1">
     <frame src="@destination_url@">
  </case>
  <case value="right">
   <frameset cols="*,20%">
     <frame src="@destination_url@">
-    <frame src="vertical" frameborder="1">
+    <frame src="vertical?@export_vars@" frameborder="1">
  </case>
  <default>
   <frameset rows="20%,*">
-    <frame src="horizontal" frameborder="1">
+    <frame src="horizontal?@export_vars@" frameborder="1">
     <frame src="@destination_url@">
  </default>
 </switch>
Index: openacs-4/packages/curriculum/www/ext.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/www/ext.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/curriculum/www/ext.tcl	10 Jun 2003 09:30:07 -0000	1.2
+++ openacs-4/packages/curriculum/www/ext.tcl	10 Jun 2003 15:38:25 -0000	1.3
@@ -22,6 +22,8 @@
 
 set destination_url [db_string get_destination_url {*SQL*}]
 
+set export_vars [export_vars -url { return_url destination_url }]
+
 ####
 #
 # Integration with the Clickthrough package.
@@ -48,7 +50,6 @@
 }
 
 if { [set user_id [ad_conn user_id]] } {
-    # FIXME. Port this query to Oracle.
     db_dml insert_into_map_table {*SQL*}
 }
 
Index: openacs-4/packages/curriculum/www/horizontal.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/www/horizontal.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum/www/horizontal.adp	10 Jun 2003 10:32:16 -0000	1.1
+++ openacs-4/packages/curriculum/www/horizontal.adp	10 Jun 2003 15:38:25 -0000	1.2
@@ -1 +1,10 @@
+<a href="@destination_url@" target="_top" title="Remove this frame">
+  <img src="graphics/frame_remove.gif" border="0" width="12" height="11" alt="X">
+  Remove this frame
+</a>
+<br>
+<a href="@return_url@" target="_top" title="Back to @ad_url@@return_url@">
+  <img src="graphics/frame_back.gif" border="0" width="12" height="11" alt="&lt;&lt;">
+  Back to where you were
+</a>
 <include src="../lib/bar" />
Index: openacs-4/packages/curriculum/www/horizontal.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/www/horizontal.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/curriculum/www/horizontal.tcl	10 Jun 2003 15:38:25 -0000	1.1
@@ -0,0 +1,19 @@
+ad_page_contract {
+
+    Horizontal bar on external pages.
+
+    @author Ola Hansson (ola@polyxena.net)
+    @creation-date 2003-06-10
+    @cvs-id $Id: horizontal.tcl,v 1.1 2003/06/10 15:38:25 olah Exp $
+
+} {
+    return_url
+    destination_url
+} -properties {
+    return_url:onevalue
+    destination_url:onevalue
+    ad_url:onevalue
+}
+
+# Solely used to set the return_url and destination_url for the "bar" frame.
+set ad_url [ad_url]
Index: openacs-4/packages/curriculum/www/vertical.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/www/vertical.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum/www/vertical.adp	10 Jun 2003 10:32:16 -0000	1.1
+++ openacs-4/packages/curriculum/www/vertical.adp	10 Jun 2003 15:38:25 -0000	1.2
@@ -1 +1,10 @@
+<a href="@destination_url@" target="_top" title="Remove this frame">
+  <img src="graphics/frame_remove.gif" border="0" width="12" height="11" alt="X">
+  Remove this frame
+</a>
+<br>
+<a href="@return_url@" target="_top" title="Back to @ad_url@@return_url@">
+  <img src="graphics/frame_back.gif" border="0" width="12" height="11" alt="&lt;&lt;">
+  Back to where you were
+</a>
 <include src="../lib/bar-vertical" />
Index: openacs-4/packages/curriculum/www/vertical.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/www/vertical.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/curriculum/www/vertical.tcl	10 Jun 2003 15:38:25 -0000	1.1
@@ -0,0 +1,19 @@
+ad_page_contract {
+
+    Vertical bar on external pages.
+
+    @author Ola Hansson (ola@polyxena.net)
+    @creation-date 2003-06-10
+    @cvs-id $Id: vertical.tcl,v 1.1 2003/06/10 15:38:25 olah Exp $
+
+} {
+    return_url
+    destination_url
+} -properties {
+    return_url:onevalue
+    destination_url:onevalue
+    ad_url:onevalue
+}
+
+# Solely used to set the return_url and destination_url for the "bar" frame.
+set ad_url [ad_url]