Index: openacs-4/packages/contacts/lib/contact-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-master.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/contacts/lib/contact-master.adp	28 May 2005 15:43:52 -0000	1.3
+++ openacs-4/packages/contacts/lib/contact-master.adp	28 Jun 2005 04:02:56 -0000	1.4
@@ -1,22 +1,28 @@
-<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 @contact_master_template@ eq /packages/contacts/lib/contact-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@ and @public_url@ nil><em>&nbsp;</em></if> </li>
+    </multiple>
+    <if @public_url@ not nil>
+      <li><a href="@public_url@" title="Go to this community member's public page">#contacts.Public_Page#</a><em>&nbsp;</em> </li>
+    </if>
+    </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@ and @public_url@ nil><em>&nbsp;</em></if> </li>
-</multiple>
-<if @public_url@ not nil>
-    <li><a href="@public_url@" title="Go to this community member's public page">#contacts.Public_Page#</a><em>&nbsp;</em> </li>
-</if>
-  </ul>
-</div>
+<else>
+  <master src="@contact_master_template@">
+  <property name="party_id">@party_id@</property>
+</else>
 
 <slave>
 
Index: openacs-4/packages/contacts/lib/contact-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-master.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/contacts/lib/contact-master.tcl	20 Jun 2005 15:31:21 -0000	1.9
+++ openacs-4/packages/contacts/lib/contact-master.tcl	28 Jun 2005 04:02:56 -0000	1.10
@@ -3,6 +3,11 @@
 #    @cvs-id $Id$
 
 
+set contact_master_template [parameter::get -parameter "ContactMaster" -default "/packages/contacts/lib/contact-master"]
+if { $contact_master_template != "/packages/contacts/lib/contact-master" } {
+    ad_return_template
+}
+
 # Set up links in the navbar that the user has access to
 set name [contact::name -party_id $party_id]
 if { ![exists_and_not_null name] } {
@@ -36,21 +41,10 @@
     lappend link_list "${prefix}files"
     lappend link_list "[_ contacts.Files]"
 
-    if { [site_node::get_package_url -package_key "tasks"] != "" } {
-	lappend link_list "/tasks/contact?party_id=$party_id"
-	lappend link_list "[_ contacts.Tasks]"
-    }
-
     lappend link_list "${prefix}message"
     lappend link_list "[_ contacts.Mail]"
 }
 
-# not yet implemented
-#    lappend link_list "/contacts/contact-files"
-#    lappend link_list "Files"
-#    lappend link_list "/contacts/contact-history"
-#    lappend link_list "History"
-
 # Convert the list to a multirow and add the selected_p attribute
 multirow create links label url selected_p