Index: openacs-4/packages/new-portal/www/place-element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/place-element.adp,v
diff -u -r1.32 -r1.33
--- openacs-4/packages/new-portal/www/place-element.adp	2 Apr 2002 22:43:12 -0000	1.32
+++ openacs-4/packages/new-portal/www/place-element.adp	16 Apr 2002 15:11:32 -0000	1.33
@@ -39,26 +39,26 @@
 
     <!-- hide link and arrows begin - refactor with tempate? -->
 
-      <small>[<a href="@action_string@?portal_id=@portal_id@&op=hide&element_id=@element_multi.element_id@">hide</a>]</small>
+      <small>[<a href="@action_string@?portal_id=@portal_id@&op=hide&element_id=@element_multi.element_id@&return_url=@return_url@">hide</a>]</small>
 
     <if @element_multi:rowcount gt 1>
       <if @element_multi.rownum@ gt 1>
-        <a href="@action_string@?portal_id=@portal_id@&region=@region@&op=swap&element_id=@element_multi.element_id@&direction=up&page_id=@page_id@"><img border=0 src="@imgdir@/arrow-up.gif" alt="move up"></a>
+        <a href="@action_string@?portal_id=@portal_id@&region=@region@&op=swap&element_id=@element_multi.element_id@&direction=up&page_id=@page_id@&return_url=@return_url@"><img border=0 src="@imgdir@/arrow-up.gif" alt="move up"></a>
       </if>
       <if @element_multi:rowcount@ gt @element_multi.rownum@>
-        <a href="@action_string@?portal_id=@portal_id@&region=@region@&op=swap&element_id=@element_multi.element_id@&direction=down&page_id=@page_id@"><img border=0 src="@imgdir@/arrow-down.gif" alt="move down"></a>
+        <a href="@action_string@?portal_id=@portal_id@&region=@region@&op=swap&element_id=@element_multi.element_id@&direction=down&page_id=@page_id@&return_url=@return_url@"><img border=0 src="@imgdir@/arrow-down.gif" alt="move down"></a>
       </if>
     </if>
 
     <if @num_regions@ gt 1>
 	<if @region@ eq 1>
-	<a href="@action_string@?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=right&region=@region@"><img border=0 src="@imgdir@/arrow-right.gif" alt="move right"></a>
+	<a href="@action_string@?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=right&region=@region@&return_url=@return_url@"><img border=0 src="@imgdir@/arrow-right.gif" alt="move right"></a>
 	</if>
 	<if @region@ gt 1 and @region@ lt @num_regions@>
-	<a href="@action_string@?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=left&region=@region@"><img border=0 src="@imgdir@/arrow-left.gif" alt="move left"></a>
+	<a href="@action_string@?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=left&region=@region@&return_url=@return_url@"><img border=0 src="@imgdir@/arrow-left.gif" alt="move left"></a>
 	<a href="@action_string@?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=right&region=@region@"><img border=0 src="@imgdir@/arrow-right.gif" alt="move right"></a>
 	</if>
-	<if @region@ eq @num_regions@><a href="@action_string@?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=left&region=@region@"><img border=0 src="@imgdir@/arrow-left.gif" alt="move left"></a>
+	<if @region@ eq @num_regions@><a href="@action_string@?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=left&region=@region@&return_url=@return_url@"><img border=0 src="@imgdir@/arrow-left.gif" alt="move left"></a>
 	</if>
     </if>
 
@@ -73,7 +73,8 @@
     <include src=place-element-other-page &="element_multi" 
              portal_id=@portal_id@
              page_id=@page_id@
-             action_string=@action_string@>
+             action_string=@action_string@
+             return_url=@return_url@>
 </multiple>
 
 </if>
@@ -86,7 +87,7 @@
 <input type=hidden name=portal_id value=@portal_id@>
 <input type=hidden name=region value=@region@>
 <input type=hidden name=page_id value=@page_id@>
-
+<input type=hidden name=return_url value=@return_url@>
 @show_html@
 </select>
 <input type=submit name="op" value="Show Here">
Index: openacs-4/packages/new-portal/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/admin/index.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/new-portal/www/admin/index.adp	11 Apr 2002 20:17:53 -0000	1.4
+++ openacs-4/packages/new-portal/www/admin/index.adp	16 Apr 2002 15:11:33 -0000	1.5
@@ -30,8 +30,8 @@
 <else>
   <ul>
     <multiple name=users_portals>
-      <li><a href="portal-show.tcl?portal_id=@users_portals.portal_id@">@users_portals.name@</a> 
-      <small>[<a href="portal-config?portal_id=@users_portals.portal_id@">edit</a>]</li></small>
+      <li><a href="portal-show.tcl?portal_id=@users_portals.portal_id@&referer=index">@users_portals.name@</a> 
+      <small>[<a href="portal-config?portal_id=@users_portals.portal_id@&referer=index">edit</a>]</li></small>
     </multiple>
   </ul>
 </else>