Index: openacs-4/packages/dotlrn/www/all-communities.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/all-communities.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/all-communities.adp	6 Mar 2002 05:12:54 -0000	1.6
+++ openacs-4/packages/dotlrn/www/all-communities.adp	15 Mar 2002 23:14:41 -0000	1.7
@@ -1,4 +1,4 @@
-<master>
+<master src="dotlrn-master">
 <property name="context_bar">@context_bar@</property>
 <property name="title">All Communities</property>
 
Index: openacs-4/packages/dotlrn/www/applets.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/applets.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/applets.adp	6 Mar 2002 05:12:54 -0000	1.6
+++ openacs-4/packages/dotlrn/www/applets.adp	15 Mar 2002 23:14:41 -0000	1.7
@@ -1,4 +1,4 @@
-<master>
+<master src="dotlrn-master">
 <property name="title">Manage Applets</property>
 <property name="link_all">1</property>
 <property name="return_url">one-community</property>
Index: openacs-4/packages/dotlrn/www/community-member.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-member.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/community-member.adp	14 Mar 2002 05:40:14 -0000	1.6
+++ openacs-4/packages/dotlrn/www/community-member.adp	15 Mar 2002 23:14:41 -0000	1.7
@@ -1,4 +1,4 @@
-<master>
+<master src="dotlrn-master">
 <property name="title">@first_names@ @last_name@</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/community-type.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-type.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/community-type.adp	28 Jan 2002 21:57:52 -0000	1.5
+++ openacs-4/packages/dotlrn/www/community-type.adp	15 Mar 2002 23:14:41 -0000	1.6
@@ -1,4 +1,4 @@
-<master>
+<master src="dotlrn-master">
 <property name="context_bar">@context_bar@</property>
 <property name="title">dotLRN: @pretty_name@</property>
 <property name="portal_id">@portal_id@</property>
Index: openacs-4/packages/dotlrn/www/community.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/community.adp,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/community.adp	13 Mar 2002 00:12:09 -0000	1.7
+++ openacs-4/packages/dotlrn/www/community.adp	15 Mar 2002 23:14:41 -0000	1.8
@@ -1,4 +1,4 @@
-<master>
+<master src="dotlrn-master">
 <property name="context_bar">@context_bar@</property>
 <property name="title">@pretty_name@</property>
 <property name="portal_id">@portal_id@</property>
Index: openacs-4/packages/dotlrn/www/configure-element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/configure-element.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/configure-element.adp	28 Jan 2002 21:57:52 -0000	1.3
+++ openacs-4/packages/dotlrn/www/configure-element.adp	15 Mar 2002 23:14:41 -0000	1.4
@@ -1,4 +1,4 @@
-<master>
+<master src="dotlrn-master">
 <property name="title">Configure Element</property>
 <property name="portal_id">@portal_id@</property>
 
Index: openacs-4/packages/dotlrn/www/configure.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/configure.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/configure.adp	28 Jan 2002 21:57:52 -0000	1.6
+++ openacs-4/packages/dotlrn/www/configure.adp	15 Mar 2002 23:14:41 -0000	1.7
@@ -1,4 +1,4 @@
-<master>
+<master src="dotlrn-master">
 <property name="title">Configure @name@</property>
 <property name="portal_id">@portal_id@</property>
 <property name="link_all">1</property>
