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.44.2.2 -r1.44.2.3
--- openacs-4/packages/new-portal/www/place-element.adp	11 Mar 2007 00:39:39 -0000	1.44.2.2
+++ openacs-4/packages/new-portal/www/place-element.adp	14 Mar 2007 21:06:22 -0000	1.44.2.3
@@ -27,7 +27,7 @@
         <input type=hidden name=region value=@region@>
         <input type=hidden name=page_id value=@page_id@>
 </if>
-<div class="portlet-header">
+  <div class="portlet-header">
     <div class="portlet-title">
         <h1>@element_multi.name;noquote@</h1>
     </div>
@@ -36,57 +36,65 @@
         <if @element_multi.state@ ne "pinned">
             <!-- hide/remove link and arrows begin - refactor with tempate -->
 
-            <a href="@action_string@?anchor=@page_id@&portal_id=@portal_id@&op_hide=1&element_id=@element_multi.element_id@&return_url=@return_url@">
-                <img src=@imgdir@/delete.gif border=0 alt="remove portlet">
+            <!-- hide_remove_url -->
+            <a href="@element_multi.hide_remove_url@">
+                <img src="@imgdir@/delete.gif" border=0 alt="remove portlet">
             </a>
 
             <if @element_multi:rowcount gt 1>
                 <if @element_multi.rownum@ gt 1>
-                    <a href="@action_string@?anchor=@page_id@&portal_id=@portal_id@&region=@region@&op_swap=1&element_id=@element_multi.element_id@&direction=up&page_id=@page_id@&return_url=@return_url@">
+                    <!-- move_up_url -->
+                    <a href="@element_multi.move_up_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@?anchor=@page_id@&portal_id=@portal_id@&region=@region@&op_swap=1&element_id=@element_multi.element_id@&direction=down&page_id=@page_id@&return_url="@return_url@">
+                    <!-- move_down_url -->
+                    <a href="@element_multi.move_down_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@?anchor=@page_id@&portal_id=@portal_id@&op_move=1&element_id=@element_multi.element_id@&direction=right&region=@region@&return_url=@return_url@">
+                    <!-- move_right_with_anchor_url -->
+                    <a href="@element_multi.move_right_wa_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@?anchor=@page_id@&portal_id=@portal_id@&op_move=1&element_id=@element_multi.element_id@&direction=left&region=@region@&return_url=@return_url@">
+                    <!-- move_left_with_anchor_url -->
+                    <a href="@element_multi.move_left_wa_url@">
                         <img border="0" src="@imgdir@/arrow-left.gif" alt="move left">
                     </a>
-                    <a href="@action_string@?portal_id=@portal_id@&op_move=1&element_id=@element_multi.element_id@&direction=right&region=@region@&return_url=@return_url@">
+                    <!-- move_right_url -->
+                    <a href="@element_multi.move_right_url@">
                         <img border="0" src="@imgdir@/arrow-right.gif" alt="move right">
                     </a>
                 </if>
 
                 <if @region@ eq @num_regions@>
-                    <a href="@action_string@?anchor=@page_id@&portal_id=@portal_id@&op_move=1&element_id=@element_multi.element_id@&direction=left&region=@region@&return_url=@return_url@">
+                    <!-- move_left_with_anchor_url -->
+                    <a href="@element_multi.move_left_wa_url@">
                         <img border="0" src="@imgdir@/arrow-left.gif" alt="move left">
                     </a>
                 </if>
             </if>
-
         </if>
-    </div>
-<!-- hide/remove link and arrows end -->
-</form>
-</div>
-<div class="portlet">
-    <include src=place-element-other-page &="element_multi" portal_id=@portal_id@ page_id=@page_id@ action_string=@action_string@ anchor=@page_id@ return_url=@return_url@>
-</div>
-</multiple>
-</div>
+    </div> <!-- portlet-controls -->
+   </div> <!-- portlet-header -->
+   <if @element_multi.rownum@ eq 1>
+     </form>
+   </if>
+   <div class="portlet">
+     <include src=place-element-other-page &="element_multi" portal_id=@portal_id@ page_id=@page_id@ action_string=@action_string@ anchor=@page_id@ return_url=@return_url@>
+   </div>
+  </multiple>
+</div> <!-- portlet-wrapper -->
+
 <include src="show-here" portal_id=@portal_id@ action_string=@action_string@ region=@region@ page_id=@page_id@ anchor=@page_id@    return_url=@return_url@>