Index: openacs-4/packages/contacts/lib/comments.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/comments.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/lib/comments.adp	18 May 2005 16:47:47 -0000	1.1
+++ openacs-4/packages/contacts/lib/comments.adp	25 May 2005 02:09:52 -0000	1.2
@@ -14,7 +14,7 @@
 <if @comments:rowcount@ gt 0>
   <dl>
 <multiple name="comments">
-    <dt id="@comments.comment_id@" class="<if @comments.creation_user@ eq @user_id@>mine-</if><if @comments.rownum@ odd>odd</if><else>even</else>"><a href="comments?party_id=@party_id@#@comments.comment_id@" class="number">@comments.comment_number@.</a> @comments.pretty_date@ at @comments.pretty_time@ - <a href="contact?party_id=@comments.creation_user@">@comments.author@</a></dd>
+    <dt id="@comments.comment_id@" class="<if @comments.creation_user@ eq @user_id@>mine-</if><if @comments.rownum@ odd>odd</if><else>even</else>"><a href="comments#@comments.comment_id@" class="number">@comments.comment_number@.</a> @comments.pretty_date@ at @comments.pretty_time@ - <a href="contact?party_id=@comments.creation_user@">@comments.author@</a></dd>
       <dd class="<if @comments.creation_user@ eq @user_id@>mine-</if><if @comments.rownum@ odd>odd</if><else>even</else>">@comments.comment_html;noquote@</dd>
 </multiple>
   </dl>
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.3 -r1.4
--- openacs-4/packages/contacts/lib/contact-master.tcl	19 May 2005 23:03:23 -0000	1.3
+++ openacs-4/packages/contacts/lib/contact-master.tcl	25 May 2005 02:09:52 -0000	1.4
@@ -20,30 +20,30 @@
 set name [contact::name -party_id $party_id]
 set title $name
 set context [list $name]
-
+set prefix "${package_url}${party_id}/"
 set link_list [list]
 if { [ad_conn user_id] != 0} {
-    lappend link_list "/contacts/contact-edit"
+    lappend link_list "${prefix}edit"
     lappend link_list "All / Edit"
 
-    lappend link_list "/contacts/contact"
+    lappend link_list "${prefix}"
     lappend link_list "Summary View"
 
-    lappend link_list "/contacts/contact-groups"
+    lappend link_list "${prefix}groups"
     lappend link_list "Groups"
 
-    lappend link_list "/contacts/contact-rels"
+    lappend link_list "${prefix}relationships"
     lappend link_list "Relationships"
 
-    lappend link_list "/contacts/comments"
+    lappend link_list "${prefix}comments"
     lappend link_list "Comments"
 
     if { [site_node::get_package_url -package_key "tasks"] != "" } {
-	lappend link_list "/tasks/contact"
+	lappend link_list "/tasks/contact?party_id=$party_id"
 	lappend link_list "Tasks"
     }
 
-    lappend link_list "/contacts/message"
+    lappend link_list "${prefix}message"
     lappend link_list "Mail"
 }
 
@@ -70,7 +70,7 @@
         }
     }
 
-    multirow append links $label [export_vars -base $url -url {party_id}] $selected_p
+    multirow append links $label [subst $url] $selected_p
 }
 
 
Index: openacs-4/packages/contacts/lib/groups.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/groups.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/lib/groups.adp	18 May 2005 16:47:47 -0000	1.1
+++ openacs-4/packages/contacts/lib/groups.adp	25 May 2005 02:14:09 -0000	1.2
@@ -1,6 +1,6 @@
 <if @hide_form_p@ false>
 <if @addable_groups:rowcount@ gt 0>
-<form name="add_to_group" method="post" action="group-party-add">
+<form name="add_to_group" method="post" action="@package_url@group-party-add">
 <input type="hidden" name="party_id" value="@party_id@" />
 <table cellpadding="0" cellspacing="0" border="0">
 <tr><td>
Index: openacs-4/packages/contacts/lib/groups.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/groups.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/lib/groups.tcl	19 May 2005 16:45:52 -0000	1.2
+++ openacs-4/packages/contacts/lib/groups.tcl	25 May 2005 02:14:09 -0000	1.3
@@ -10,6 +10,7 @@
 }
 set user_id [ad_conn user_id]
 set package_id [ad_conn package_id]
+set package_url [ad_conn package_url]
 
 set groups_belonging_to [db_list get_party_groups { select group_id from group_distinct_member_map where member_id = :party_id }]
 
Index: openacs-4/packages/contacts/tcl/contacts-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/contacts/tcl/contacts-procs.tcl	18 May 2005 16:45:49 -0000	1.3
+++ openacs-4/packages/contacts/tcl/contacts-procs.tcl	25 May 2005 02:09:52 -0000	1.4
@@ -124,7 +124,7 @@
 } {
     create a contact revision
 } {
-    return [export_vars -url -base contact {party_id}]
+    return "[ad_conn package_url]$party_id/"
 }
 
 ad_proc -public contact::revision::new {
Index: openacs-4/packages/contacts/www/contact-rels.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact-rels.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/www/contact-rels.tcl	21 May 2005 21:00:41 -0000	1.2
+++ openacs-4/packages/contacts/www/contact-rels.tcl	25 May 2005 02:09:52 -0000	1.3
@@ -187,9 +187,9 @@
     }
 
 set original_party_id $party_id