Index: openacs-4/packages/dotlrn/www/dotlrn-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/dotlrn-master.adp	15 Mar 2002 23:14:41 -0000	1.1
@@ -0,0 +1,17 @@
+<master>
+<property name="text">@text@</property>
+
+<!-- Top navbar begin -->
+
+<small>@navbar@</small>
+  
+<!-- Top navbar end -->
+
+<slave>
+
+
+<!-- Bottom navbar begin -->
+
+<small>@navbar@</small>
+
+<!-- bottom navbar end -->
Index: openacs-4/packages/dotlrn/www/dotlrn-master.adp~
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/dotlrn-master.adp~,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/dotlrn-master.adp~	15 Mar 2002 23:14:41 -0000	1.1
@@ -0,0 +1,7 @@
+<master src="sloan-master">
+<property name="community_id">@community_id@</property>
+<property name="text">@text@</property>
+<property name="navbar">@navbar@</property>
+<property name="have_portal_id_p">@have_portal_id_p@</property>
+<property name="portal_id">@portal_id@</property>
+<slave>
Index: openacs-4/packages/dotlrn/www/dotlrn-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/dotlrn-master.tcl	15 Mar 2002 23:14:41 -0000	1.1
@@ -0,0 +1,134 @@
+# /www/dotlrn-master.tcl
+#
+# The dotlrn master template
+# 
+# All adp pages in /dotlrn/www should point to this (local) master
+# template by adding the following line at the top of the adp:
+# 
+# <master src="dotlrn-master">
+#
+# More: This is 1) where the navbar for portal pages gets generated. 
+# Any CUSTOM CODE for your site should be put in
+# " ACS-ROOT/www/site-specific-master"
+# 
+#
+# Author: Arjun Sanyal (arjun@openforce.net)
+#
+# $Id: dotlrn-master.tcl,v 1.1 2002/03/15 23:14:41 arjun Exp $
+#
+
+# here's a bunch of stuff that an adp may optionally set to alter the
+# master's behavior
+
+# portal_id 
+if {[exists_and_not_null portal_id]} {
+    set have_portal_id_p 1
+} else {
+    set have_portal_id_p 0 
+}
+
+# navbar vars
+set show_navbar_p 1
+if {[exists_and_not_null no_navbar_p]} {
+    set show_navbar_p 0
+} 
+
+if {![info exists link_all]} {
+    set link_all 0
+}
+
+if {![info exists return_url]} {
+    set link [ad_conn -get extra_url]
+} else {
+    set link $return_url
+}
+
+if {![info exists show_control_panel]} {
+    set show_control_panel 0
+}
+
+if {![info exists link_control_panel]} {
+    set link_control_panel 1
+}
+
+if {![info exists control_panel_text]} {
+    set control_panel_text "Control Panel"
+}
+
+
+if {[ad_parameter community_level_p] == 1} {
+    # in a community
+    set community_id [dotlrn_community::get_community_id]
+
+    # The header text is the name of the community
+    set text [dotlrn_community::get_community_header_name $community_id] 
+
+    if { $have_portal_id_p && $show_navbar_p } {
+        if {$show_control_panel} {
+            if {$link_control_panel} {
+                set extra_td_html " &nbsp; <a href=one-community-admin> $control_panel_text</a>"
+            } else {
+                set extra_td_html " &nbsp; $control_panel_text"
+            }
+        } else {
+            # don't show control panel
+            set extra_td_html ""
+        }
+            
+        set navbar [portal::navbar \
+                -portal_id $portal_id \
+                -link_all $link_all \
+                -link $link \
+                -pre_html "" \
+                -post_html "" \
+                -extra_td_html $extra_td_html \
+                -table_html_args "class=\"navbar\""]
+    } else {
+        set navbar "<br>"
+        set portal_id ""
+    }
+} elseif {[ad_parameter community_type_level_p] == 1} {
+    # in a community type
+    set text \
+            [dotlrn_community::get_community_type_name [dotlrn_community::get_community_type]]
+    
+    if {$have_portal_id_p && $show_navbar_p} {
+        
+        set navbar [portal::navbar \
+                -portal_id $portal_id \
+                -link_all $link_all \
+                -link $link \
+                -pre_html "" \
+                -post_html "" \
+                -extra_td_html $extra_td_html \
+                -table_html_args "class=\"navbar\""]
+    } else {
+        set navbar "<br>"
+        set portal_id ""
+    }
+ 
+} else {
+    # under /dotlrn
+    set community_id ""
+    set text ""
+    
+    if {$have_portal_id_p && $show_navbar_p} {
+        if {$link_control_panel} {
+            set extra_td_html " &nbsp; <a href=preferences>Control Panel</a>"
+        } else {
+            set extra_td_html " &nbsp; Control Panel"
+        }
+
+        set navbar [portal::navbar \
+                -portal_id $portal_id \
+                -link_all $link_all \
+                -link $link \
+                -pre_html "" \
+                -post_html "" \
+                -extra_td_html $extra_td_html  \
+                -table_html_args "class=\"navbar\""]
+    } else {
+        set navbar "<br>"
+        set portal_id ""
+    }
+}
Index: openacs-4/packages/dotlrn/www/dotlrn-master.tcl~
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/dotlrn-master.tcl~,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/dotlrn-master.tcl~	15 Mar 2002 23:14:41 -0000	1.1
@@ -0,0 +1,135 @@
+# /www/dotlrn-master.tcl
+#
+# The dotlrn master template
+# 
+# All adp pages in /dotlrn/www should point to this (local) master
+# template by adding the following line at the top of the adp:
+# 
+# <master src="dotlrn-master">
+#
+# More: This is 1) where the navbar for portal pages gets generated. 
+# Any CUSTOM CODE for your site should be put in
+# " ACS-ROOT/www/site-specific-master"
+# 
+#
+# Author: Arjun Sanyal (arjun@openforce.net)
+#
+# $Id: dotlrn-master.tcl~,v 1.1 2002/03/15 23:14:41 arjun Exp $
+#
+
+
+# here's a bunch of stuff that an adp may optionally set to alter the
+# master's behavior
+
+# portal_id 
+if {[exists_and_not_null portal_id]} {
+    set have_portal_id_p 1
+} else {
+    set have_portal_id_p 0 
+}
+
+# navbar vars
+set show_navbar_p 1
+if {[exists_and_not_null no_navbar_p]} {
+    set show_navbar_p 0
+} 
+
+if {![info exists link_all]} {
+    set link_all 0
+}
+
+if {![info exists return_url]} {
+    set link [ad_conn -get extra_url]
+} else {
+    set link $return_url
+}
+
+if {![info exists show_control_panel]} {
+    set show_control_panel 0
+}
+
+if {![info exists link_control_panel]} {
+    set link_control_panel 1
+}
+
+if {![info exists control_panel_text]} {
+    set control_panel_text "Control Panel"
+}
+
+
+if {[ad_parameter community_level_p] == 1} {
+    # in a community
+    set community_id [dotlrn_community::get_community_id]
+
+    # The header text is the name of the community
+    set text [dotlrn_community::get_community_header_name $community_id] 
+
+    if { $have_portal_id_p && $show_navbar_p } {
+        if {$show_control_panel} {
+            if {$link_control_panel} {
+                set extra_td_html " &nbsp; <a href=one-community-admin> $control_panel_text</a>"
+            } else {
+                set extra_td_html " &nbsp; $control_panel_text"
+            }
+        } else {
+            # don't show control panel
+            set extra_td_html ""
+        }
+            
+        set navbar [portal::navbar \
+                -portal_id $portal_id \
+                -link_all $link_all \
+                -link $link \
+                -pre_html "" \
+                -post_html "" \
+                -extra_td_html $extra_td_html \
+                -table_html_args "class=\"navbar\""]
+    } else {
+        set navbar "<br>"
+        set portal_id ""
+    }
+} elseif {[ad_parameter community_type_level_p] == 1} {
+    # in a community type
+    set text \
+            [dotlrn_community::get_community_type_name [dotlrn_community::get_community_type]]
+    
+    if {$have_portal_id_p && $show_navbar_p} {
+        
+        set navbar [portal::navbar \
+                -portal_id $portal_id \
+                -link_all $link_all \
+                -link $link \
+                -pre_html "" \
+                -post_html "" \
+                -extra_td_html $extra_td_html \
+                -table_html_args "class=\"navbar\""]
+    } else {
+        set navbar "<br>"
+        set portal_id ""
+    }
+ 
+} else {
+    # under /dotlrn
+    set community_id ""
+    set text ""
+    
+    if {$have_portal_id_p && $show_navbar_p} {
+        if {$link_control_panel} {
+            set extra_td_html " &nbsp; <a href=preferences>Control Panel</a>"
+        } else {
+            set extra_td_html " &nbsp; Control Panel"
+        }
+
+        set navbar [portal::navbar \
+                -portal_id $portal_id \
+                -link_all $link_all \
+                -link $link \
+                -pre_html "" \
+                -post_html "" \
+                -extra_td_html $extra_td_html  \
+                -table_html_args "class=\"navbar\""]
+    } else {
+        set navbar "<br>"
+        set portal_id ""
+    }
+}
Index: openacs-4/packages/dotlrn/www/help.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/help.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/help.adp	28 Jan 2002 21:57:52 -0000	1.2
+++ openacs-4/packages/dotlrn/www/help.adp	15 Mar 2002 23:14:41 -0000	1.3
@@ -1,4 +1,4 @@
-<master>
+<master src="dotlrn-master">
 <property name="title">dotLRN Help</property>
 
 This page will eventually include help
