Index: openacs-4/packages/dotlrn/www/applets.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/applets.adp,v diff -u -r1.11 -r1.12 --- openacs-4/packages/dotlrn/www/applets.adp 23 Oct 2002 12:38:39 -0000 1.11 +++ openacs-4/packages/dotlrn/www/applets.adp 15 Jun 2003 01:23:59 -0000 1.12 @@ -18,7 +18,7 @@ %> -<master src="dotlrn-master"> +<master> <property name="title">#dotlrn.Manage_Applets#</property> <property name="context_bar">@context_bar@</property> Index: openacs-4/packages/dotlrn/www/clone.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/clone.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/dotlrn/www/clone.adp 11 Dec 2002 13:53:51 -0000 1.5 +++ openacs-4/packages/dotlrn/www/clone.adp 15 Jun 2003 01:23:59 -0000 1.6 @@ -18,7 +18,7 @@ %> -<master src="dotlrn-master"> +<master> <property name="title">@title@</property> <i><strong>#dotlrn.Note#</strong> #dotlrn.lt_this_may_take_some_time#</i> Index: openacs-4/packages/dotlrn/www/community-edit-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-edit-2.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/dotlrn/www/community-edit-2.adp 4 Dec 2002 09:51:04 -0000 1.5 +++ openacs-4/packages/dotlrn/www/community-edit-2.adp 15 Jun 2003 01:23:59 -0000 1.6 @@ -18,7 +18,7 @@ %> -<master src="dotlrn-master"> +<master> <property name="title">@page_title@</property> <ul> Index: openacs-4/packages/dotlrn/www/community-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-edit.adp,v diff -u -r1.11 -r1.12 --- openacs-4/packages/dotlrn/www/community-edit.adp 29 May 2003 18:05:01 -0000 1.11 +++ openacs-4/packages/dotlrn/www/community-edit.adp 15 Jun 2003 01:23:59 -0000 1.12 @@ -16,7 +16,7 @@ %> -<master src="dotlrn-master"> +<master> <property name="title">@title@</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 -r1.15 -r1.16 --- openacs-4/packages/dotlrn/www/community-member.adp 29 May 2003 18:05:01 -0000 1.15 +++ openacs-4/packages/dotlrn/www/community-member.adp 15 Jun 2003 01:23:59 -0000 1.16 @@ -18,7 +18,7 @@ %> -<master src="dotlrn-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 -r1.11 -r1.12 --- openacs-4/packages/dotlrn/www/community-type.adp 4 Dec 2002 09:51:04 -0000 1.11 +++ openacs-4/packages/dotlrn/www/community-type.adp 15 Jun 2003 01:23:59 -0000 1.12 @@ -18,7 +18,7 @@ %> -<master src="dotlrn-master"> +<master> <property name="context_bar">@context_bar@</property> <property name="title">dotLRN: @pretty_name@</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 -r1.8 -r1.9 --- openacs-4/packages/dotlrn/www/configure-element.adp 23 Oct 2002 12:38:39 -0000 1.8 +++ openacs-4/packages/dotlrn/www/configure-element.adp 15 Jun 2003 01:23:59 -0000 1.9 @@ -18,7 +18,7 @@ %> -<master src="dotlrn-master"> +<master> <property name="title">#dotlrn.Configure_Element#</property> Index: openacs-4/packages/dotlrn/www/control-panel.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/control-panel.adp,v diff -u -r1.8 -r1.9 --- openacs-4/packages/dotlrn/www/control-panel.adp 29 May 2003 18:05:01 -0000 1.8 +++ openacs-4/packages/dotlrn/www/control-panel.adp 15 Jun 2003 01:23:59 -0000 1.9 @@ -18,7 +18,7 @@ %> -<master src="dotlrn-master"> +<master> <property name="title">@title@</property> <property name="link_control_panel">0</property> Index: openacs-4/packages/dotlrn/www/deregister-confirm.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/deregister-confirm.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/dotlrn/www/deregister-confirm.adp 4 Dec 2002 09:51:04 -0000 1.2 +++ openacs-4/packages/dotlrn/www/deregister-confirm.adp 15 Jun 2003 01:23:59 -0000 1.3 @@ -18,7 +18,7 @@ %> -<master src="dotlrn-master"> +<master> <property name="title">#dotlrn.Confirm_Drop#</property> #dotlrn.lt_You_are_about_to_dele# Fisheye: Tag 1.14 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/dotlrn-default-master.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.22 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/dotlrn-default-master.tcl'. Fisheye: No comparison available. Pass `N' to diff? 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 -r1.17 -r1.18 --- openacs-4/packages/dotlrn/www/dotlrn-master.adp 29 May 2003 18:05:01 -0000 1.17 +++ openacs-4/packages/dotlrn/www/dotlrn-master.adp 15 Jun 2003 01:23:59 -0000 1.18 @@ -31,7 +31,7 @@ <head> <title>@title@</title> -@header_stuff@ +@header_stuff;noquote@ </head> @@ -68,7 +68,7 @@ <tr><td colspan=3 class="dark-line" height="1"><img src="@dotlrn_url@/graphics/spacer.gif"></td></tr> <!-- navbars on every page --> - <tr><td colspan=3 valign=top>@navbar@</td></tr> + <tr><td colspan=3 valign=top>@navbar;noquote@</td></tr> </table> <p> <p> @@ -89,7 +89,7 @@ <!-- dotLRN info links --> <table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr><td><small>@navbar@</small></td></tr> + <tr><td><small>@navbar;noquote@</small></td></tr> <tr><td colspan=3 class="dark-line" height="1"><img src="@dotlrn_url@/graphics/spacer.gif"></td></tr> </table> </if> 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 -r1.16 -r1.17 --- openacs-4/packages/dotlrn/www/dotlrn-master.tcl 29 May 2003 18:05:01 -0000 1.16 +++ openacs-4/packages/dotlrn/www/dotlrn-master.tcl 15 Jun 2003 01:23:59 -0000 1.17 @@ -13,7 +13,7 @@ # details. # # -# /www/dotlrn-default-master.tcl +# /www/dotlrn-master.tcl # # This is the "default-master" template for dotlrn sites. # @@ -25,7 +25,7 @@ # ignored by the next step. # # 2. Change the "Main Site"'s "DefaultMaster" parameter -# from "/www/default-master" to "/www/dotlrn-default-master" +# from "/www/default-master" to "/www/dotlrn-master" # at http://yoursite.com/admin/site-map # # This tells OpenACS to to use these files instead of the "default-master" Index: openacs-4/packages/dotlrn/www/help.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/help.adp,v diff -u -r1.9 -r1.10 --- openacs-4/packages/dotlrn/www/help.adp 29 May 2003 18:05:01 -0000 1.9 +++ openacs-4/packages/dotlrn/www/help.adp 15 Jun 2003 01:23:59 -0000 1.10 @@ -18,7 +18,7 @@ %> -<master src="dotlrn-master"> +<master> <property name="title">#dotlrn.help#</property> <p><a href="#Edit%20PersonalInfo">Editing Personal Information</a> | <a href="#JoinDrop">Joining/Dropping 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 -r1.16 -r1.17 --- openacs-4/packages/dotlrn/www/index-not-a-user.adp 23 Oct 2002 12:38:39 -0000 1.16 +++ openacs-4/packages/dotlrn/www/index-not-a-user.adp 15 Jun 2003 01:23:59 -0000 1.17 @@ -18,7 +18,7 @@ %> -<master src="dotlrn-master"> +<master> <property name="title">#dotlrn.not_a_user#</property> <if @admin_p@> Index: openacs-4/packages/dotlrn/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/index.adp,v diff -u -r1.23 -r1.24 --- openacs-4/packages/dotlrn/www/index.adp 9 Aug 2002 18:39:26 -0000 1.23 +++ openacs-4/packages/dotlrn/www/index.adp 15 Jun 2003 01:23:59 -0000 1.24 @@ -18,6 +18,6 @@ %> -<master src="dotlrn-master"> +<master> @rendered_page@ 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 -r1.21 -r1.22 --- openacs-4/packages/dotlrn/www/manage-memberships.adp 29 May 2003 18:05:01 -0000 1.21 +++ openacs-4/packages/dotlrn/www/manage-memberships.adp 15 Jun 2003 01:23:59 -0000 1.22 @@ -18,7 +18,7 @@ %> -<master src="dotlrn-master"> +<master> <property name="title">#dotlrn.Manage_Memberships#</property> <property name="context_bar">#dotlrn.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 -r1.16 -r1.17 --- openacs-4/packages/dotlrn/www/member-add-2.adp 29 May 2003 18:05:01 -0000 1.16 +++ openacs-4/packages/dotlrn/www/member-add-2.adp 15 Jun 2003 01:24:00 -0000 1.17 @@ -18,7 +18,7 @@ %> -<master src="dotlrn-master"> +<master> <property name="title">#dotlrn.Add_A_Member#</property> <if @member_p@ eq 1> 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 -r1.14 -r1.15 --- openacs-4/packages/dotlrn/www/member-add.adp 29 May 2003 18:05:01 -0000 1.14 +++ openacs-4/packages/dotlrn/www/member-add.adp 15 Jun 2003 01:24:00 -0000 1.15 @@ -18,7 +18,7 @@ %> -<master src="dotlrn-master"> +<master> <property name="title">#dotlrn.Add_A_Member#</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 -r1.19 -r1.20 --- openacs-4/packages/dotlrn/www/members.adp 29 May 2003 18:05:01 -0000 1.19 +++ openacs-4/packages/dotlrn/www/members.adp 15 Jun 2003 01:24:00 -0000 1.20 @@ -18,7 +18,7 @@ %> -<master src="dotlrn-master"> +<master> <property name="title">#dotlrn.Manage_Membership#</property> <property name="link_all">1</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 -r1.9 -r1.10 --- openacs-4/packages/dotlrn/www/not-allowed.adp 23 Oct 2002 12:38:39 -0000 1.9 +++ openacs-4/packages/dotlrn/www/not-allowed.adp 15 Jun 2003 01:24:00 -0000 1.10 @@ -18,7 +18,7 @@ %> -<master src="dotlrn-master"> +<master> <property name="title">#dotlrn.Not_Allowed#</property> <p> 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 -r1.25 -r1.26 --- openacs-4/packages/dotlrn/www/one-community-admin.adp 12 Nov 2002 08:44:05 -0000 1.25 +++ openacs-4/packages/dotlrn/www/one-community-admin.adp 15 Jun 2003 01:24:00 -0000 1.26 @@ -18,7 +18,7 @@ %> -<master src="dotlrn-master"> +<master> <property name="context_bar">@context_bar@</property> <property name="title">@pretty_name@ #dotlrn.Admin#</property> <property name="link_control_panel">0</property> Index: openacs-4/packages/dotlrn/www/one-community-portal-configure.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-portal-configure.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/dotlrn/www/one-community-portal-configure.adp 23 Oct 2002 12:38:39 -0000 1.6 +++ openacs-4/packages/dotlrn/www/one-community-portal-configure.adp 15 Jun 2003 01:24:00 -0000 1.7 @@ -18,7 +18,7 @@ %> -<master src="dotlrn-master"> +<master> <property name="title">#dotlrn.Customize_Layout#</property> <p></p> 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 -r1.23 -r1.24 --- openacs-4/packages/dotlrn/www/one-community-type.adp 23 Oct 2002 12:38:39 -0000 1.23 +++ openacs-4/packages/dotlrn/www/one-community-type.adp 15 Jun 2003 01:24:00 -0000 1.24 @@ -18,7 +18,7 @@ %> -<master src="dotlrn-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 -r1.24 -r1.25 --- openacs-4/packages/dotlrn/www/one-community.adp 4 Dec 2002 09:51:04 -0000 1.24 +++ openacs-4/packages/dotlrn/www/one-community.adp 15 Jun 2003 01:24:00 -0000 1.25 @@ -18,7 +18,7 @@ %> -<master src="dotlrn-master"> +<master> <p></p> Index: openacs-4/packages/dotlrn/www/spam-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam-2.adp,v diff -u -r1.11 -r1.12 --- openacs-4/packages/dotlrn/www/spam-2.adp 29 May 2003 18:05:01 -0000 1.11 +++ openacs-4/packages/dotlrn/www/spam-2.adp 15 Jun 2003 01:24:00 -0000 1.12 @@ -16,7 +16,7 @@ %> -<master src="dotlrn-master"> +<master> <property name="title">@spam_name@</property> <property name="context_bar">@context_bar@</property> Index: openacs-4/packages/dotlrn/www/spam.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam.adp,v diff -u -r1.19 -r1.20 --- openacs-4/packages/dotlrn/www/spam.adp 29 May 2003 18:05:01 -0000 1.19 +++ openacs-4/packages/dotlrn/www/spam.adp 15 Jun 2003 01:24:00 -0000 1.20 @@ -18,7 +18,7 @@ %> -<master src="dotlrn-master"> +<master> <property name="title">@spam_name@</property> <property name="context_bar">@context_bar@</property> Index: openacs-4/packages/dotlrn/www/subcommunity-archive.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/subcommunity-archive.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/dotlrn/www/subcommunity-archive.adp 23 Oct 2002 12:38:39 -0000 1.6 +++ openacs-4/packages/dotlrn/www/subcommunity-archive.adp 15 Jun 2003 01:24:00 -0000 1.7 @@ -18,7 +18,7 @@ %> -<master src="dotlrn-master"> +<master> <property name="title">@title@</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 -r1.9 -r1.10 --- openacs-4/packages/dotlrn/www/subcommunity-new.adp 23 Oct 2002 12:38:39 -0000 1.9 +++ openacs-4/packages/dotlrn/www/subcommunity-new.adp 15 Jun 2003 01:24:00 -0000 1.10 @@ -18,7 +18,7 @@ %> -<master src="dotlrn-master"> +<master> <property name="title">@title@</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 -r1.9 -r1.10 --- openacs-4/packages/dotlrn/www/user-add-2.adp 23 Oct 2002 12:38:39 -0000 1.9 +++ openacs-4/packages/dotlrn/www/user-add-2.adp 15 Jun 2003 01:24:00 -0000 1.10 @@ -18,7 +18,7 @@ %> -<master src="dotlrn-master"> +<master> <property name="title">#dotlrn.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 -r1.10 -r1.11 --- openacs-4/packages/dotlrn/www/user-add.adp 29 May 2003 18:05:01 -0000 1.10 +++ openacs-4/packages/dotlrn/www/user-add.adp 15 Jun 2003 01:24:00 -0000 1.11 @@ -18,7 +18,7 @@ %> -<master src="dotlrn-master"> +<master> <property name="title">#dotlrn.Add_A_User#</property> <property name="context_bar">@context_bar@</property> <h3>#dotlrn.lt_Add_a_new_user_to_Slo#</h3>