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.14 -r1.15
--- openacs-4/packages/contacts/lib/contact-master.tcl	23 Oct 2005 10:47:08 -0000	1.14
+++ openacs-4/packages/contacts/lib/contact-master.tcl	16 Feb 2006 14:07:11 -0000	1.15
@@ -17,13 +17,19 @@
 set user_id [ad_conn user_id]
 set package_id [ad_conn package_id]
 set package_url [ad_conn package_url]
+set tasks_url [site_node::get_package_url -package_key "tasks"]
 set page_url [ad_conn url]
 set page_query [ad_conn query]
 
 set title $name
 set context [list $name]
-set prefix "${package_url}${party_id}/"
+if {![empty_string_p $tasks_url]} {
+    set prefix "/contacts/${party_id}/"
+} else {
+    set prefix "${package_url}${party_id}/"
+}
 
+
 set link_list [list]
 if { [ad_conn user_id] != 0} {
     lappend link_list "${prefix}edit"
@@ -38,6 +44,11 @@
     lappend link_list "${prefix}files"
     lappend link_list "[_ contacts.Files]"
 
+    if {![empty_string_p $tasks_url]} {
+	lappend link_list "${prefix}history" "[_ contacts.History]"
+	lappend link_list "/tasks/contact" "[_ contacts.Tasks]"
+    }
+
     lappend link_list "${prefix}message"
     lappend link_list "[_ contacts.Mail]"
 
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.11 -r1.12
--- openacs-4/packages/contacts/lib/contacts-master.tcl	10 Dec 2005 11:21:22 -0000	1.11
+++ openacs-4/packages/contacts/lib/contacts-master.tcl	16 Feb 2006 14:07:11 -0000	1.12
@@ -10,6 +10,7 @@
 
 # Set up links in the navbar that the user has access to
 set package_url [ad_conn package_url]
+set tasks_url [site_node::get_package_url -package_key "tasks"]
 
 set link_list [list]
 lappend link_list "${package_url}"
@@ -29,6 +30,11 @@
 lappend link_list "${package_url}searches"
 lappend link_list "[_ contacts.Saved_Searches]"
 
+if {![empty_string_p $tasks_url]} {
+    lappend link_list "$tasks_url"
+    lappend link_list "[_ contacts.Tasks]"
+}
+
 lappend link_list "${package_url}messages"
 lappend link_list "[_ contacts.Messages]"