Index: openacs-4/packages/dotlrn/www/index-not-a-user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/index-not-a-user.adp,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/dotlrn/www/index-not-a-user.adp	13 Mar 2002 18:36:59 -0000	1.9
+++ openacs-4/packages/dotlrn/www/index-not-a-user.adp	15 Mar 2002 23:14:41 -0000	1.10
@@ -1,4 +1,4 @@
-<master>
+<master src="dotlrn-master">
 <property name="title">dotLRN - Not a User</property>
 
 <if @admin_p@ ne 0><p>Visit <a href=@admin_url@>dotLRN Administration</a>.</p></if>
Index: openacs-4/packages/dotlrn/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/index.adp,v
diff -u -N -r1.17 -r1.18
--- openacs-4/packages/dotlrn/www/index.adp	14 Mar 2002 06:47:58 -0000	1.17
+++ openacs-4/packages/dotlrn/www/index.adp	15 Mar 2002 23:14:41 -0000	1.18
@@ -1,4 +1,4 @@
-<master>
+<master src="dotlrn-master">
 <property name="title">dotLRN</property>
 <property name="portal_id">@portal_id@</property>
 
Index: openacs-4/packages/dotlrn/www/manage-memberships.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/manage-memberships.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/manage-memberships.adp	14 Mar 2002 05:40:14 -0000	1.4
+++ openacs-4/packages/dotlrn/www/manage-memberships.adp	15 Mar 2002 23:14:41 -0000	1.5
@@ -16,7 +16,7 @@
 
 -->
 
