Index: openacs-4/contrib/packages/portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/portal-procs.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/contrib/packages/portal/tcl/portal-procs.tcl	13 Feb 2004 20:00:46 -0000	1.14
+++ openacs-4/contrib/packages/portal/tcl/portal-procs.tcl	17 Feb 2004 01:33:57 -0000	1.15
@@ -355,32 +355,31 @@
             <form method=post action=@action_string@>
             <input type=hidden name=portal_id value=@portal_id@>
             <input type=hidden name=return_url value=@return_url@>
-            <strong>Change Theme:</strong>
-            <br>"
+            <select name=theme_id>
+        "
         set current_theme_id [portal::get_theme_id -portal_id $portal_id]
 
         foreach theme [portal::theme::get_list] {
             set theme_id [ns_set get $theme theme_id]
             set name [ns_set get $theme name]
             set description [ns_set get $theme description]
 
-            append theme_chunk "<label><input type=radio name=theme_id value=$theme_id"
             set one_theme_chunk "&nbsp;$name - $description"
 
             if {$current_theme_id == $theme_id } {
-                append theme_chunk " checked><b>$one_theme_chunk</b>"
+                append theme_chunk "<option value=$theme_id selected>"
             } else {
-                append theme_chunk ">$one_theme_chunk"
+                append theme_chunk "<option value=$theme_id>"
             }
-            append theme_chunk "</label><br>\n"
+            append theme_chunk "$name - $description</option>\n"
         }
 
-        append theme_chunk "<input type=submit name=op value=\"Change Theme\"></form>"
-        append template "$theme_chunk"
+        append template "$theme_chunk\n
+            </select>
+            <input type=submit name=op value=\"Change Theme\">
+            </form>\n"
 
-        #
-        # Per-page template chunks
-        #
+        set page_ids [get_page_list -portal_id $portal_id]
 
         set show_avail_p 0
         set show_html "<select name=element_id>\n"
@@ -390,10 +389,34 @@
         }
         append show_html "</select>\n"
 
-        set list_of_page_ids [get_page_list -portal_id $portal_id]
+        if { $show_avail_p } {
+            append template "
+            <br>
+            <form method=post action=@action_string@>
+            <input type=hidden name=portal_id value=@portal_id@>
+            <input type=hidden name=page_id value=[lindex $page_ids 0]>
+            <input type=hidden name=return_url value=@return_url@>
+            <input type=hidden name=op value=\"Show Here\">
+            $show_html
+            <input type=submit name=submit value=\"Add Portlet\">\n
+            </form>
+            <br>\n"
+         }
 
