Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v
diff -u -r1.128 -r1.129
--- openacs-4/packages/new-portal/tcl/portal-procs.tcl	10 Apr 2002 22:13:14 -0000	1.128
+++ openacs-4/packages/new-portal/tcl/portal-procs.tcl	11 Apr 2002 20:17:52 -0000	1.129
@@ -132,7 +132,7 @@
 
     ad_proc -public  automount_point {} {
         packages such as dotlrn can automount the portal here
-    } { return "/portal"  }
+    } { return "portal"  }
 
     #
     # Main portal procs
@@ -1411,8 +1411,6 @@
         @param portal_id
         @param ds_id
     } {
-        # XXX todo permissions on availabliliy procs
-        # ad_require_permission $portal_id portal_admin_portal
         set new_p_ds_id [db_nextval acs_object_id_seq]
         db_dml insert {} 
     }
Index: openacs-4/packages/new-portal/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/admin/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/new-portal/www/admin/index.adp	2 Apr 2002 07:31:22 -0000	1.3
+++ openacs-4/packages/new-portal/www/admin/index.adp	11 Apr 2002 20:17:53 -0000	1.4
@@ -18,7 +18,7 @@
 
 %>
 
-<master src="@master_template@">
+<master>
 <property name="title">Welcome to Portals</property>
 
 Portals in the system:
Index: openacs-4/packages/new-portal/www/admin/portal-config.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/admin/portal-config.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/new-portal/www/admin/portal-config.tcl	2 Apr 2002 07:31:22 -0000	1.3
+++ openacs-4/packages/new-portal/www/admin/portal-config.tcl	11 Apr 2002 20:17:53 -0000	1.4
@@ -26,13 +26,14 @@
     portal_id:naturalnum,notnull
 }
 
-# Get the portal's name for the title
-set name [portal::get_name $portal_id]
+set name ""
 
-ad_return_complaint 1 "foo [portal::get_name $portal_id]/$name/$portal_id"
+if {[portal::template_p $portal_id]} {
+    set template_p "t"
+} else {
+    set template_p "f"
+}
 
-ad_script_abort
+set rendered_page [portal::configure -template_p $template_p $portal_id "index"]
 
-set rendered_page [portal::configure $portal_id "index.tcl"]
-
 ad_return_template
Index: openacs-4/packages/new-portal/www/admin/portal-show.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/admin/portal-show.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/new-portal/www/admin/portal-show.adp	11 Apr 2002 20:17:53 -0000	1.1
@@ -0,0 +1,20 @@
+<%
+    #
+    #  Copyright (C) 2001, 2002 OpenForce, Inc.
+    #
+    #  This file is part of dotLRN.
+    #
+    #  dotLRN is free software; you can redistribute it and/or modify it under the
+    #  terms of the GNU General Public License as published by the Free Software
+    #  Foundation; either version 2 of the License, or (at your option) any later
+    #  version.
+    #
+    #  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+    #  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    #  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    #  details.
+    #
+%>
+
+<master>
+@html@
Index: openacs-4/packages/new-portal/www/admin/portal-show.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/admin/portal-show.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/new-portal/www/admin/portal-show.tcl	29 Mar 2002 18:48:29 -0000	1.2
+++ openacs-4/packages/new-portal/www/admin/portal-show.tcl	11 Apr 2002 20:17:53 -0000	1.3
@@ -28,6 +28,6 @@
 
 
 
-ns_return 200 text/html [portal::render $portal_id]
+set html "[portal::navbar -portal_id $portal_id] [portal::render $portal_id]"