-<master>
+<master src="dotlrn-master">
 <property name="title">Manage Memberships</property>
 <property name="context_bar">Manage Memberships</property>
 
Index: openacs-4/packages/dotlrn/www/member-add-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-add-2.adp,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/member-add-2.adp	28 Jan 2002 21:57:52 -0000	1.7
+++ openacs-4/packages/dotlrn/www/member-add-2.adp	15 Mar 2002 23:14:41 -0000	1.8
@@ -1,4 +1,4 @@
-<master>
+<master src="dotlrn-master">
 <property name="title">Add A Member To A Community</property>
 
 You're adding <strong>@first_names@ @last_name@ (@email@)</strong>:<p>
Index: openacs-4/packages/dotlrn/www/member-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-add.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/member-add.adp	28 Jan 2002 21:57:52 -0000	1.6
+++ openacs-4/packages/dotlrn/www/member-add.adp	15 Mar 2002 23:14:41 -0000	1.7
@@ -1,4 +1,4 @@
-<master>
+<master src="dotlrn-master">
 <property name="title">Add A Member To A Community</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/members.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.adp,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/dotlrn/www/members.adp	14 Mar 2002 23:48:27 -0000	1.9
+++ openacs-4/packages/dotlrn/www/members.adp	15 Mar 2002 23:14:41 -0000	1.10
@@ -1,4 +1,4 @@
-<master>
+<master src="dotlrn-master">
 <property name="title">Manage Membership</property>
 <property name="link_all">1</property>
 <property name="return_url">one-community</property>
Index: openacs-4/packages/dotlrn/www/not-allowed.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/not-allowed.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/not-allowed.adp	28 Jan 2002 21:57:52 -0000	1.4
+++ openacs-4/packages/dotlrn/www/not-allowed.adp	15 Mar 2002 23:14:41 -0000	1.5
@@ -1,4 +1,4 @@
-<master>
+<master src="dotlrn-master">
 <property name="title">Not Allowed</property>
 <property name="portal_id"></property>
 
Index: openacs-4/packages/dotlrn/www/one-community-admin.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-admin.adp,v
diff -u -N -r1.18 -r1.19
--- openacs-4/packages/dotlrn/www/one-community-admin.adp	6 Mar 2002 22:35:15 -0000	1.18
+++ openacs-4/packages/dotlrn/www/one-community-admin.adp	15 Mar 2002 23:14:41 -0000	1.19
@@ -1,4 +1,4 @@
-<master>
+<master src="dotlrn-master">
 <property name="context_bar">@context_bar@</property>
 <property name="title">@pretty_name@ Admin</property>
 <property name="portal_id">@portal_id@</property>
Index: openacs-4/packages/dotlrn/www/one-community-not-member.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/one-community-not-member.adp,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/dotlrn/www/one-community-not-member.adp	6 Mar 2002 18:11:23 -0000	1.13
+++ openacs-4/packages/dotlrn/www/one-community-not-member.adp	15 Mar 2002 23:14:41 -0000	1.14
@@ -1,4 +1,4 @@
-<master>
+<master src="dotlrn-master">
 <property name="context_bar">@context_bar@</property>
 <property name="pretext">@pretext@</property>
 <property name="portal_id">@portal_id@</property>
