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.4 -r1.5
--- openacs-4/packages/dotlrn/www/all-communities.adp	23 Jan 2002 01:54:13 -0000	1.4
+++ openacs-4/packages/dotlrn/www/all-communities.adp	28 Jan 2002 21:57:52 -0000	1.5
@@ -1,4 +1,4 @@
-<master src="master">
+<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.4 -r1.5
--- openacs-4/packages/dotlrn/www/applets.adp	23 Jan 2002 07:41:04 -0000	1.4
+++ openacs-4/packages/dotlrn/www/applets.adp	28 Jan 2002 21:57:52 -0000	1.5
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Manage Applets</property>
 <property name="context_bar">@context_bar@</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.3 -r1.4
--- openacs-4/packages/dotlrn/www/community-member.adp	23 Jan 2002 07:41:04 -0000	1.3
+++ openacs-4/packages/dotlrn/www/community-member.adp	28 Jan 2002 21:57:52 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<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.4 -r1.5
--- openacs-4/packages/dotlrn/www/community-type.adp	21 Jan 2002 06:30:11 -0000	1.4
+++ openacs-4/packages/dotlrn/www/community-type.adp	28 Jan 2002 21:57:52 -0000	1.5
@@ -1,4 +1,4 @@
-<master src="master">
+<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.5 -r1.6
--- openacs-4/packages/dotlrn/www/community.adp	21 Jan 2002 06:30:11 -0000	1.5
+++ openacs-4/packages/dotlrn/www/community.adp	28 Jan 2002 21:57:52 -0000	1.6
@@ -1,4 +1,4 @@
-<master src="master">
+<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.2 -r1.3
--- openacs-4/packages/dotlrn/www/configure-element.adp	21 Jan 2002 06:30:11 -0000	1.2
+++ openacs-4/packages/dotlrn/www/configure-element.adp	28 Jan 2002 21:57:52 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<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.5 -r1.6
--- openacs-4/packages/dotlrn/www/configure.adp	25 Jan 2002 19:58:29 -0000	1.5
+++ openacs-4/packages/dotlrn/www/configure.adp	28 Jan 2002 21:57:52 -0000	1.6
@@ -1,4 +1,4 @@
-<master src="master">
+<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/help.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/help.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/help.adp	23 Jan 2002 01:14:47 -0000	1.1
+++ openacs-4/packages/dotlrn/www/help.adp	28 Jan 2002 21:57:52 -0000	1.2
@@ -1,4 +1,4 @@
-<master src="master">
+<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.4 -r1.5
--- openacs-4/packages/dotlrn/www/index-not-a-user.adp	23 Jan 2002 01:54:13 -0000	1.4
+++ openacs-4/packages/dotlrn/www/index-not-a-user.adp	28 Jan 2002 21:57:52 -0000	1.5
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">dotLRN - Not a User</property>
 
 <if @admin_p@>Visit <a href=@admin_url@>dotLRN Administration</a>.<p>
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.14 -r1.15
--- openacs-4/packages/dotlrn/www/index.adp	23 Jan 2002 06:29:14 -0000	1.14
+++ openacs-4/packages/dotlrn/www/index.adp	28 Jan 2002 21:57:52 -0000	1.15
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">dotLRN</property>
 <property name="portal_id">@portal_id@</property>
 
