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
                         }
                     }
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.1 -r1.2
--- openacs-4/contrib/packages/portal/www/place-element.tcl	25 Oct 2002 21:29:17 -0000	1.1
+++ openacs-4/contrib/packages/portal/www/place-element.tcl	11 Jan 2004 01:08:00 -0000	1.2
@@ -65,5 +65,5 @@
     append show_html "<option value=\"[lindex $element 0]\">[lindex $element 1]</option>\n"
 }
 
-set imgdir "[portal::mount_point]/graphics"
+set imgdir "/resources/portal/"
 set location [ad_conn location]
Index: openacs-4/contrib/packages/portal/www/show-here.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/Attic/show-here.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/portal/www/show-here.tcl	25 Oct 2002 21:29:17 -0000	1.1
+++ openacs-4/contrib/packages/portal/www/show-here.tcl	11 Jan 2004 01:08:00 -0000	1.2
@@ -37,5 +37,5 @@
     append show_html "<option value=[lindex $element 0]>[lindex $element 1]</option>\n"
 }
 
-set imgdir "[portal::mount_point]/graphics"        
+set imgdir /resources/portal/
 set location [ad_conn location]
Index: openacs-4/contrib/packages/portal/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/admin/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/portal/www/admin/index.tcl	25 Sep 2003 02:12:16 -0000	1.2
+++ openacs-4/contrib/packages/portal/www/admin/index.tcl	11 Jan 2004 01:08:00 -0000	1.3
@@ -26,11 +26,6 @@
 
 permission::require_permission -object_id [ad_conn package_id] -privilege admin
 
-set query "select 
-           portal_id, name, template_id
-           from portals"
+db_multirow portals get_portals {}
 
-template::query get_portals portals multirow $query 
-
 ad_return_template
-
Index: openacs-4/contrib/packages/portal/www/admin/portal-config-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/admin/Attic/portal-config-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/portal/www/admin/portal-config-2.tcl	25 Oct 2002 21:29:17 -0000	1.1
+++ openacs-4/contrib/packages/portal/www/admin/portal-config-2.tcl	11 Jan 2004 01:08:00 -0000	1.2
@@ -21,14 +21,13 @@
     @author Arjun Sanyal
     @creation-date 9/28/2001
     @cvs_id $Id$
-} { }
+} {
+    portal_id:integer
+    return_url:notnull
+    {anchor ""}
+}
 
-set form [ns_getform]
-set portal_id [ns_set get $form portal_id]
-set return_url [ns_set get $form return_url]
-set anchor [ns_set get $form anchor]
+portal::configure_dispatch -portal_id $portal_id -form [ns_getform]
 
-portal::configure_dispatch -portal_id $portal_id -form $form
-
 ns_returnredirect "portal-config?portal_id=$portal_id&referer=$return_url#$anchor"
 
Index: openacs-4/contrib/packages/portal/www/resources/arrow-down.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/resources/arrow-down.gif,v
diff -u
Binary files differ
Index: openacs-4/contrib/packages/portal/www/resources/arrow-left.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/resources/arrow-left.gif,v
diff -u
Binary files differ
Index: openacs-4/contrib/packages/portal/www/resources/arrow-right.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/resources/arrow-right.gif,v
diff -u
Binary files differ
Index: openacs-4/contrib/packages/portal/www/resources/arrow-up.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/resources/arrow-up.gif,v
diff -u
Binary files differ
Index: openacs-4/contrib/packages/portal/www/resources/delete.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/resources/delete.gif,v
diff -u
Binary files differ
Index: openacs-4/contrib/packages/portal/www/resources/goback.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/resources/goback.gif,v
diff -u
Binary files differ
Index: openacs-4/contrib/packages/portal/www/themes/sloan-theme.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/themes/Attic/sloan-theme.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/portal/www/themes/sloan-theme.adp	25 Oct 2002 21:29:17 -0000	1.1
+++ openacs-4/contrib/packages/portal/www/themes/sloan-theme.adp	11 Jan 2004 01:08:01 -0000	1.2
@@ -25,9 +25,9 @@
 <bold>      <%= [string toupper @name@] %></bold>
   </td>
 </tr>
-<tr><td colspan=3 class="dark-line" height="0"><img src="/graphics/spacer.gif"></td></tr>
+<tr><td colspan=3 class="dark-line" height="0"><img src="/resources/spacer.gif"></td></tr>
 <tr>
-  <td class="light-line" width="1"><img src="/graphics/spacer.gif" width="1"></td>
+  <td class="light-line" width="1"><img src="/resources/spacer.gif" width="1"></td>
   <td class="element-text" width="100%">
 	<table cellspacing="0" cellpadding="0" class="element-content" width="100%">
 	<tr><td>
@@ -47,10 +47,10 @@
 	</tr>
 	</table>
   </td>
-	  <td align="right" class="light-line" width="1"><img src="/graphics/spacer.gif" width="1"></td>
+	  <td align="right" class="light-line" width="1"><img src="/resources/spacer.gif" width="1"></td>
 
 </tr>
-<tr><td colspan=3 class="light-line" width="1"><img src="/graphics/spacer.gif"></td></tr>
+<tr><td colspan=3 class="light-line" width="1"><img src="/resources/spacer.gif"></td></tr>
 </table>
 <!-- Portal Element '@name@' end -->