Index: openacs-4/packages/dotlrn/www/admin/one-instance-portal-template-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/one-instance-portal-template-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/admin/one-instance-portal-template-2.tcl	21 Nov 2001 18:10:32 -0000	1.1
+++ openacs-4/packages/dotlrn/www/admin/one-instance-portal-template-2.tcl	26 Nov 2001 20:27:15 -0000	1.2
@@ -8,10 +8,11 @@
 
 set form [ns_getform]
 set portal_id [ns_set get $form portal_id]
+set return_url [ns_set get $form return_url]
 
 set user_id [ad_conn user_id]
 
 portal::template_configure_dispatch $portal_id $form
 
-ns_returnredirect "one-instance-portal-template?portal_id=$portal_id"
+ns_returnredirect "one-instance-portal-template?portal_id=$portal_id&return_url=$return_url"
 
Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v
diff -u -r1.73 -r1.74
--- openacs-4/packages/new-portal/tcl/portal-procs.tcl	26 Nov 2001 19:40:09 -0000	1.73
+++ openacs-4/packages/new-portal/tcl/portal-procs.tcl	26 Nov 2001 20:29:22 -0000	1.74
@@ -672,11 +672,12 @@
 	    set template "	
 	    <master src=\"@master_template@\">
 	    <p>
-	    <a href=$return_url>Go back</a>
+	    <a href=@return_url@>Go back</a>
 	    <form action=@action_string@>
 	    <P>	    
 	    <form method=post action=@action_string@>
 	    <input type=hidden name=portal_id value=@portal_id@>
+	    <input type=hidden name=return_url value=@return_url@>
 	    <b>Change Theme:</b>
 	    @theme_data@
 	    </form>
@@ -685,9 +686,8 @@
 
 	    <b>Configure The Portal's Elements:</b>
 	    <include src=\"@portal.template@\" element_list=\"@element_list@\" 
-	    element_src=\"@element_src@\" action_string=@action_string@
-	    portal_id=@portal_id@>
-	    "
+	    element_src=\"@element_src@\" action_string=\"@action_string@\"
+	    portal_id=\"@portal_id@\" return_url=\"@return_url@\">  "
 	
 	#	 <form action=\"update_layout\">
 	#	 <if @layout_count@ gt 1>
Index: openacs-4/packages/new-portal/www/template-place-element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/template-place-element.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/new-portal/www/template-place-element.adp	21 Nov 2001 18:41:08 -0000	1.3
+++ openacs-4/packages/new-portal/www/template-place-element.adp	26 Nov 2001 20:26:58 -0000	1.4
@@ -1,8 +1,6 @@
 
 <!-- template-place-element.adp begin -->
 <form method=post action=@action_string@>
-<input type=hidden name=portal_id value=@portal_id@>
-<input type=hidden name=region value=@region@>
 
 <table border=1 width="100%">
 <tr>
@@ -12,49 +10,49 @@
     @element_multi.name@ - @element_multi.description@
     <if @element_multi:rowcount gt 1>
       <if @element_multi.rownum@ gt 1>
-        <a href="@target_stub@-2?portal_id=@portal_id@&region=@region@&op=swap&element_id=@element_multi.element_id@&sort_key=@element_multi.sort_key@&direction=up"><img border=0 src="@dir@/finger-up.gif" alt="move up"></a>
+        <a href="@target_stub@-2?portal_id=@portal_id@&region=@region@&op=swap&element_id=@element_multi.element_id@&sort_key=@element_multi.sort_key@&direction=up&return_url=@return_url@"><img border=0 src="@dir@/finger-up.gif" alt="move up"></a>
       </if>
       <if @element_multi:rowcount@ gt @element_multi.rownum@>
-        <a href="@target_stub@-2?portal_id=@portal_id@&region=@region@&op=swap&element_id=@element_multi.element_id@&sort_key=@element_multi.sort_key@&direction=down"><img border=0 src="@dir@/finger-down.gif" alt="move down"></a>
+        <a href="@target_stub@-2?portal_id=@portal_id@&region=@region@&op=swap&element_id=@element_multi.element_id@&sort_key=@element_multi.sort_key@&direction=down&return_url=@return_url@"><img border=0 src="@dir@/finger-down.gif" alt="move down"></a>
       </if>
     </if>
 
     <if @region@ eq 1>
-    <a href="@target_stub@-2?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=right&region=@region@"><img border=0 src="@dir@/finger-right.gif" alt="move right"></a>
+    <a href="@target_stub@-2?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=right&region=@region@&return_url=@return_url@"><img border=0 src="@dir@/finger-right.gif" alt="move right"></a>
     </if>
 
     <if @region@ gt 1 and @region@ lt @num_regions@>
-    <a href="@target_stub@-2?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=left&region=@region@"><img border=0 src="@dir@/finger-left.gif" alt="move left"></a>
-    <a href="@target_stub@-2?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=right&region=@region@"><img border=0 src="@dir@/finger-right.gif" alt="move right"></a></if>
-    <if @region@ eq @num_regions@><a href="@target_stub@-2?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=left&region=@region@"><img border=0 src="@dir@/finger-left.gif" alt="move left"></a></if>
+    <a href="@target_stub@-2?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=left&region=@region@&return_url=@return_url@"><img border=0 src="@dir@/finger-left.gif" alt="move left"></a>
+    <a href="@target_stub@-2?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=right&region=@region@&return_url=@return_url@"><img border=0 src="@dir@/finger-right.gif" alt="move right"></a></if>
+    <if @region@ eq @num_regions@><a href="@target_stub@-2?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=left&region=@region@&return_url=@return_url@"><img border=0 src="@dir@/finger-left.gif" alt="move left"></a></if>
 </if>
 
 <p align=left>
 