Index: openacs-4/packages/dotlrn/www/master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/master.tcl,v
diff -u -N
--- openacs-4/packages/dotlrn/www/master.tcl	25 Jan 2002 19:59:50 -0000	1.11
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,131 +0,0 @@
-#
-# sloan specifc master
-#
-
-set user_id [ad_verify_and_get_user_id]
-
-#
-# here's a bunch of stuff that an adp _may_ set to alter
-# this templates behavior
-#
-
-if {[exists_and_not_null portal_id]} {
-    set have_portal_id 1
-} else {
-    set have_portal_id 0 
-}
-
-if {[exists_and_not_null no_navbar_p]} {
-    set show_navbar_p 0
-} else {
-    set show_navbar_p 1 
-}
-
-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"
-}
-
-
-db_0or1row pvt_home_user_info {
-    select first_names, last_name
-    from cc_users
-    where user_id=:user_id
-}
-
-set full_name "$first_names $last_name"
-set title "$full_name : MySloanSpace"
-
-if {[ad_parameter community_level_p] == 1} {
-    # in a community
-
-    # The header text is the name of the community
-    set text [dotlrn_community::get_community_name [dotlrn_community::get_community_id]]
-
-#    ad_return_complaint 1 "foobar $have_portal_id, $show_navbar_p, $link_control_panel, $show_control_panel"
-
-    if { $have_portal_id && $show_navbar_p } {
-        if {$show_control_panel} {
-            if {$link_control_panel} {
-                set extra_td_html "<font face=arial,helvetica size=-1><b> <a href=one-community-admin> $control_panel_text</a></b></font>"
-            } else {
-                set extra_td_html "<font face=arial,helvetica size=-1><b> $control_panel_text</b></font>"
-            }
-        } 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 "<font face=arial,helvetica size=-1><b>" \
-                    -post_html "</b></font>" \
-                    -extra_td_html $extra_td_html \
-                    -table_html_args "border=0 cellpadding=5"]
-    } else {
-        set navbar ""
-        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 && $show_navbar_p} {
-        
-           set navbar [portal::navbar \
-                   -portal_id $portal_id \
-                   -link_all $link_all \
-                   -link $link \
-                   -pre_html "<font face=arial,helvetica size=-1><b>" \
-                   -post_html "</b></font>" \
-                   -extra_td_html $extra_td_html \
-                   -table_html_args "border=0 cellpadding=5"]
-    } else {
-        set navbar ""
-        set portal_id ""
-    }
- 
-} else {
-    # under /dotlrn
-    set text $full_name
-    
-    if {$have_portal_id && $show_navbar_p} {
-        if {$link_control_panel} {
-            set extra_td_html "<font face=arial,helvetica size=-1><b> <a href=preferences>Control Panel</a></b></font>"
-        } else {
-            set extra_td_html "<font face=arial,helvetica size=-1><b> Control Panel</b></font>"
-        }
-
-        set navbar [portal::navbar \
-                -portal_id $portal_id \
-                -link_all $link_all \
-                -link $link \
-                -pre_html "<font face=arial,helvetica size=-1><b>" \
-                -post_html "</b></font>" \
-                -extra_td_html $extra_td_html  \
-                -table_html_args "border=0 cellpadding=5 cellspacing=2"]
-    } else {
-        set navbar ""
-        set portal_id ""
-    }
-}
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.6 -r1.7
--- openacs-4/packages/dotlrn/www/member-add-2.adp	23 Jan 2002 07:41:04 -0000	1.6
+++ openacs-4/packages/dotlrn/www/member-add-2.adp	28 Jan 2002 21:57:52 -0000	1.7
@@ -1,4 +1,4 @@
-<master src="master">
+<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.5 -r1.6
--- openacs-4/packages/dotlrn/www/member-add.adp	23 Jan 2002 07:41:04 -0000	1.5
+++ openacs-4/packages/dotlrn/www/member-add.adp	28 Jan 2002 21:57:52 -0000	1.6
@@ -1,4 +1,4 @@
-<master src="master">
+<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.4 -r1.5
--- openacs-4/packages/dotlrn/www/members.adp	23 Jan 2002 07:41:04 -0000	1.4
+++ openacs-4/packages/dotlrn/www/members.adp	28 Jan 2002 21:57:52 -0000	1.5
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Manage Membership</property>
 <property name="context_bar">@context_bar@</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.3 -r1.4
--- openacs-4/packages/dotlrn/www/not-allowed.adp	21 Jan 2002 06:30:11 -0000	1.3
+++ openacs-4/packages/dotlrn/www/not-allowed.adp	28 Jan 2002 21:57:52 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<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.15 -r1.16
--- openacs-4/packages/dotlrn/www/one-community-admin.adp	25 Jan 2002 20:00:33 -0000	1.15
+++ openacs-4/packages/dotlrn/www/one-community-admin.adp	28 Jan 2002 21:57:52 -0000	1.16
@@ -1,4 +1,4 @@
-<master src="master">
+<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.9 -r1.10
--- openacs-4/packages/dotlrn/www/one-community-not-member.adp	25 Jan 2002 20:01:07 -0000	1.9
+++ openacs-4/packages/dotlrn/www/one-community-not-member.adp	28 Jan 2002 21:57:52 -0000	1.10
@@ -1,4 +1,4 @@
-<master src="master">
+<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/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.3 -r1.4
--- openacs-4/packages/dotlrn/www/one-community-portal-template.adp	22 Jan 2002 20:02:30 -0000	1.3
+++ openacs-4/packages/dotlrn/www/one-community-portal-template.adp	28 Jan 2002 21:57:52 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<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.18 -r1.19
--- openacs-4/packages/dotlrn/www/one-community-type.adp	23 Jan 2002 07:41:04 -0000	1.18
+++ openacs-4/packages/dotlrn/www/one-community-type.adp	28 Jan 2002 21:57:52 -0000	1.19
@@ -1,4 +1,4 @@
-<master src="master">
+<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.11 -r1.12
--- openacs-4/packages/dotlrn/www/one-community.adp	25 Jan 2002 20:01:37 -0000	1.11
+++ openacs-4/packages/dotlrn/www/one-community.adp	28 Jan 2002 21:57:52 -0000	1.12
@@ -1,4 +1,4 @@
-<master src="master">
+<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/preferences.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/preferences.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/preferences.adp	23 Jan 2002 06:29:14 -0000	1.5
+++ openacs-4/packages/dotlrn/www/preferences.adp	28 Jan 2002 21:57:52 -0000	1.6
@@ -1,4 +1,4 @@
-<master src="master">
+<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.6 -r1.7
--- openacs-4/packages/dotlrn/www/spam.adp	28 Jan 2002 19:23:29 -0000	1.6
+++ openacs-4/packages/dotlrn/www/spam.adp	28 Jan 2002 21:57:52 -0000	1.7
@@ -1,4 +1,4 @@
-<master src="master">
+<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/user-add-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add-2.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/user-add-2.adp	23 Jan 2002 00:15:43 -0000	1.3
+++ openacs-4/packages/dotlrn/www/user-add-2.adp	28 Jan 2002 21:57:52 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Add A User</property>
 <property name="context_bar">@context_bar@</property>
 <property name="portal_id">@portal_id@</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.3 -r1.4
--- openacs-4/packages/dotlrn/www/user-add.adp	23 Jan 2002 07:41:04 -0000	1.3
+++ openacs-4/packages/dotlrn/www/user-add.adp	28 Jan 2002 21:57:52 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Add A User</property>
 <property name="context_bar">@context_bar@</property>