-
+set package_url [ad_conn package_url]
 db_multirow -extend {map_url} -unclobber contacts dbqd.contacts.www.index.contacts_select {} {
-    set map_url [export_vars -base "relationship-add" -url {{party_one $original_party_id} {party_two $party_id} {role_two $role_two}}]
+    set map_url [export_vars -base "${package_url}relationship-add" -url {{party_one $original_party_id} {party_two $party_id} {role_two $role_two}}]
 }
 
 
@@ -280,12 +280,12 @@
 
 
 set package_id [ad_conn package_id]
-set return_url [export_vars -base "[ad_conn package_url]contact-rels" -url {party_id}]
+set return_url "[ad_conn package_url]${party_id}/relationships"
 db_multirow -unclobber -extend {contact_url rel_add_edit_url rel_delete_url details} relationships get_relationships "" {
      set contact_url [contact::url -party_id $other_party_id]
      set list_exists_p [ams::list::exists_p -package_key "contacts" -object_type ${rel_type} -list_name ${package_id}]
      if { $list_exists_p } {
-         set rel_add_edit_url [export_vars -base "relationship-ae" -url {rel_type object_id_one object_id_two party_id}]
+         set rel_add_edit_url [export_vars -base "${package_url}relationship-ae" -url {rel_type object_id_one object_id_two party_id}]
      }
-     set rel_delete_url [export_vars -base "relationship-delete" -url {rel_id party_id return_url}]
+    set rel_delete_url [export_vars -base "${package_url}relationship-delete" -url {rel_id party_id return_url}]
 }
Index: openacs-4/packages/contacts/www/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/index.vuh,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/contacts/www/index.vuh	25 May 2005 02:09:52 -0000	1.1
@@ -0,0 +1,56 @@
+# 
+# Provide pretty urls for the contacts package
+# 
+# @author Matthew Geddert (openacs@geddert.com)
+# @creation-date 2005-05-24
+# @cvs-id $Id: index.vuh,v 1.1 2005/05/25 02:09:52 matthewg Exp $
+
+set package_url [ad_conn package_url]
+set file_url   [ad_conn path_info]
+set file_list  [split $file_url "/"]
+
+set party_id [lindex $file_list 0]
+if { [string is integer $party_id] } {
+   set party_is_contact_p [contact::exists_p -party_id $party_id]
+} else {
+   set party_is_contact_p 0
+}
+set action [lindex $file_list 1]
+
+if { $party_is_contact_p } {
+        if { [llength $file_list] == "1" } {
+                # we need to redirect the user to their "correct" summary page otherwise
+                # sub links will not work correctly
+                ad_returnredirect "[ad_conn package_url]${party_id}/"
+                ad_script_abort
+        }
+        set valid_pages [list "" edit files groups relationships comments message]
+        if { [lsearch $valid_pages $action] >= 0 && [llength $file_list] == "2" } {
+           switch $action {
+               edit          { set file "contact-edit" }
+               files         { set file "contact-files" }
+               groups        { set file "contact-groups" }
+               relationships { set file "contact-rels" }
+               comments      { set file "comments" }
+               message       { set file "message" }
+               default       { set file "contact" }
+           }
+           set form_supplied_party_id [ns_queryget party_id] 
+           if { [exists_and_not_null form_supplied_party_id] } {
+                if { $form_supplied_party_id != $party_id } {
+                     ns_returnnotfound
+                     ad_script_abort
+                }
+           } else {
+               rp_form_put party_id $party_id
+           }
+           rp_internal_redirect $file
+        } else {
+           ns_returnnotfound
+           ad_script_abort
+        }
+} else {
+        ns_returnnotfound
+        ad_script_abort
+}
+
Index: openacs-4/packages/contacts/www/relationship-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/relationship-add.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/www/relationship-add.tcl	21 May 2005 21:00:41 -0000	1.2
+++ openacs-4/packages/contacts/www/relationship-add.tcl	25 May 2005 02:09:52 -0000	1.3
@@ -76,7 +76,7 @@
         set object_id_two $party_one
     }
     if { ![exists_and_not_null return_url] } {
-        set return_url [export_vars -base "contact-rels" -url {{party_id $party_one}}]
+        set return_url "${party_id}/relationships"
     }
     ad_returnredirect [export_vars -base "relationship-ae" -url {object_id_one object_id_two rel_type return_url {party_id $party_one}}]
     ad_script_abort
Index: openacs-4/packages/contacts/www/relationship-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/relationship-ae.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/www/relationship-ae.tcl	21 May 2005 21:00:41 -0000	1.1
+++ openacs-4/packages/contacts/www/relationship-ae.tcl	25 May 2005 02:09:52 -0000	1.2
@@ -95,7 +95,7 @@
             -object_id $rel_id
     }
     if { ![exists_and_not_null return_url] } {
-        set return_url [export_vars -base "contact-rels" -url {{party_id $party_id}}]
+        set return_url "$party_id/relationships"
     }
     ad_returnredirect $return_url
     ad_script_abort
Index: openacs-4/packages/contacts/www/relationship-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/relationship-delete.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/www/relationship-delete.tcl	21 May 2005 21:00:41 -0000	1.1
+++ openacs-4/packages/contacts/www/relationship-delete.tcl	25 May 2005 02:09:52 -0000	1.2
@@ -20,7 +20,7 @@
 db_1row delete_rel {}
 
 if { ![exists_and_not_null return_url] } {
-    set return_url [export_vars -base "contact-rels" -url {party_id}]
+    set return_url "$party_id/relationships"
 }
 ad_returnredirect -message "Relationship Deleted" $return_url
 ad_script_abort