-Action: (<a href="@target_stub@-2?portal_id=@portal_id@&op=hide&element_id=@element_multi.element_id@">hide this element</a>)
+Action: (<a href="@target_stub@-2?portal_id=@portal_id@&op=hide&element_id=@element_multi.element_id@&return_url=@return_url@">hide this element</a>)
 
 <BR>
 
 <if @state@ ne "locked">
-Locked? unlocked (<a href="@target_stub@-2?portal_id=@portal_id@&op=toggle_lock&element_id=@element_multi.element_id@">set lock</a>)
+Locked? unlocked (<a href="@target_stub@-2?portal_id=@portal_id@&op=toggle_lock&element_id=@element_multi.element_id@&return_url=@return_url@">set lock</a>)
 </if>
-<else>Locked? locked (<a href="@target_stub@-2?portal_id=@portal_id@&op=toggle_lock&element_id=@element_multi.element_id@">unlock</a>)
+<else>Locked? locked (<a href="@target_stub@-2?portal_id=@portal_id@&op=toggle_lock&element_id=@element_multi.element_id@&return_url=@return_url@">unlock</a>)
 </else>
 
 <BR>
 
 <if @hideable_p@ eq "t">
-Hideable? true (<a href="@target_stub@-2?portal_id=@portal_id@&op=toggle_hideable&element_id=@element_multi.element_id@">don't allow hiding</a>)
+Hideable? true (<a href="@target_stub@-2?portal_id=@portal_id@&op=toggle_hideable&element_id=@element_multi.element_id@&return_url=@return_url@">don't allow hiding</a>)
 </if>
-<else>Hideable? false (<a href="@target_stub@-2?portal_id=@portal_id@&op=toggle_hideable&element_id=@element_multi.element_id@">allow hiding</a>)
+<else>Hideable? false (<a href="@target_stub@-2?portal_id=@portal_id@&op=toggle_hideable&element_id=@element_multi.element_id@&return_url=@return_url@">allow hiding</a>)
 </else>
 
 <BR>
 
 <if @shadeable_p@ eq "t">
-Shadeable? true (<a href="@target_stub@-2?portal_id=@portal_id@&op=toggle_shadeable&element_id=@element_multi.element_id@">don't allow shading</a>)
+Shadeable? true (<a href="@target_stub@-2?portal_id=@portal_id@&op=toggle_shadeable&element_id=@element_multi.element_id@&return_url=@return_url@">don't allow shading</a>)
 </if>
-<else>Shadeable? false (<a href="@target_stub@-2?portal_id=@portal_id@&op=toggle_shadeable&element_id=@element_multi.element_id@">allow shading</a>)
+<else>Shadeable? false (<a href="@target_stub@-2?portal_id=@portal_id@&op=toggle_shadeable&element_id=@element_multi.element_id@&return_url=@return_url@">allow shading</a>)
 </else>
 
 <br>
@@ -66,6 +64,10 @@
 <br>
 @show_html@
 </select><input type=submit name="op" value="Show Here">
+<input type=hidden name=portal_id value=@portal_id@>
+<input type=hidden name=region value=@region@>
+<input type=hidden name=return_url value=@return_url@>
+
 </if>
 
 </td>
Index: openacs-4/packages/new-portal/www/layouts/simple2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/layouts/simple2.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/new-portal/www/layouts/simple2.adp	19 Nov 2001 16:46:06 -0000	1.4
+++ openacs-4/packages/new-portal/www/layouts/simple2.adp	26 Nov 2001 20:27:29 -0000	1.5
@@ -4,12 +4,12 @@
     <tr>
       <td valign=top width="50%">
         <list name="element_ids_1">
-          <include src="@element_src@" element_id="@element_ids_1:item@" action_string=@action_string@ theme_id=@theme_id@ region="1" portal_id=@portal_id@><br>
+          <include src="@element_src@" element_id="@element_ids_1:item@" action_string=@action_string@ theme_id=@theme_id@ region="1" portal_id=@portal_id@ return_url=@return_url@><br>
         </list>
       </td>
       <td valign=top width="50%">
         <list name="element_ids_2">
-          <include src="@element_src@" element_id="@element_ids_2:item@" action_string=@action_string@ theme_id=@theme_id@ region="2" portal_id=@portal_id@><br>
+          <include src="@element_src@" element_id="@element_ids_2:item@" action_string=@action_string@ theme_id=@theme_id@ region="2" portal_id=@portal_id@ return_url=@return_url@><br>
         </list>
       </td>
     </tr>
Index: openacs-4/packages/new-portal/www/layouts/simple2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/layouts/simple2.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/new-portal/www/layouts/simple2.tcl	17 Nov 2001 17:41:37 -0000	1.8
+++ openacs-4/packages/new-portal/www/layouts/simple2.tcl	26 Nov 2001 20:27:40 -0000	1.9
@@ -6,6 +6,7 @@
     element_src:onevalue
     action_string:onevalue
     theme_id:onevalue
+    return_url:onevalue
 }
 
 if { ![info exists action_string]} {
@@ -16,6 +17,10 @@
     set theme_id ""
 }
 
+if { ![info exists return_url]} {
+    set return_url ""
+}
+
 portal::layout_elements $element_list
 
 ad_return_template