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.23 -r1.24
--- openacs-4/packages/new-portal/www/place-element.adp	22 Jan 2002 23:42:44 -0000	1.23
+++ openacs-4/packages/new-portal/www/place-element.adp	23 Jan 2002 00:08:06 -0000	1.24
@@ -39,13 +39,11 @@
 
     <br>
 
-    <if @other_page_avail_p@ ne 0>
-      <multiple name=pages>
-        <small>[<a href="@target_stub@-2?portal_id=@portal_id@&op=move_to_page&element_id=@element_multi.element_id@&page_id=@pages.page_id@">move to @pages.pretty_name@</a>]</small>
-      </multiple>
-   </if>
+    <include src=place-element-other-page &="element_multi" 
+             target_stub=@target_stub@
+             portal_id=@portal_id@
+             page_id=@element_multi.page_id@>
 
-
 </multiple>
 
 </if>
Index: openacs-4/packages/new-portal/www/place-element.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/place-element.tcl,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/new-portal/www/place-element.tcl	22 Jan 2002 23:42:44 -0000	1.27
+++ openacs-4/packages/new-portal/www/place-element.tcl	23 Jan 2002 00:08:06 -0000	1.28
@@ -21,23 +21,23 @@
 
 # get the elements for this region.
 set region_count 0
-template::multirow create element_multi element_id name sort_key state hideable_p
+template::multirow create element_multi element_id name sort_key state hideable_p page_id 
 
 db_foreach select_elements_by_region {
-    select element_id, pem.pretty_name as name,  pem.sort_key, state
+    select element_id, pem.pretty_name as name,  pem.sort_key, state, pem.page_id as page_id
     from portal_element_map pem, portal_pages pp
     where
     pp.portal_id = :portal_id 
-    and pp.page_id = :page_id
     and pem.page_id = pp.page_id
+    and pp.page_id = :page_id
     and region = :region 
     and state != 'hidden'
     order by sort_key } {
 
         set hideable_p [portal::get_element_param $element_id "hideable_p"]
         
 	template::multirow append element_multi \
-		$element_id $name $sort_key $state $hideable_p
+		$element_id $name $sort_key $state $hideable_p $page_id
 	incr region_count
     }
 
@@ -47,7 +47,6 @@
 from portal_element_map pem, portal_pages pcp
 where
 pcp.portal_id = :portal_id
-and pcp.page_id = :page_id
 and pem.page_id = pcp.page_id
 and state != 'hidden'
 and region not like 'i%'"
@@ -65,7 +64,6 @@
      from portal_element_map pem, portal_pages pp
      where
        pp.portal_id = :portal_id 
-       and pp.page_id = :page_id
        and pp.page_id = pem.page_id
        and pem.state = 'hidden'
     order by name
@@ -74,23 +72,4 @@
     append show_html "<option value=$element_id>$name</option>\n"
 }
 
-
-# moving to other pages
-template::multirow create pages page_id pretty_name
-set other_page_avail_p 0
-
-db_foreach other_pages_select {
-    select page_id, pretty_name
-     from portal_pages pp
-     where
-       pp.portal_id = :portal_id 
-       and pp.page_id != :page_id
-    order by sort_key
-} {
-    set other_page_avail_p 1
-
-    template::multirow append pages \
-            $page_id $pretty_name
-}
-
 set dir "[portal::mount_point]/place-element-components"