Index: openacs-4/packages/dotfolio/dotfolio.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotfolio/dotfolio.info,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotfolio/dotfolio.info	9 Jun 2005 12:10:40 -0000	1.2
+++ openacs-4/packages/dotfolio/dotfolio.info	23 Jun 2005 01:38:48 -0000	1.3
@@ -8,15 +8,15 @@
     <singleton-p>f</singleton-p>
     <auto-mount>dotfolio</auto-mount>
     
-    <version name="0.1d" url="http://openacs.org/repository/download/apm/dotfolio-0.1d.apm">
+    <version name="0.2" url="http://openacs.org/repository/download/apm/dotfolio-0.2.apm">
         <owner url="mailto:nick.c@rroll.net">Nick Carroll</owner>
         <summary>dotFOLIO is an ePortfolio application.</summary>
         <vendor url="http://www.weg.ee.usyd.edu.au">WEG</vendor>
         <description format="text/html">dotFOLIO is used to administer ePortfolio spaces mounted as subsites.</description>
 
         <!-- No dependency information -->
-	<provides url="dotfolio" version="0.1d"/>
-        <requires url="dotfolio-ui" version="0.1d"/>	
+	<provides url="dotfolio" version="0.2"/>
+        <requires url="dotfolio-ui" version="0.2"/>	
         <requires url="acs-kernel" version="5.2.0d2"/>
 	<requires url="lars-blogger" version="2.1.1"/>
 	<requires url="file-storage" version="5.1.0a15"/>
@@ -31,6 +31,8 @@
 
         <parameters>
 	  <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="show_portrait_p"  default="1" description="Should we show and solicit user portraits? 1=Yes, 0=No"/>
+          <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DotfolioCSS"  default="/resources/dotfolio-ui/dotfolio-grey.css" description="Specify the location of a CSS file to use for dotFOLIO's colour scheme." section_name="Colour Scheme"/>
+          <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultPortrait"  default="/resources/dotfolio-ui/blank_portrait.jpg" description="Specify the location of the default portrait image."/>
         </parameters>
 
     </version>
Index: openacs-4/packages/dotfolio/tcl/dotfolio-apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotfolio/tcl/dotfolio-apm-callback-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotfolio/tcl/dotfolio-apm-callback-procs.tcl	14 May 2005 14:27:44 -0000	1.2
+++ openacs-4/packages/dotfolio/tcl/dotfolio-apm-callback-procs.tcl	23 Jun 2005 01:38:49 -0000	1.3
@@ -21,6 +21,11 @@
 	parameter::set_from_package_key -package_key "acs-kernel" \
 	                                -parameter "UseEmailForLoginP" \
 	                                -value "0"
+
+	# Do not allow self-register
+	parameter::set_from_package_key -package_key "acs-authentication" \
+	    -parameter "AllowSelfRegister" \
+	    -value "0"
     }
 
-}
\ No newline at end of file
+}
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.2 -r1.3
--- openacs-4/packages/dotfolio/www/blog-entries.adp	9 May 2005 04:42:18 -0000	1.2
+++ openacs-4/packages/dotfolio/www/blog-entries.adp	23 Jun 2005 01:38:49 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="resources/main-portal">
 <property name="header_stuff">
-<link rel="stylesheet" type="text/css" href="/resources/dotfolio-ui/dotfolio-grey.css" media="all"/>
+<link rel="stylesheet" type="text/css" href="@dotfolioCSS@" media="all"/>
 </property>
 
 <center>
Index: openacs-4/packages/dotfolio/www/blog-entries.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotfolio/www/blog-entries.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotfolio/www/blog-entries.tcl	5 May 2005 08:51:31 -0000	1.1
+++ openacs-4/packages/dotfolio/www/blog-entries.tcl	23 Jun 2005 01:38:49 -0000	1.2
@@ -13,6 +13,9 @@
 
 set user_id [auth::require_login]
 