Index: openacs-4/packages/dotlrn/www/one-community-portal-template.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/one-community-portal-template.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/one-community-portal-template.adp	28 Jan 2002 21:57:52 -0000	1.4
+++ openacs-4/packages/dotlrn/www/one-community-portal-template.adp	15 Mar 2002 23:14:41 -0000	1.5
@@ -1,4 +1,4 @@
-<master>
+<master src="dotlrn-master">
 <property name="title">Configure this instance's template</property>
 <property name="portal_id">@portal_id@</property>
 <property name="no_navbar_p">t</property>
Index: openacs-4/packages/dotlrn/www/one-community-type.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-type.adp,v
diff -u -N -r1.19 -r1.20
--- openacs-4/packages/dotlrn/www/one-community-type.adp	28 Jan 2002 21:57:52 -0000	1.19
+++ openacs-4/packages/dotlrn/www/one-community-type.adp	15 Mar 2002 23:14:41 -0000	1.20
@@ -1,4 +1,4 @@
-<master>
+<master src="dotlrn-master">
 <property name="context_bar">@context_bar@</property>
 <property name="title">@title@</property>
 
Index: openacs-4/packages/dotlrn/www/one-community.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community.adp,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/dotlrn/www/one-community.adp	6 Mar 2002 18:11:23 -0000	1.15
+++ openacs-4/packages/dotlrn/www/one-community.adp	15 Mar 2002 23:14:41 -0000	1.16
@@ -1,4 +1,4 @@
-<master>
+<master src="dotlrn-master">
 <property name="pretext">@pretext@</property>
 <property name="portal_id">@portal_id@</property>
 <property name="show_control_panel">@admin_p@</property>
Index: openacs-4/packages/dotlrn/www/preferences.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/preferences.adp,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/preferences.adp	11 Mar 2002 23:19:16 -0000	1.8
+++ openacs-4/packages/dotlrn/www/preferences.adp	15 Mar 2002 23:14:41 -0000	1.9
@@ -1,4 +1,4 @@
-<master>
+<master src="dotlrn-master">
 <property name="title">@title@</property>
 <property name="portal_id">@portal_id@</property>
 <property name="link_all">1</property>
Index: openacs-4/packages/dotlrn/www/spam.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam.adp,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/dotlrn/www/spam.adp	14 Mar 2002 05:40:14 -0000	1.9
+++ openacs-4/packages/dotlrn/www/spam.adp	15 Mar 2002 23:14:41 -0000	1.10
@@ -1,4 +1,4 @@
-<master>
+<master src="dotlrn-master">
 <property name="title">Spam Community</property>
 <property name="context_bar">@context_bar@</property>
 <property name="portal_id">@portal_id@</property>
Index: openacs-4/packages/dotlrn/www/subcommunity-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/subcommunity-new.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/subcommunity-new.adp	14 Mar 2002 23:49:04 -0000	1.2
+++ openacs-4/packages/dotlrn/www/subcommunity-new.adp	15 Mar 2002 23:14:41 -0000	1.3
@@ -1,4 +1,4 @@
-<master>
+<master src="dotlrn-master">
 <property name="title">@title@</property>
 <property name="portal_id">@admin_portal_id@</property>
 <property name="show_control_panel">1</property>
Index: openacs-4/packages/dotlrn/www/user-add-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add-2.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/user-add-2.adp	31 Jan 2002 17:08:09 -0000	1.5
+++ openacs-4/packages/dotlrn/www/user-add-2.adp	15 Mar 2002 23:14:41 -0000	1.6
@@ -1,4 +1,4 @@
-<master>
+<master src="dotlrn-master">
 <property name="title">Add A User</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/user-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/user-add.adp	28 Jan 2002 21:57:52 -0000	1.4
+++ openacs-4/packages/dotlrn/www/user-add.adp	15 Mar 2002 23:14:41 -0000	1.5
@@ -1,4 +1,4 @@
-<master>
+<master src="dotlrn-master">
 <property name="title">Add A User</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/add-instructor-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/add-instructor-2.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/admin/add-instructor-2.adp	10 Jan 2002 21:19:32 -0000	1.1
