Index: openacs-4/packages/contacts/lib/contacts-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contacts-master.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/lib/contacts-master.adp	13 Jun 2005 07:23:55 -0000	1.1
+++ openacs-4/packages/contacts/lib/contacts-master.adp	28 Jun 2005 04:09:25 -0000	1.2
@@ -1,19 +1,24 @@
-<master>
-<property name="title">@title@</property>
-<property name="context">@context@</property>
-<property name="header_stuff">
-  <link href="/resources/contacts/contacts.css" rel="stylesheet" type="text/css">
-</property>
-<if @focus@ not nil>
-<property name="focus">@focus@</property>
+<if @contacts_master_template@ eq /packages/contacts/lib/contacts-master>
+  <master>
+  <property name="title">@title@</property>
+  <property name="context">@context@</property>
+  <property name="header_stuff">
+    <link href="/resources/contacts/contacts.css" rel="stylesheet" type="text/css">
+  </property>
+  <if @focus@ not nil>
+    <property name="focus">@focus@</property>
+  </if>
+  <div id="section">
+    <ul>
+    <multiple name="links">
+      <li><a href="@links.url@" title="Go to @links.label@"><if @links.selected_p@><strong></if>@links.label@<if @links.selected_p@></strong></if></a><if @links:rowcount@ eq @links.rownum@><em>&nbsp;</em></if> </li>
+    </multiple>
+    </ul>
+  </div>
 </if>
-<div id="section">
-  <ul>
-<multiple name="links">
-    <li><a href="@links.url@" title="Go to @links.label@"><if @links.selected_p@><strong></if>@links.label@<if @links.selected_p@></strong></if></a><if @links:rowcount@ eq @links.rownum@><em>&nbsp;</em></if> </li>
-</multiple>
-  </ul>
-</div>
+<else>
+  <master src="@contacts_master_template@">
+</else>
 
 <slave>
 
Index: openacs-4/packages/contacts/lib/contacts-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contacts-master.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/contacts/lib/contacts-master.tcl	19 Jun 2005 07:00:28 -0000	1.5
+++ openacs-4/packages/contacts/lib/contacts-master.tcl	28 Jun 2005 04:09:25 -0000	1.6
@@ -3,6 +3,11 @@
 #    @cvs-id $Id$
 
 
+set contacts_master_template [parameter::get -parameter "ContactsMaster" -default "/packages/contacts/lib/contacts-master"]
+if { $contacts_master_template != "/packages/contacts/lib/contacts-master" } {
+    ad_return_template
+}
+
 # Set up links in the navbar that the user has access to
 set package_url [ad_conn package_url]