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.36 -r1.37
--- openacs-4/packages/new-portal/www/place-element.adp	9 Aug 2002 20:56:29 -0000	1.36
+++ openacs-4/packages/new-portal/www/place-element.adp	16 Oct 2002 15:39:16 -0000	1.37
@@ -23,42 +23,46 @@
 <input type=hidden name=region value=@region@>
 <input type=hidden name=page_id value=@page_id@>
 
-<table border=1 width="100%">
-<tr>
-<td align=center>
+<table border=0 width="100%">
+<tr><td>
 
 <multiple name=element_multi>
-  
-<if @element_multi.rownum@ gt 1>
-  <hr>
-</if>
+<center>  
+<table class="portlet-config" cellpadding=0 cellspacing=0 border="0" bground="white" width="95%">
+    <tr><td class="element-header-text">@element_multi.name@</td>
+    <td align=right>	
 
-    @element_multi.name@
-
     <if @element_multi.state@ ne "pinned">
 
     <!-- hide/remove link and arrows begin - refactor with tempate? -->
 
-      <small>[<a href="@action_string@?portal_id=@portal_id@&op=hide&element_id=@element_multi.element_id@&return_url=@return_url@&anchor=@page_id@">remove</a>]</small>
+      <a href="@action_string@?anchor=@page_id@&portal_id=@portal_id@&op=hide&element_id=@element_multi.element_id@&return_url=@return_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@?portal_id=@portal_id@&region=@region@&op=swap&element_id=@element_multi.element_id@&direction=up&page_id=@page_id@&return_url=@return_url@&anchor=@page_id@"><img border=0 src="@imgdir@/arrow-up.gif" alt="move up"></a>
+        <a href="@action_string@?anchor=@page_id@&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@&return_url=@return_url@&anchor=@page_id@"><img border=0 src="@imgdir@/arrow-down.gif" alt="move down"></a>
+        <a href="@action_string@?anchor=@page_id@&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@&return_url=@return_url@&anchor=@page_id@"><img border=0 src="@imgdir@/arrow-right.gif" alt="move right"></a>
+	<a href="@action_string@?anchor=@page_id@&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@&return_url=@return_url@&anchor=@page_id@"><img border=0 src="@imgdir@/arrow-left.gif" alt="move left"></a>
+	<a href="@action_string@?anchor=@page_id@&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@&return_url=@return_url@&anchor=@page_id@"><img border=0 src="@imgdir@/arrow-left.gif" alt="move left"></a>
+	<if @region@ eq @num_regions@>
+	<a href="@action_string@?anchor=@page_id@&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>
 
@@ -67,36 +71,33 @@
     </if>
 
     <!-- hide/remove link and arrows end -->
-
+</td></tr>
+<tr><td colspan=2 class="bottom-border" height="0"><img src="/graphics/spacer.gif"></td></tr>
+<tr><td></td></tr>
+<tr><td colspan=2 valign=bottom align=center>
 </form>
 
     <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@>
+</td></tr></table></center>
+<p>
 </multiple>
 
 </if>
 
+	<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@>
 
-<!-- refactor show with template? -->
-
-<if @show_avail_p@ ne 0>
-<form method=post action=@action_string@>
-<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">
-</if>
-
-<!-- refactor show with template? -->
-
 </td>
 </tr>
 </table>
 
-</form>
+