Index: openacs-4/packages/dotfolio/www/blog-entries.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotfolio/www/blog-entries.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotfolio/www/blog-entries.adp	5 May 2005 08:51:31 -0000	1.1
+++ openacs-4/packages/dotfolio/www/blog-entries.adp	9 May 2005 04:42:18 -0000	1.2
@@ -1,3 +1,8 @@
-<master>
+<master src="resources/main-portal">
+<property name="header_stuff">
+<link rel="stylesheet" type="text/css" href="/resources/dotfolio-ui/dotfolio-grey.css" media="all"/>
+</property>
 
-<listtemplate name="entries"></listtemplate>
\ No newline at end of file
+<center>
+  <listtemplate name="entries"></listtemplate>
+</center>
Index: openacs-4/packages/dotfolio/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotfolio/www/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotfolio/www/index.adp	5 May 2005 08:51:31 -0000	1.1
+++ openacs-4/packages/dotfolio/www/index.adp	9 May 2005 04:42:18 -0000	1.2
@@ -1,31 +1,9 @@
-<master>
+<master src="resources/main-portal">
 <property name="header_stuff">
 <link rel="stylesheet" type="text/css" href="/resources/dotfolio-ui/dotfolio-grey.css" media="all"/>
 </property>
+<property name="options">[<a href="admin/">#dotfolio.admin#</a>]</property>
 
-<P>
-<div class="visualClear"></div>
-
-<table id="portal-columns">
-  <tbody>
-    <tr>
-      <td id="portal-column-content">
-        <div class="visualPadding">
-          <div class="documentBorder">
-            <if @admin_p@ eq "1">
-            <div class="portletOptions">
-              [<a href="admin/">#dotfolio.admin#</a>]
-            </div>
-	    </if>
-            <div class="documentContent">
-	      <center>
-              <listtemplate name="portfolios"></listtemplate>
-	      </center>
-            </div>
-          </div>
-        </div>
-      </td>
-    </tr>
-  </tbody>
-</table>
-
+<center>
+  <listtemplate name="portfolios"></listtemplate>
+</center>
Index: openacs-4/packages/dotfolio/www/admin/dotfolio-admin-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotfolio/www/admin/dotfolio-admin-master.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotfolio/www/admin/dotfolio-admin-master.adp	5 May 2005 08:51:32 -0000	1.1
+++ openacs-4/packages/dotfolio/www/admin/dotfolio-admin-master.adp	9 May 2005 04:42:18 -0000	1.2
@@ -31,6 +31,7 @@
     <else><if @context_bar@ not nil><property name="context">@context_bar;noquote@</property></if></else>
   <if @doc_type@ not nil><property name="doc_type">@doc_type;noquote@</property></if>
   <property name="header_stuff">
+    <link rel="stylesheet" type="text/css" href="/resources/dotfolio-ui/dotfolio-grey.css" media="all"/>
 <style type="text/css">
 /* Re-enable the breadcrumb bar -- useful for site-wide admins */
 #breadcrumbs {
@@ -39,4 +40,21 @@
 </style>
   </property>
 
-<slave>
+<P>
+<div class="visualClear"></div>
+
+<table id="portal-columns">
+  <tbody>
+    <tr>
+      <td id="portal-column-content">
+        <div class="visualPadding">
+          <div class="documentBorder">
+            <div class="documentContent">
+              <slave>
+            </div>
+          </div>
+        </div>
+      </td>
+    </tr>
+  </tbody>
+</table>
Index: openacs-4/packages/dotfolio/www/resources/main-portal.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotfolio/www/resources/main-portal.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotfolio/www/resources/main-portal.adp	9 May 2005 04:42:18 -0000	1.1
@@ -0,0 +1,30 @@
+<master>
+<property name="title">@title@</property>
+<property name="context">@context@</property>
+<property name="header_stuff">
+<link rel="stylesheet" type="text/css" href="/resources/dotfolio-ui/dotfolio-grey.css" media="all"/>
+</property>
+
+<P>
+<div class="visualClear"></div>
+
+<table id="portal-columns">
+  <tbody>
+    <tr>
+      <td id="portal-column-content">
+        <div class="visualPadding">
+          <div class="documentBorder">
+            <if @admin_p@ eq "1">
+            <div class="portletOptions">
+              @options;noquote@
+            </div>
+	    </if>
+            <div class="documentContent">
+              <slave>
+            </div>
+          </div>
+        </div>
+      </td>
+    </tr>
+  </tbody>
+</table>
Index: openacs-4/packages/dotfolio/www/resources/main-portal.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotfolio/www/resources/main-portal.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotfolio/www/resources/main-portal.tcl	9 May 2005 04:42:18 -0000	1.1
@@ -0,0 +1,31 @@
+ad_page_contract {
+
+    Simple portal page featuring a main portlet.
+
+    @author  Nick Carroll (nick.c@rroll.net)
+    @creation-date 2005-03-24
+    @cvs-id  $Id: main-portal.tcl,v 1.1 2005/05/09 04:42:18 ncarroll Exp $
+} {
+
+}
+
+
+if { ![info exists title] } {
+    set title {}
+}
+
+if { ![info exists context] } {
+    set context {}
+}
+
+if { ![info exists header_stuff] } {
+    set header_stuff {}
+}
+
+if { ![info exists options] } {
+    set options {}
+}
+
+set package_id [ad_conn package_id]
+
+set admin_p [ad_permission_p $package_id admin]