+++ openacs-4/packages/dotlrn/www/admin/add-instructor-2.adp	15 Mar 2002 23:14:41 -0000	1.2
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">dotLRN Admin</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/add-instructor.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/add-instructor.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/admin/add-instructor.adp	19 Feb 2002 19:34:45 -0000	1.3
+++ openacs-4/packages/dotlrn/www/admin/add-instructor.adp	15 Mar 2002 23:14:41 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">dotLRN Admin</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/class-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-edit.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/admin/class-edit.adp	14 Mar 2002 23:30:26 -0000	1.1
+++ openacs-4/packages/dotlrn/www/admin/class-edit.adp	15 Mar 2002 23:14:41 -0000	1.2
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">@title@</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/class-instance-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-instance-new.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/admin/class-instance-new.adp	13 Mar 2002 18:06:32 -0000	1.6
+++ openacs-4/packages/dotlrn/www/admin/class-instance-new.adp	15 Mar 2002 23:14:41 -0000	1.7
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">New @class_instances_pretty_name@ of type @class_name@</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/class-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-new.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/admin/class-new.adp	15 Jan 2002 20:47:01 -0000	1.5
+++ openacs-4/packages/dotlrn/www/admin/class-new.adp	15 Mar 2002 23:14:41 -0000	1.6
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">@title@</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/class.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class.adp,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/dotlrn/www/admin/class.adp	14 Mar 2002 23:30:26 -0000	1.13
+++ openacs-4/packages/dotlrn/www/admin/class.adp	15 Mar 2002 23:14:41 -0000	1.14
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">@pretty_name@</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/classes.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes.adp,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/dotlrn/www/admin/classes.adp	22 Jan 2002 23:04:48 -0000	1.9
+++ openacs-4/packages/dotlrn/www/admin/classes.adp	15 Mar 2002 23:14:41 -0000	1.10
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">@title@</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/club-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/club-new.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/admin/club-new.adp	15 Jan 2002 20:47:02 -0000	1.4
+++ openacs-4/packages/dotlrn/www/admin/club-new.adp	15 Mar 2002 23:14:41 -0000	1.5
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">@title@</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/club.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/club.adp,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/admin/club.adp	7 Mar 2002 19:02:38 -0000	1.7
+++ openacs-4/packages/dotlrn/www/admin/club.adp	15 Mar 2002 23:14:41 -0000	1.8
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">@pretty_name@</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/clubs.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/clubs.adp,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/dotlrn/www/admin/clubs.adp	15 Mar 2002 02:27:21 -0000	1.11
+++ openacs-4/packages/dotlrn/www/admin/clubs.adp	15 Mar 2002 23:14:41 -0000	1.12
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">@title@</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/department-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department-edit.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/admin/department-edit.adp	14 Mar 2002 23:30:26 -0000	1.1
+++ openacs-4/packages/dotlrn/www/admin/department-edit.adp	15 Mar 2002 23:14:41 -0000	1.2
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">@title@</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/department-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department-new.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/admin/department-new.adp	22 Jan 2002 00:13:09 -0000	1.1
+++ openacs-4/packages/dotlrn/www/admin/department-new.adp	15 Mar 2002 23:14:41 -0000	1.2
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">@title@</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/department.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/admin/department.adp	14 Mar 2002 23:30:26 -0000	1.4
+++ openacs-4/packages/dotlrn/www/admin/department.adp	15 Mar 2002 23:14:41 -0000	1.5
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">@pretty_name@</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/departments.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/departments.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/admin/departments.adp	15 Mar 2002 02:27:21 -0000	1.6
+++ openacs-4/packages/dotlrn/www/admin/departments.adp	15 Mar 2002 23:14:41 -0000	1.7
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">@title@</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/edit-preapproved-emails.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/edit-preapproved-emails.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/admin/edit-preapproved-emails.adp	8 Mar 2002 21:39:34 -0000	1.3
+++ openacs-4/packages/dotlrn/www/admin/edit-preapproved-emails.adp	15 Mar 2002 23:14:41 -0000	1.4
@@ -16,7 +16,7 @@
 
 -->
 
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">Edit Pre-approved Email Servers</property>
 <property name="context_bar">{Edit Pre-approved Email Servers}</property>
 