-        foreach page_id $list_of_page_ids {
+        #
+        # Per-page template chunks
+        #
+        set page_id ""
 
+        for { set page_num 0 } { $page_num < [llength $page_ids] } {incr page_num} {
+            set prev_page_id $page_id
+            set page_id [lindex $page_ids $page_num]
+            if { $page_num == [llength $page_ids] - 1 } {
+                set next_page_id ""
+            } else {
+                set next_page_id [lindex $page_ids [expr {$page_num + 1}]]
+            }
+
             set first_page_p [portal::page::first_page_p -portal_id $portal_id -page_id $page_id]
             set page_name [portal::page::get_name -page_id $page_id]
             set page_layout_id [portal::page::get_layout_id -page_id $page_id]
@@ -417,21 +440,6 @@
             </form>"
             append template "$page_name_chunk"
 
-            if { $show_avail_p } {
-                set show_html_form "
-                <form method=post action=@action_string@>
-                <input type=hidden name=portal_id value=@portal_id@>
-                <input type=hidden name=page_id value=$page_id>
-                <input type=hidden name=return_url value=@return_url@>
-                <input type=hidden name=op value=\"Show Here\">
-                <input type=hidden name=anchor value=$page_id>
-                $show_html
-                <input type=submit name=submit value=\"Add This Portlet Here\">\n
-                </form>"
-            } else {
-                set show_html_form ""
-            }
-
             if {[portal::page::has_visible_elements -page_id $page_id] || $first_page_p} {
 
                 #
@@ -440,37 +448,40 @@
 
                 db_1row portal_and_page_info_select {} -column_array portal
 
-                # fake some elements for the <list> in the template
-                foreach region [portal::layout::get_region_list -layout_id $portal(layout_id)] {
-                    lappend fake_element_ids($region) $portal_id
-                }
-
                 set element_list [array get fake_element_ids]
 
                 append template "
                 <table bgcolor=#eeeeee border=0 width=\"100%\">
-                <tr valign=middle><td valign=middle>"
+                <tr valign=middle>"
 
                 if { ![portal::page::has_visible_elements -page_id $page_id] } {
                     append template "
+                    <td valign=middle>
                     <center>
                     No Elements on this page
                     </center>"
                 } else {
-                    append template "
-                    <include src=\"$portal(template)\"
-                    element_list=\"$element_list\"
-                    action_string=@action_string@ portal_id=@portal_id@
-                    return_url=\"@return_url@\" element_src=\"@element_src@\"
-                    page_id=$page_id
-                    layout_id=$portal(layout_id)
-                    edit_p=@edit_p@>\n"
+                    set regions [portal::layout::get_region_list -layout_id $portal(layout_id)]
+                    set num_regions [llength $regions]
+                    set region_width [expr {int(100/$num_regions)}]
+                    foreach region $regions {
+                        append template "
+                        <td width=\"${region_width}%\" valign=\"top\">
+                        <include src=\"[portal::www_path]/place-element\"
+                          action_string=\"@action_string@\"
+                          portal_id=\"@portal_id@\"
+                          return_url=\"@return_url@\"
+                          page_id=\"$page_id\"
+                          prev_page_id=\"$prev_page_id\"
+                          next_page_id=\"$next_page_id\"
+                          region=\"$region\"
+                          num_regions=\"$num_regions\"
+                          layout_id=\"$portal(layout_id)\">\n"
+                    }
                 }
-                append template "$show_html_form</td></tr>\n"
-
-                # clear out the region array
-                array unset fake_element_ids
+                append template "</td>"
             }
+            append template "</tr>\n"
 
             if {![portal::page::has_visible_elements -page_id $page_id]} {
 
@@ -494,7 +505,6 @@
                     <input type=submit name=op value=\"Remove Empty Page\">
                     </form>
                     </center>
-                    $show_html_form
                     </td>
                     </tr>"
                 }
Index: openacs-4/contrib/packages/portal/www/place-element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/Attic/place-element.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/packages/portal/www/place-element.adp	15 Feb 2004 22:48:21 -0000	1.4
+++ openacs-4/contrib/packages/portal/www/place-element.adp	17 Feb 2004 01:33:58 -0000	1.5
@@ -39,10 +39,22 @@
         <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>
+     <else>
+        <if @prev_page_id@ ne "">
+          <a href="@action_string@?anchor=@page_id@&portal_id=@portal_id@&region=@region@&op=Move to page&element_id=@element_multi.element_id@&direction=up&page_id=@prev_page_id@&return_url=@return_url@">
+	  <img border=0 src="@imgdir@/arrow-up.gif" alt="move up"></a>
+        </if>
+     </else>
      <if @element_multi:rowcount@ gt @element_multi.rownum@>
         <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>
+     <else>
+        <if @next_page_id@ ne "">
+          <a href="@action_string@?anchor=@page_id@&portal_id=@portal_id@&region=@region@&op=Move to page&element_id=@element_multi.element_id@&direction=up&page_id=@next_page_id@&return_url=@return_url@">
+	  <img border=0 src="@imgdir@/arrow-down.gif" alt="move down"></a>
+        </if>
+     </else>
    </if>
 
    <if @num_regions@ gt 1>
@@ -53,7 +65,7 @@
 <if @region@ gt 1 and @region@ lt @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>
-	<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@ 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@">
@@ -65,16 +77,18 @@
 
     <!-- hide/remove link and arrows end -->
 </td></tr>
+<if 0>
 <tr><td></td></tr>
 <tr><td colspan=2 valign=bottom align=center>
-
     <include src=place-element-other-page &="element_multi"
              portal_id=@portal_id;noquote@
              page_id=@page_id;noquote@
              action_string=@action_string;noquote@
 	     anchor=@page_id;noquote@
              return_url=@return_url;noquote@>
-</td></tr></table></center>
+</td></tr>
+</if>
+</table></center>
 <p>
 </multiple>
 
Index: openacs-4/contrib/packages/portal/www/place-element.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/Attic/place-element.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/portal/www/place-element.tcl	11 Jan 2004 01:08:00 -0000	1.2
+++ openacs-4/contrib/packages/portal/www/place-element.tcl	17 Feb 2004 01:33:58 -0000	1.3
@@ -29,8 +29,6 @@
     element_multi:multirow
 }
 
-set num_regions [portal::layout::get_region_count -layout_id $layout_id]
-
 template::multirow create element_multi \
         element_id \
         name \