+set dotfolioCSS [parameter::get_from_package_key -parameter "DotfolioCSS" \
+                     -package_key "dotfolio"]
+
 set elements {
     title {
 	label {Title}
Index: openacs-4/packages/dotfolio/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotfolio/www/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotfolio/www/index.adp	9 May 2005 04:42:18 -0000	1.2
+++ openacs-4/packages/dotfolio/www/index.adp	23 Jun 2005 01:38:49 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="resources/main-portal">
 <property name="header_stuff">
-<link rel="stylesheet" type="text/css" href="/resources/dotfolio-ui/dotfolio-grey.css" media="all"/>
+<link rel="stylesheet" type="text/css" href="@dotfolioCSS@" media="all"/>
 </property>
 <property name="options">[<a href="admin/">#dotfolio.admin#</a>]</property>
 
Index: openacs-4/packages/dotfolio/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotfolio/www/index.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotfolio/www/index.tcl	9 Jun 2005 12:15:44 -0000	1.4
+++ openacs-4/packages/dotfolio/www/index.tcl	23 Jun 2005 01:38:49 -0000	1.5
@@ -70,4 +70,7 @@
     set blog_entries_url [export_vars -url -base {blog-entries} {owner_id url}]
 }
 
+set dotfolioCSS [parameter::get_from_package_key -parameter "DotfolioCSS" \
+                     -package_key "dotfolio"]
+
 ad_return_template
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.2 -r1.3
--- openacs-4/packages/dotfolio/www/admin/dotfolio-admin-master.adp	9 May 2005 04:42:18 -0000	1.2
+++ openacs-4/packages/dotfolio/www/admin/dotfolio-admin-master.adp	23 Jun 2005 01:38:49 -0000	1.3
@@ -31,7 +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"/>
+    <link rel="stylesheet" type="text/css" href="@dotfolioCSS@" media="all"/>
 <style type="text/css">
 /* Re-enable the breadcrumb bar -- useful for site-wide admins */
 #breadcrumbs {
Index: openacs-4/packages/dotfolio/www/admin/dotfolio-admin-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotfolio/www/admin/dotfolio-admin-master.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotfolio/www/admin/dotfolio-admin-master.tcl	23 Jun 2005 01:39:53 -0000	1.1
@@ -0,0 +1,31 @@
+#
+#  Copyright (C) 2005 Nick Carroll
+#
+#  This file is part of dotFOLIO.
+#
+#  dotFOLIO 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.
+#
+#  dotFOLIO 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.
+#
+
+ad_page_contract {
+    Master template for dotfolio admin.
+
+    @author Nick Carroll (ncarroll@ee.usyd.edu.au)
+    @creation-date 2005-01-01
+    @version $Id: dotfolio-admin-master.tcl,v 1.1 2005/06/23 01:39:53 ncarroll Exp $
+}
+
+#Pages in this directory are only runnable by dotfolio-wide admins.
+dotfolio::require_admin
+
+set dotfolioCSS [parameter::get_from_package_key -parameter "DotfolioCSS" \
+                     -package_key "dotfolio"]
+
+ad_return_template
Index: openacs-4/packages/dotfolio/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotfolio/www/admin/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotfolio/www/admin/index.tcl	5 May 2005 08:51:32 -0000	1.1
+++ openacs-4/packages/dotfolio/www/admin/index.tcl	23 Jun 2005 01:38:49 -0000	1.2
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2001, 2002 WEG
+#  Copyright (C) 2005 Nick Carroll
 #
 #  This file is part of dotFOLIO.
 #
@@ -22,9 +22,6 @@
     @version $Id$
 }
 
-#Pages in this directory are only runnable by dotfolio-wide admins.
-dotfolio::require_admin
-
 set context_bar {}
 
 ad_return_template
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 -r1.1 -r1.2
--- openacs-4/packages/dotfolio/www/resources/main-portal.adp	9 May 2005 04:42:18 -0000	1.1
+++ openacs-4/packages/dotfolio/www/resources/main-portal.adp	23 Jun 2005 01:38:14 -0000	1.2
@@ -2,7 +2,7 @@
 <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"/>
+<link rel="stylesheet" type="text/css" href="@dotfolioCSS@" media="all"/>
 </property>
 
 <P>
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 -r1.1 -r1.2
--- openacs-4/packages/dotfolio/www/resources/main-portal.tcl	9 May 2005 04:42:18 -0000	1.1
+++ openacs-4/packages/dotfolio/www/resources/main-portal.tcl	23 Jun 2005 01:38:14 -0000	1.2
@@ -29,3 +29,8 @@
 set package_id [ad_conn package_id]
 
 set admin_p [ad_permission_p $package_id admin]
+
+set dotfolioCSS [parameter::get_from_package_key -parameter "DotfolioCSS" \
+                     -package_key "dotfolio"]
+
+ad_return_template
\ No newline at end of file
Index: openacs-4/packages/dotfolio-ui/dotfolio-ui.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotfolio-ui/dotfolio-ui.info,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotfolio-ui/dotfolio-ui.info	5 May 2005 08:54:42 -0000	1.1
+++ openacs-4/packages/dotfolio-ui/dotfolio-ui.info	23 Jun 2005 01:39:02 -0000	1.2
@@ -7,14 +7,14 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="0.1d" url="http://openacs.org/repository/download/apm/dotfolio-ui-0.1d.apm">
+    <version name="0.2" url="http://openacs.org/repository/download/apm/dotfolio-ui-0.2.apm">
         <owner url="mailto:nick.c@rroll.net">Nick Carroll</owner>
         <summary>User interface for dotFOLIO space.</summary>
         <vendor url="http://www.weg.ee.usyd.edu.au">Web Engineering Group</vendor>
         <description format="text/html">User interface for dotFOLIO space.</description>
         <maturity>0</maturity>
 
-        <provides url="dotfolio-ui" version="0.1d"/>
+        <provides url="dotfolio-ui" version="0.2"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/dotfolio-ui/lib/dotfolio-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotfolio-ui/lib/dotfolio-master.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotfolio-ui/lib/dotfolio-master.adp	3 Jun 2005 03:30:34 -0000	1.2
+++ openacs-4/packages/dotfolio-ui/lib/dotfolio-master.adp	23 Jun 2005 01:39:02 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="/www/site-master">
 <property name="header_stuff">
-<link rel="stylesheet" type="text/css" href="/resources/dotfolio-ui/dotfolio-grey.css" media="all" />
+<link rel="stylesheet" type="text/css" href="@dotfolioCSS@" media="all" />
 </property>
 
 <if @title@ not nil>
Index: openacs-4/packages/dotfolio-ui/lib/dotfolio-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotfolio-ui/lib/dotfolio-master.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotfolio-ui/lib/dotfolio-master.tcl	5 May 2005 08:54:42 -0000	1.1
+++ openacs-4/packages/dotfolio-ui/lib/dotfolio-master.tcl	23 Jun 2005 01:39:02 -0000	1.2
@@ -22,6 +22,9 @@
     set subnavbar_link {}
 }
 
