Index: openacs-4/packages/address-book/www/address-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/address-ae.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/address-book/www/address-ae.adp	20 Apr 2001 20:51:12 -0000	1.1
+++ openacs-4/packages/address-book/www/address-ae.adp	3 Sep 2002 12:47:17 -0000	1.2
@@ -1,13 +1,10 @@
-<master>
+<master src="master">
 <property name=title>@page_title@</property>
-<h2>@page_title@</h2>
-@context_bar@
-<hr>
-<blockquote>
+<property name="context_bar">@context_bar@</property>
+
 <form action=address-ae-2>
 @address_widget@
 <center>
 <input type=submit value="@activity@">
 </center>
 </form>
-</blockquote>
\ No newline at end of file
Index: openacs-4/packages/address-book/www/attr-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/attr-ae.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/address-book/www/attr-ae.adp	20 Apr 2001 20:51:12 -0000	1.1
+++ openacs-4/packages/address-book/www/attr-ae.adp	3 Sep 2002 12:47:17 -0000	1.2
@@ -1,13 +1,10 @@
-<master>
-<property name=title>@page_title@</property>
-<h2>@page_title@</h2>
-@context_bar@
-<hr>
-<blockquote>
+<master src="master">
+<property name="title">@page_title@</property>
+<property name="context_bar">@context_bar@</property>
+
 <form action=attr-ae-2>
 @attr_widget@
 <center>
 <input type=submit value="@activity@">
 </center>
 </form>
-</blockquote>
\ No newline at end of file
Index: openacs-4/packages/address-book/www/contact-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/contact-add.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/address-book/www/contact-add.adp	20 Apr 2001 20:51:12 -0000	1.1
+++ openacs-4/packages/address-book/www/contact-add.adp	3 Sep 2002 12:47:17 -0000	1.2
@@ -1,9 +1,7 @@
-<master>
+<master src="master">
 <property name=>@page_title@</property>
-<h2>@page_title@</h2>
-@context_bar@
-<hr>
-<blockquote>
+<property name="context_bar">@context_bar@</property>
+
 <form method=post action=contact-add-2>
 @hidden_vars@
 <table>
@@ -64,4 +62,3 @@
 
 <center><input type=submit value="@activity@"></center>
 </form>
-</blockquote>
\ No newline at end of file
Index: openacs-4/packages/address-book/www/contact-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/contact-edit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/address-book/www/contact-edit.adp	20 Apr 2001 20:51:12 -0000	1.1
+++ openacs-4/packages/address-book/www/contact-edit.adp	3 Sep 2002 12:47:17 -0000	1.2
@@ -1,9 +1,7 @@
-<master>
-<property name=>@page_title@</property>
-<h2>@page_title@</h2>
-@context_bar@
-<hr>
-<blockquote>
+<master src="master">
+<property name="title">@page_title@</property>
+<property name="context_bar">@context_bar@</property>
+
 <form method=post action=contact-edit-2>
 @hidden_vars@
 <table>
@@ -28,4 +26,4 @@
 
 <center><input type=submit value="@activity@"></center>
 </form>
-</blockquote>
+
Index: openacs-4/packages/address-book/www/contact-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/contact-view.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/address-book/www/contact-view.adp	20 Apr 2001 20:51:12 -0000	1.1
+++ openacs-4/packages/address-book/www/contact-view.adp	3 Sep 2002 12:47:17 -0000	1.2
@@ -1,9 +1,7 @@
-<master>
-<property name=title>@page_title@</property>
-<h2>@page_title@</h2>
-@context_bar@
-<hr>
-<blockquote>
+<master src="master">
+<property name="title">@page_title@</property>
+<property name="context_bar">@context_bar@</property>
+
 <table>
 <tr>
 <td valign=top align=left>First Name:</td>
@@ -93,4 +91,3 @@
   </tr>
 </if>
 </table>
-</blockquote>
Index: openacs-4/packages/address-book/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/address-book/www/index.adp	20 Apr 2001 20:51:12 -0000	1.1
+++ openacs-4/packages/address-book/www/index.adp	3 Sep 2002 12:47:17 -0000	1.2
@@ -1,10 +1,8 @@
-<master>
-<property name=title>@instance_name@</property>
-<h2>@instance_name@</h2>
-@context_bar@
-<hr>
-<blockquote>
-<form action=./>
+<master src="master">
+<property name="title">@instance_name@</property>
+<property name="context_bar">@context_bar@</property>
+
+<form action="./">
 <input type=text name=substr size=20 maxlength=40 value=@escaped_substr@>
 <input type=submit value=Search>
 </form>
@@ -21,4 +19,3 @@
 </if>
 </p>
 </center>
-</blockquote>
\ No newline at end of file
Index: openacs-4/packages/address-book/www/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/Attic/master.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/address-book/www/master.adp	3 Sep 2002 12:47:17 -0000	1.1
@@ -0,0 +1,10 @@
+<master>
+<property name="focus">@focus@</property>
+<property name="title">@title@</property>
+<property name="context_bar">@context_bar@</property>
+
+<h2>@title@</h2>
+@context_bar@
+<hr>
+
+<slave>
Index: openacs-4/packages/address-book/www/master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/Attic/master.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/address-book/www/master.tcl	3 Sep 2002 12:47:17 -0000	1.1
@@ -0,0 +1,15 @@
+# /packages/acs-subsite/www/master.tcl
+
+# Ensures variables needed by master.adp are defined
+
+if { ![info exists focus] } {
+    set focus ""
+}	
+if { ![info exists title] } {
+    set title ""
+}	
+if { ![info exists context_bar] } {
+    set context_bar ""
+}	
+
+