Index: openacs-4/packages/curriculum/lib/admin-curriculums.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/admin-curriculums.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/curriculum/lib/admin-curriculums.adp	18 Jun 2003 15:21:51 -0000	1.7
+++ openacs-4/packages/curriculum/lib/admin-curriculums.adp	2 Jul 2003 12:38:32 -0000	1.8
@@ -1,6 +1,6 @@
 <p>
   [
-  <a href="/admin/site-map/parameter-set?package%5fid=@package_id@">Package parameters</a>
+  <a href="/admin/site-map/parameter-set?@export_vars@">Package parameters</a>
   |
   <a href="/permissions/one?object%5fid=@package_id@">Package permissions</a>
   ]
@@ -51,8 +51,7 @@
     <td width="5%">
     <if @curriculums.rownum@ gt 1>
       <a href="curriculum-swap?sort_order=@curriculums.curriculum_sort_order@&direction=up" alt="^" title="Move up">
-        <img src="../graphics/up.gif" border="0" width="15" height="15">
-      </a>
+        <img src="../graphics/up.gif" border="0" width="15" height="15"></a>
     </if>
     <if @curriculums.curriculum_sort_order@ lt @curriculum_count@>
       <a href="curriculum-swap?sort_order=@curriculums.curriculum_sort_order@&direction=down" alt="v" title="Move down">
@@ -101,8 +100,7 @@
     <td width="20%">
     <if @curriculums.groupnum@ gt 1>
       <a href="element-swap?@curriculums.curriculum_id_export@&sort_order=@curriculums.element_sort_order@&direction=up" alt="^" title="Move up">
-        <img src="../graphics/up.gif" border="0" width="15" height="15">
-      </a>
+        <img src="../graphics/up.gif" border="0" width="15" height="15"></a>
     </if>
     <if @curriculums.groupnum_last_p@ false>
       <a href="element-swap?@curriculums.curriculum_id_export@&sort_order=@curriculums.element_sort_order@&direction=down" alt="v" title="Move down">
Index: openacs-4/packages/curriculum/lib/admin-curriculums.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/admin-curriculums.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/curriculum/lib/admin-curriculums.tcl	17 Jun 2003 15:43:58 -0000	1.4
+++ openacs-4/packages/curriculum/lib/admin-curriculums.tcl	2 Jul 2003 12:38:32 -0000	1.5
@@ -54,4 +54,8 @@
 
 set curriculum_count [curriculum::conn -nocache curriculum_count]
 
+set return_url [ad_return_url]
+
+set export_vars [export_vars -url { package_id return_url }]
+
 ad_return_template
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.2 -r1.3
--- openacs-4/packages/curriculum/lib/bar-horizontal.adp	13 Jun 2003 15:50:35 -0000	1.2
+++ openacs-4/packages/curriculum/lib/bar-horizontal.adp	2 Jul 2003 12:38:32 -0000	1.3
@@ -43,9 +43,7 @@
 
     </td>
     <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>
+      <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">
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.2 -r1.3
--- openacs-4/packages/curriculum/lib/bar-vertical.adp	13 Jun 2003 15:50:35 -0000	1.2
+++ openacs-4/packages/curriculum/lib/bar-vertical.adp	2 Jul 2003 12:38:32 -0000	1.3
@@ -45,9 +45,7 @@
   </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>
+      <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">