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.4 -r1.5
--- openacs-4/contrib/packages/portal/tcl/portal-procs.tcl	10 Jan 2004 01:01:01 -0000	1.4
+++ openacs-4/contrib/packages/portal/tcl/portal-procs.tcl	11 Jan 2004 01:08:00 -0000	1.5
@@ -423,16 +423,26 @@
 
                 append template "
                 <table bgcolor=#eeeeee border=0 width=\"100%\">
-                <tr valign=middle><td valign=middle>
-                <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@>
-                </td></tr>"
+                <tr valign=middle><td valign=middle>"
 
+                if { ![portal::page::has_visible_elements -page_id $page_id] } {
+                    append template "
+                    <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@>
+                    </td></tr>"
+ns_log Notice "Huh? $template"
+                }
+
                 # clear out the region array
                 array unset fake_element_ids
             }
@@ -569,13 +579,8 @@
         @param formdata an ns_set with all the formdata
     } {
 
-        set edit_p [permission::permission_p -object_id $portal_id -privilege write]
+        permission::require_permission -object_id $portal_id -privilege write
 
-        if {!$edit_p} {
-            permission::require_permission -privilege admin -object_id $portal_id
-            set edit_p 1
-        }
-
         set op [ns_set get $form op]
 
         switch $op {
@@ -612,7 +617,7 @@
                             set region 1
 
                             db_foreach revert_move_elements_for_del {} {
-                                portal::move_element_to_page \
+                                portal::element::move_to_page \
                                     -page_id $page_id \
                                     -element_id $element_id \
                                     -region 1
@@ -686,8 +691,8 @@
                             # after hiding an element, add
                             # it to the _first_ page
                             # of the portal.
-                            portal::move_element_to_page \
-                                -page_id [portal::get_page_id -portal_id $portal_id] \
+                            portal::element::move_to_page \
+                                -page_id [portal::page::get_id -portal_id $portal_id] \
                                 -element_id $element_id
                         }
                     }