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.1 -r1.2
--- openacs-4/packages/contacts/lib/contact-master.adp	18 May 2005 16:47:47 -0000	1.1
+++ openacs-4/packages/contacts/lib/contact-master.adp	19 May 2005 23:03:23 -0000	1.2
@@ -10,8 +10,11 @@
 <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>
+    <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">Public Page</a><em>&nbsp;</em> </li>
+</if>
   </ul>
 </div>
 
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.2 -r1.3
--- openacs-4/packages/contacts/lib/contact-master.tcl	19 May 2005 16:45:52 -0000	1.2
+++ openacs-4/packages/contacts/lib/contact-master.tcl	19 May 2005 23:03:23 -0000	1.3
@@ -38,40 +38,36 @@
     lappend link_list "/contacts/comments"
     lappend link_list "Comments"
 
-    lappend link_list "/tasks/"
-    lappend link_list "Tasks"
+    if { [site_node::get_package_url -package_key "tasks"] != "" } {
+	lappend link_list "/tasks/contact"
+	lappend link_list "Tasks"
+    }
 
     lappend link_list "/contacts/message"
     lappend link_list "Mail"
 }
-#    lappend link_list "/tasks/contact"
-#    lappend link_list "Tasks"
+
+# not yet implemented
 #    lappend link_list "/contacts/contact-files"
 #    lappend link_list "Files"
 #    lappend link_list "/contacts/contact-history"
 #    lappend link_list "History"
 
 
 
-if { $admin_p } {
 
-}
 
-
 # Convert the list to a multirow and add the selected_p attribute
 multirow create links label url selected_p
 
 foreach {url label} $link_list {
     set selected_p 0
 
     if {[string equal $page_url $url]} {
-
-
         set selected_p 1
         if { $url != "/contacts/contact" } {
             set context [list [list [contact::url -party_id $party_id] $name] $label]
         }
-
     }
 
     multirow append links $label [export_vars -base $url -url {party_id}] $selected_p
@@ -81,12 +77,13 @@
 
 
 
+if { [contact::type -party_id $party_id] == "person" } {
+    set public_url [acs_community_member_url -user_id $party_id]
+}
 
 
 
 
 
 
-
-
 ad_return_template
Index: openacs-4/packages/contacts/www/contact.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/www/contact.adp	18 May 2005 16:45:50 -0000	1.1
+++ openacs-4/packages/contacts/www/contact.adp	19 May 2005 23:03:23 -0000	1.2
@@ -7,7 +7,9 @@
 
       <formtemplate id="party_ae" style="proper"></formtemplate>
 
-<!--      <include src="/packages/tasks/lib/tasks" party_id="@party_id@" hide_form_p="t"> -->
+<if @tasks_enabled_p@>
+	     <include src="/packages/tasks/lib/tasks" party_id="@party_id@" hide_form_p="t">
+</if>
 
     </td>
     <td valign="top" width="30%" style="padding: 0px 0px 0px 15px;" class="summaries">
@@ -24,6 +26,3 @@
 <if @update_date@ not nil><p style="padding-top: 0px; margin-top: 0px;"><small>Last updated: @update_date@</small></p></if>
 
 
-<if @admin_url@ not nil>
-@admin_url;noquote@
-</if>
Index: openacs-4/packages/contacts/www/contact.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/www/contact.tcl	18 May 2005 16:45:50 -0000	1.1
+++ openacs-4/packages/contacts/www/contact.tcl	19 May 2005 23:03:23 -0000	1.2
@@ -15,18 +15,10 @@
     }
 }
 
-#set attach_url [attachments::add_attachment_url \
-#                      -object_id $party_id \
-#                      -return_url [contact::url -party_id $party_id] \
-#                     -pretty_name [contact::name -party_id $party_id]]
-
-set admin_url [acs_community_member_admin_link -user_id $party_id -label "Admin Page"]
 set object_type [contact::type -party_id $party_id]
 set user_id [ad_conn user_id]
 set package_id [ad_conn package_id]
 
-# set form_elements [ams::ad_form::elements -package_key "contacts" -object_type $object_type -list_name "${object_type}_[ad_conn package_id]" -key party_id]
-
 set groups_belonging_to [db_list get_party_groups { select group_id from group_distinct_member_map where member_id = :party_id }]
 if { [lsearch $groups_belonging_to -2] < 0 } {
     ad_return_error "This users has not been approved" "This user is awaiting administrator approval"
@@ -47,7 +39,7 @@
     append form_elements " "
     append form_elements [ams::ad_form::elements -package_key "contacts" -object_type $object_type -list_name $form]
 }
-#ad_return_error "ERROR" $form_elements
+
 ad_form -name party_ae \
     -mode "display" \
     -form $form_elements \
@@ -119,7 +111,6 @@
         }
     }
     set sec [template::element::get_property party_ae $element section]
-    ns_log notice "mgeddert: $element section $sec"
 }
 
 
@@ -133,10 +124,12 @@
 }
 
 
+if { [site_node::get_package_url -package_key "tasks"] != "" } {
+    set tasks_enabled_p 1
+} else {
+    set tasks_enabled_p 0
+}
 
 
 
-
-
-
 ad_return_template
Index: openacs-4/packages/contacts/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/contacts/www/index.adp	18 May 2005 16:45:50 -0000	1.3
+++ openacs-4/packages/contacts/www/index.adp	19 May 2005 23:03:23 -0000	1.4
@@ -11,7 +11,6 @@
     <li><a href="contact-add?object_type=person" title="Add a Person">Add Person</a>
     <li><a href="contact-add?object_type=organization" title="Add an Organization">Add Organization</a>
     <li><a href="search" title="Advanced Search">Advanced Search</a>
-<!--    <li><a href="@tasks_url@" title="Show tasks assigned to these contacts">Tasks</a> -->
     <li><a href="settings" title="Modify My Settings">Settings</a>
     <li><a href="admin" title="Admin">Admin</a><em>&nbsp;</em> </li>
   </ul>