Index: openacs-4/packages/new-portal/www/admin/portal-admin-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/admin/portal-admin-master.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/new-portal/www/admin/portal-admin-master.adp	12 Apr 2002 04:12:18 -0000	1.1
@@ -0,0 +1,33 @@
+<%
+    #
+    #  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>
+
+<P>
+Portal: <strong>@name@</strong>
+<P>
+Go to <a href=index>portal admin</a> 
+<if @no_edit_p@ nil>
+  or <a href=portal-config?portal_id=@portal_id@>edit this portal</a>
+</if>
+<if @no_view_p@ nil>
+  or <a href=portal-show?portal_id=@portal_id@>view this portal</a>
+</if>
+<P>
+
+<slave>
Index: openacs-4/packages/new-portal/www/admin/portal-config.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/admin/portal-config.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/new-portal/www/admin/portal-config.adp	2 Apr 2002 07:31:22 -0000	1.3
+++ openacs-4/packages/new-portal/www/admin/portal-config.adp	12 Apr 2002 04:12:18 -0000	1.4
@@ -18,9 +18,10 @@
 
 %>
 
-<master>
-<property name="title">Configure portal: @name@</property>
 
-Configure portal: @name@
+<master src="portal-admin-master">
+<property name=portal_id>@portal_id@</property>
+<property name=name>@name@</property>
+<property name=no_edit_p>1</property>
 
 @rendered_page@
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.4 -r1.5
--- openacs-4/packages/new-portal/www/admin/portal-config.tcl	11 Apr 2002 20:17:53 -0000	1.4
+++ openacs-4/packages/new-portal/www/admin/portal-config.tcl	12 Apr 2002 04:12:18 -0000	1.5
@@ -35,5 +35,4 @@
 }
 
 set rendered_page [portal::configure -template_p $template_p $portal_id "index"]
-
-ad_return_template
+set name [portal::get_name $portal_id]
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 -r1.1 -r1.2
--- openacs-4/packages/new-portal/www/admin/portal-show.adp	11 Apr 2002 20:17:53 -0000	1.1
+++ openacs-4/packages/new-portal/www/admin/portal-show.adp	12 Apr 2002 04:12:18 -0000	1.2
@@ -16,5 +16,8 @@
     #
 %>
 
-<master>
+<master src="portal-admin-master">
+<property name=portal_id>@portal_id@</property>
+<property name=name>@name@</property>
+<property name=no_view_p>1</property>
 @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.3 -r1.4
--- openacs-4/packages/new-portal/www/admin/portal-show.tcl	11 Apr 2002 20:17:53 -0000	1.3
+++ openacs-4/packages/new-portal/www/admin/portal-show.tcl	12 Apr 2002 04:12:18 -0000	1.4
@@ -24,10 +24,11 @@
     @cvs-id $Id$
 } {
     portal_id:naturalnum,notnull
+    {page_num 0}
 }
 
 
+set name "[portal::get_name $portal_id]"
+set html "[portal::navbar -portal_id $portal_id] [portal::render -page_num $page_num $portal_id]"
 
-set html "[portal::navbar -portal_id $portal_id] [portal::render $portal_id]"
 
-