+set dotfolioCSS [parameter::get_from_package_key -parameter "DotfolioCSS" \
+		     -package_key "dotfolio"]
+
 # This will set 'sections' and 'subsections' multirows
 subsite::define_pageflow -section $section
 subsite::get_section_info -array section_info
Index: openacs-4/packages/dotfolio-ui/lib/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotfolio-ui/lib/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotfolio-ui/lib/index.adp	5 Jun 2005 07:32:40 -0000	1.3
+++ openacs-4/packages/dotfolio-ui/lib/index.adp	23 Jun 2005 01:39:02 -0000	1.4
@@ -24,10 +24,10 @@
               </if>
               <else>
                 <if @owner_p@ eq "1">
-                <img onmouseover="this.T_WIDTH=120;this.T_TEMP=3500;return escape('<img src=\'/resources/dotfolio-ui/help.jpg\' alt=\'#dotfolio-ui.help#\' /> #dotfolio-ui.help_edit_portrait#')" class="dotfolioPortrait" src="/resources/dotfolio-ui/blank_portrait.jpg" alt="#dotfolio-ui.portrait#" />
+                <img onmouseover="this.T_WIDTH=120;this.T_TEMP=3500;return escape('<img src=\'/resources/dotfolio-ui/help.jpg\' alt=\'#dotfolio-ui.help#\' /> #dotfolio-ui.help_edit_portrait#')" class="dotfolioPortrait" src="@defaultPortrait@" alt="#dotfolio-ui.portrait#" />
  	        </if>
                 <else>
-                <img class="dotfolioPortrait" src="/resources/dotfolio-ui/blank_portrait.jpg" alt="#dotfolio-ui.portrait#" />
+                <img class="dotfolioPortrait" src="@defaultPortrait@" alt="#dotfolio-ui.portrait#" />
                 </else>
               </else>
               </div>
Index: openacs-4/packages/dotfolio-ui/lib/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotfolio-ui/lib/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotfolio-ui/lib/index.tcl	5 May 2005 08:54:42 -0000	1.1
+++ openacs-4/packages/dotfolio-ui/lib/index.tcl	23 Jun 2005 01:39:02 -0000	1.2
@@ -37,4 +37,8 @@
     set edit_profile_p 1
 }
 
+set defaultPortrait [parameter::get_from_package_key \
+			 -parameter "DefaultPortrait" \
+			 -package_key "dotfolio"]
+
 ad_return_template