Index: openacs-4/packages/dotlrn/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/index.adp,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/dotlrn/www/admin/index.adp	14 Mar 2002 23:30:26 -0000	1.12
+++ openacs-4/packages/dotlrn/www/admin/index.adp	15 Mar 2002 23:14:41 -0000	1.13
@@ -4,7 +4,7 @@
   @version $Id$
 -->
 
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">dotLRN Admin</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/term-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term-edit.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/admin/term-edit.adp	14 Mar 2002 23:30:26 -0000	1.1
+++ openacs-4/packages/dotlrn/www/admin/term-edit.adp	15 Mar 2002 23:14:41 -0000	1.2
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">Edit Term</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/term-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term-new.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/term-new.adp	11 Jan 2002 06:33:26 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/term-new.adp	15 Mar 2002 23:14:41 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">New Term</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/term.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/admin/term.adp	14 Mar 2002 23:30:26 -0000	1.6
+++ openacs-4/packages/dotlrn/www/admin/term.adp	15 Mar 2002 23:14:41 -0000	1.7
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">@title@</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/terms.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/terms.adp,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/admin/terms.adp	15 Mar 2002 02:27:21 -0000	1.8
+++ openacs-4/packages/dotlrn/www/admin/terms.adp	15 Mar 2002 23:14:41 -0000	1.9
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">Terms</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/user-edit-verify.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-edit-verify.adp,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/admin/user-edit-verify.adp	8 Feb 2002 20:50:57 -0000	1.7
+++ openacs-4/packages/dotlrn/www/admin/user-edit-verify.adp	15 Mar 2002 23:14:41 -0000	1.8
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">Edit a User</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/user-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-edit.adp,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/admin/user-edit.adp	8 Feb 2002 20:50:57 -0000	1.7
+++ openacs-4/packages/dotlrn/www/admin/user-edit.adp	15 Mar 2002 23:14:41 -0000	1.8
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">Edit a User</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/user-new-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-new-2.adp,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/dotlrn/www/admin/user-new-2.adp	8 Feb 2002 20:50:57 -0000	1.11
+++ openacs-4/packages/dotlrn/www/admin/user-new-2.adp	15 Mar 2002 23:14:41 -0000	1.12
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">Add a User</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/user-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-new.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/admin/user-new.adp	11 Jan 2002 06:33:26 -0000	1.5
+++ openacs-4/packages/dotlrn/www/admin/user-new.adp	15 Mar 2002 23:14:41 -0000	1.6
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">Add a User</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/user.adp	14 Mar 2002 05:47:59 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/user.adp	15 Mar 2002 23:14:41 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">@first_names@ @last_name@</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/users-add-to-community.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-add-to-community.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/admin/users-add-to-community.adp	14 Feb 2002 18:03:07 -0000	1.1
+++ openacs-4/packages/dotlrn/www/admin/users-add-to-community.adp	15 Mar 2002 23:14:41 -0000	1.2
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">Add Users to Community</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/users-bulk-upload.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-bulk-upload.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/admin/users-bulk-upload.adp	12 Mar 2002 05:25:58 -0000	1.3
+++ openacs-4/packages/dotlrn/www/admin/users-bulk-upload.adp	15 Mar 2002 23:14:41 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">Users: Bulk Upload</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/users-deactivate.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-deactivate.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/admin/users-deactivate.adp	6 Mar 2002 00:08:02 -0000	1.1
+++ openacs-4/packages/dotlrn/www/admin/users-deactivate.adp	15 Mar 2002 23:14:41 -0000	1.2
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">Deactivate Users</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/users-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-delete.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/users-delete.adp	6 Mar 2002 00:08:02 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/users-delete.adp	15 Mar 2002 23:14:41 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">Nuke Users</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/users-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-search.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/users-search.adp	15 Mar 2002 02:06:48 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/users-search.adp	15 Mar 2002 23:14:41 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">Users Search</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/users-spam.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-spam.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/users-spam.adp	14 Mar 2002 05:40:14 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/users-spam.adp	15 Mar 2002 23:14:41 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">Spam Users</property>
 <property name="context_bar">@context_bar@</property>
 
Index: openacs-4/packages/dotlrn/www/admin/users.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users.adp,v
diff -u -N -r1.18 -r1.19
--- openacs-4/packages/dotlrn/www/admin/users.adp	13 Mar 2002 00:12:09 -0000	1.18
+++ openacs-4/packages/dotlrn/www/admin/users.adp	15 Mar 2002 23:14:41 -0000	1.19
@@ -1,4 +1,4 @@
-<master src="master">
+<master src="dotlrn-admin-master">
 <property name="title">Users</property>
 <property name="context_bar">@context_bar@</property>