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>