Index: openacs-4/packages/contacts/catalog/contacts.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/catalog/contacts.de_DE.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/contacts/catalog/contacts.de_DE.ISO-8859-1.xml	27 Jul 2005 14:06:14 -0000	1.8
+++ openacs-4/packages/contacts/catalog/contacts.de_DE.ISO-8859-1.xml	9 Aug 2005 12:44:19 -0000	1.9
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="contacts" package_version="1.0d4" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="contacts" package_version="1.0d5" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="--none--">-- Keine --</msg>
   <msg key="--select_one--">-- Bitte ausw�hlen --</msg>
@@ -18,6 +18,7 @@
   <msg key="Add_Signature">Eine Signatur hinzuf�gen</msg>
   <msg key="Add_to_Group">Zur Gruppe hinzuf�gen</msg>
   <msg key="Add_to_group">Zur Gruppe hinzuf�gen</msg>
+  <msg key="Add_to_Groups">Zu folgenden Gruppen hinzuf�gen</msg>
   <msg key="Address">Adresse</msg>
   <msg key="Admin">Verwaltung</msg>
   <msg key="Administer_Contacts">Kontakte verwalten</msg>
@@ -32,6 +33,7 @@
   <msg key="Bulk_Update">Massen Update</msg>
   <msg key="Cancel">Abbrechen</msg>
   <msg key="Clear">Leeren</msg>
+  <msg key="Comments">Kommentare</msg>
   <msg key="Contact">Kontakt</msg>
   <msg key="Contact_-">Kontakt -&amp;gt;</msg>
   <msg key="Contacts">Kontakte</msg>
@@ -52,11 +54,13 @@
   <msg key="False">falsch</msg>
   <msg key="Files">Dateien</msg>
   <msg key="First_Names">Vornamen</msg>
+  <msg key="Footer">Fu�zeile</msg>
   <msg key="Get">Lade</msg>
   <msg key="Go">Suche</msg>
   <msg key="Group_-">Gruppe -&amp;gt;</msg>
   <msg key="Group_Name">Gruppenname</msg>
   <msg key="Groups">Gruppen</msg>
+  <msg key="Header">Kopfzeile</msg>
   <msg key="History">Historie</msg>
   <msg key="In_Searches">Suchen</msg>
   <msg key="is_not_set">ist nicht eingerichtet</msg>
@@ -69,6 +73,8 @@
   <msg key="lt_--_Groups_-----------">-- Gruppen --------------------------</msg>
   <msg key="lt_--_My_Searches_------">-- Meine Suchen ---------------------</msg>
   <msg key="lt_--_top_level_group_--">-- Gruppe erste Ebene --</msg>
+  <msg key="lt_Add_new_in_Selected_Groups">Eine neue %object_type% hinzuf�gen und den ausgew�hlten Gruppen zuordnen</msg>
+  <msg key="lt_Add_new_relsrelations">Hinzuf�gen neuer %rels.relationship%</msg>
   <msg key="lt_Bulk_update_the_seclected_C">Die ausgew�hlten Kontakte �ndern</msg>
   <msg key="lt_Contact_Administratio">Verwaltung der Kontakte</msg>
   <msg key="lt_Debugging_Code_-_Only">Debugging Code - Nur SW Admins sehen dies</msg>
@@ -85,8 +91,10 @@
   <msg key="lt_The_default_group_mus">Die Standardgruppe muss den Vornamen und den Nachnamen f�r ein Personenformblatt enthalten sowie einen Organisationsnamen f�r ein Organisationsformblatt, beide ben�tigen eine E-Mail Adresse.</msg>
   <msg key="lt_this_is_my_default_si">Dies ist meine Standard Signatur</msg>
   <msg key="lt_Upgrade_this_person_to_a_user">Dieser Person als User registrieren/ upgraden</msg>
+  <msg key="lt_You_cannot_send_a_letter_to_invalid_recipients">Sie k�nnen keinen Brief an den folgenden Kontakt schicken: %invalid_recipients%</msg>
   <msg key="Mail">Mailing</msg>
   <msg key="Mail_Merge">Adresszusammenstellung</msg>
+  <msg key="Manage_group_categories">Kategorien f�r diese Gruppe</msg>
   <msg key="Message">Nachricht</msg>
   <msg key="Messages">Vorlagen</msg>
   <msg key="My_Searches">Meine Suchen</msg>
@@ -136,5 +144,6 @@
   <msg key="Upload_More">Mehrere Dateien uploaden</msg>
   <msg key="User_Account_Information">Informationen zu dem User Account</msg>
   <msg key="View_all_roles">Alle Rollen ansehen</msg>
+  <msg key="Visit_Club">Zum Kundenportal</msg>
   <msg key="which_match">die �bereinstimmen mit</msg>
 </message_catalog>
Index: openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml,v
diff -u -r1.26 -r1.27
--- openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml	27 Jul 2005 14:07:35 -0000	1.26
+++ openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml	9 Aug 2005 12:44:19 -0000	1.27
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="contacts" package_version="1.0d4" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="contacts" package_version="1.0d6" locale="en_US" charset="ISO-8859-1">
 
   <msg key="--_select_a_group_--">-- select a group --</msg>
   <msg key="--Create_New_Message--">-- Create New Message --</msg>
@@ -59,6 +59,7 @@
   <msg key="Clear_the_currently_selected_Search">Clear the currently selected Search</msg>
   <msg key="Comment_Added">Comment Added</msg>
   <msg key="Comments">Comments</msg>
+  <msg key="Complaint">Complaint</msg>
   <msg key="Configuration_Error">Configuration Error</msg>
   <msg key="Contact">Contact</msg>
   <msg key="Contact_-">Contact -&gt;</msg>
@@ -87,10 +88,12 @@
   <msg key="Create_user">Create User</msg>
   <msg key="CSV">CSV</msg>
   <msg key="Current">Current</msg>
+  <msg key="Customer">Customer:</msg>
   <msg key="Date">Date</msg>
   <msg key="days">days</msg>
   <msg key="Delete">Delete</msg>
   <msg key="Delete_from">Delete</msg>
+  <msg key="Description">Description:</msg>
   <msg key="Details">Details</msg>
   <msg key="does_not_contain_-">does not contain -&gt;</msg>
   <msg key="does_not_exists">does not exist</msg>
@@ -102,6 +105,10 @@
   <msg key="Email">Email</msg>
   <msg key="email">EMail</msg>
   <msg key="Email_Address">Email Address</msg>
+  <msg key="Employee">Employee</msg>
+  <msg key="Employees">Employees</msg>
+  <msg key="Employer">Employer</msg>
+  <msg key="Employers">Employers</msg>
   <msg key="Error">Error</msg>
   <msg key="even">even</msg>
   <msg key="exists">exists</msg>
@@ -113,6 +120,7 @@
   <msg key="files">files</msg>
   <msg key="First_Name">First Name</msg>
   <msg key="First_Names">First Names</msg>
+  <msg key="Footer">Footer</msg>
   <msg key="From">From</msg>
   <msg key="Get">Get</msg>
   <msg key="Go">Go</msg>
@@ -123,6 +131,7 @@
   <msg key="groups">groups</msg>
   <msg key="has_logged_in">has logged in</msg>
   <msg key="has_never_logged_in">has never logged in</msg>
+  <msg key="Header">Header</msg>
   <msg key="Help_Text">Help Text</msg>
   <msg key="History">History</msg>
   <msg key="In_Searches">Searches</msg>
@@ -194,7 +203,9 @@
   <msg key="lt_Contact_not_commented">Contact not commented on in the last: &lt;strong&gt;%interval%&lt;/strong&gt;</msg>
   <msg key="lt_Contact_not_created_i">Contact not created in the last: &lt;strong&gt;%interval%&lt;/strong&gt;</msg>
   <msg key="lt_Contact_not_updated_i">Contact not updated in the last: &lt;strong&gt;%interval%&lt;/strong&gt;</msg>
+  <msg key="lt_Contact_Rel_Employmen">Contact Rel Employment</msg>
   <msg key="lt_Contact_Relationships">Contact Relationships</msg>
+  <msg key="lt_Contact_Rels_Employme">Contact Rels Employment</msg>
   <msg key="lt_Contact_updated_in_th">Contact updated in the last: &lt;strong&gt;%interval%&lt;/strong&gt;</msg>
   <msg key="lt_contacts_were_deleted">%contacts@ were deleted</msg>
   <msg key="lt_country_code_is_not_-">country code is not -&gt;</msg>
@@ -238,6 +249,7 @@
   <msg key="lt_Organization_Relation_1">Organization Relationships</msg>
   <msg key="lt_Party_ID_equals_Searc">&quot;Party ID&quot; equals &quot;Search_Word&quot;</msg>
   <msg key="lt_People_or_Organizatio">People or Organizations</msg>
+  <msg key="lt_Person_-_Registered_U">Person - Registered Users</msg>
   <msg key="lt_Person_or_Organizatio">Person or Organization</msg>
   <msg key="lt_pretty_plural_list_na">%pretty_plural_list_name% found in search, please try again or add a new contact</msg>
   <msg key="lt_remember_that_you_can">remember that you can use &lt;a href=&quot;message-help&quot;&gt;mail merge substitutions&lt;/a&gt;. the most common wildcards are \{name\} \{first_names\}, \{last_name\}, \{home_address\} and \{date\}</msg>
@@ -249,6 +261,7 @@
   <msg key="lt_Some_of_the_required_">Some of the required elements for this form are missing. Please contact an administrator and make sure that the following attributes are included in the default group's form for this object type:</msg>
   <msg key="lt_Some_of_the_required__1">Some of the required elements for this form are missing. Please contact an administrator and make sure that the following attributes are included:</msg>
   <msg key="lt_stateprovince_is_not_">state/province is not -&gt;</msg>
+  <msg key="lt_The_-object_type-_-contact_link-_was_added">The object type %contact_link% was added</msg>
   <msg key="lt_the_action_supplied_i">the action supplied is not valid</msg>
   <msg key="lt_The_contact_is_in_the">The contact is in the group: &lt;strong&gt;%group_pretty%&lt;/strong&gt;</msg>
   <msg key="lt_The_contact_is_NOT_in">The contact is NOT in the group: &lt;strong&gt;%group_pretty%&lt;/strong&gt;</msg>
@@ -321,6 +334,7 @@
   <msg key="Not_Configured">Not Configured</msg>
   <msg key="not_in_the_search">not in the search</msg>
   <msg key="Number_of_Rows">Number of Rows</msg>
+  <msg key="Object">Object:</msg>
   <msg key="odd">odd</msg>
   <msg key="of">of</msg>
   <msg key="or">or</msg>
@@ -332,6 +346,7 @@
   <msg key="Other_Options">Other Options</msg>
   <msg key="Output">Output</msg>
   <msg key="Owner">Owner</msg>
+  <msg key="Paid">Paid:</msg>
   <msg key="Paper_Type">Paper Type</msg>
   <msg key="Parent_Group">Parent Group</msg>
   <msg key="Part_of">Part of</msg>
@@ -341,6 +356,7 @@
   <msg key="people">people</msg>
   <msg key="People_or_Organizations">People or Organizations</msg>
   <msg key="people_or_organizations">people or organizations</msg>
+  <msg key="Percent">Percent:</msg>
   <msg key="Permissions">Permissions</msg>
   <msg key="Person">Person</msg>
   <msg key="Person_Form">Person Form</msg>
@@ -349,6 +365,7 @@
   <msg key="Print_Letter">Print Letter</msg>
   <msg key="Processes">Processes</msg>
   <msg key="PROJECT">PROJECT</msg>
+  <msg key="Project">Project:</msg>
   <msg key="Public">Public</msg>
   <msg key="Public_Messages">Public Messages</msg>
   <msg key="Public_Page">Public Page</msg>
@@ -406,6 +423,7 @@
   <msg key="Subject_is_required">Subject is required</msg>
   <msg key="Summary">Summary</msg>
   <msg key="Summary_View">Summary View</msg>
+  <msg key="Supplier">Supplier:</msg>
   <msg key="Table">Table</msg>
   <msg key="Tasks">Tasks</msg>
   <msg key="The_action_specified_is_invalid">The action specified is invalid</msg>
@@ -419,8 +437,10 @@
   <msg key="The_search_-title-_was_made_public">The search &quot;%title%&quot; was made public</msg>
   <msg key="Times">times</msg>
   <msg key="Title">Title</msg>
+  <msg key="Title_1">Title:</msg>
   <msg key="To">To</msg>
   <msg key="True">True</msg>
+  <msg key="Turnover">Turnover:</msg>
   <msg key="Type">Type</msg>
   <msg key="Update">Update</msg>
   <msg key="Update_filenames">Update filenames</msg>
Index: openacs-4/packages/contacts/lib/contact-complaint-form.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-complaint-form.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/lib/contact-complaint-form.tcl	8 Aug 2005 21:50:57 -0000	1.1
+++ openacs-4/packages/contacts/lib/contact-complaint-form.tcl	9 Aug 2005 12:44:19 -0000	1.2
@@ -1,12 +1,7 @@
+# customer_id. Party ID of the customer for which the complaint was made.
+# supplier_id. Party ID of the supplier who caused the complaint
+# project_id. Alternative for the customer_id, if you know the project_id
 
-
-if { ![info exist customer_id] || ![info exist supplier_id] } {
-    set user_options [list]
-    db_foreach get_users { } {
-	lappend user_options [list $fullname $user_id]
-    }
-}
-
 if { ![info exist return_url] } {
     set return_url [get_referrer]
 }
@@ -15,7 +10,8 @@
 ad_form -name complaint_form -form {
     complaint_id:key
     {title:text(text)
-	{label "Title:"}
+	{label "[_ contacts.Title_1]"}
+        {help_text "[_ contacts.complaint_title_help]"}
     }
     {return_url:text(hidden)
 	{value $return_url}
@@ -25,52 +21,60 @@
 if { ![info exist customer_id] } {
     ad_form -extend -name complaint_form -form {
 	{customer_id:text(select)
-	    {label "Customer:"}
+	    {label "[_ contacts.Customer]"}
 	    {options $user_options}
 	}
     }
 } else {
-    acs_user::get -user_id $customer_id -array customer_info
+    set customer_name [contact::name -party_id $customer_id]
     ad_form -extend -name complaint_form -form {
 	{customer_id:text(hidden)
 	    {value $customer_id}
 	}
 	{customer:text(inform),optional
-	    {label "Customer:"}
-	    {value "$customer_info(first_names) $customer_info(last_name)"}
+	    {label "[_ contacts.Customer]"}
+	    {value "<a href=\"/contacts/${customer_id}\">$customer_name</a>"}
 	}
     }
 }
 
 if { ![info exist supplier_id]} {
+
+    set user_options [list]
+    db_foreach get_users { } {
+	lappend user_options [list $fullname $user_id]
+    }
     ad_form -extend -name complaint_form -form {
 	{supplier_id:text(select)
-	    {label "Supplier:"}
+	    {label "[_ contacts.Supplier]"}
 	    {options $user_options}
 	}
     }
 } else {
-    acs_user::get -user_id $supplier_id -array supplier_info
+
+    set supplier_name [contact::name -party_id $supplier_id]
     ad_form -extend -name complaint_form -form {
 	{supplier_id:text(hidden)
 	    {value $supplier_id}
 	}
 	{supplier:text(inform),optional
-	    {label "Supplier:"}
-	    {value "$supplier_info(first_names) $supplier_info(last_name)"}
+	    {label "[_ contacts.Supplier]"}
+	    {value "$supplier_name"}
 	}
     }
 }
 
 ad_form -extend -name complaint_form -form {
     {turnover:text(text)
-	{label "Turnover:"}
+	{label "[_ contacts.Turnover]"}
 	{html {size 10}}
+        {help_text "[_ contacts.complaint_turnover_help]"}
     }
     {percent:text(text)
-	{label "Percent:"}
+	{label "[_ contacts.Percent]"}
 	{html {size 2}}
 	{after_html "%"}
+        {help_text "[_ contacts.complaint_percent_help]"}
     }
 }
 
@@ -82,30 +86,34 @@
     }
     ad_form -extend -name complaint_form -form {
 	{object_id:text(select)
-	    {label "Project:"}
+	    {label "[_ contacts.Project]"}
 	    {options $project_options}
 	}
     }
 } else {
+    set object_id $project_id
     ad_form -extend -name complaint_form -form {
 	{object_id:text(hidden)
 	    {value $object_id}
 	}
 	{project:text(inform)
-	    {label "Object:"}
-	    {value [pm::project::name -project_item_id $object_id]}
+	    {label "[_ contacts.Object]"}
+	    {value "[pm::project::name -project_id $object_id]"}
 	}
     }
 }
 
 ad_form -extend -name complaint_form -form {
     {paid:text(text)
-	{label "Paid:"}
+	{label "[_ contacts.Paid]"}
 	{html {size 10}}
+        {help_text "[_ contacts.complaint_paid_help]"}
+
     }
     {description:text(textarea)
-	{label "Description:"}
+	{label "[_ contacts.Description]"}
 	{html {rows 10 cols 30}}
+        {help_text "[_ contacts.complaint_description_help]"}
     }
 } -new_data {
   
Index: openacs-4/packages/contacts/lib/contact-complaint-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-complaint-list.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/lib/contact-complaint-list.adp	8 Aug 2005 21:50:57 -0000	1.1
+++ openacs-4/packages/contacts/lib/contact-complaint-list.adp	9 Aug 2005 12:44:19 -0000	1.2
@@ -1,8 +1,10 @@
 <table cellpadding="3" cellspacing="3" width="100%">
   <tr>
-    <td class="list-filter-pane-big" valign="top" width="20%">
-	<listfilters name="complaint"></listfilters>
-    </td>
+    <if @filter_p@ eq 1>
+      <td class="list-filter-pane-big" valign="top" width="20%">
+          <listfilters name="complaint"></listfilters>
+      </td>            
+    </if>
     <td valign="top" width="80%">
 	<listtemplate name="complaint"></listtemplate>	
     </td>
Index: openacs-4/packages/contacts/lib/contact-complaint-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-complaint-list.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/lib/contact-complaint-list.tcl	8 Aug 2005 21:50:57 -0000	1.1
+++ openacs-4/packages/contacts/lib/contact-complaint-list.tcl	9 Aug 2005 12:44:19 -0000	1.2
@@ -7,9 +7,12 @@
 } {
     customer_id:optional
     supplier_id:optional
+    {filter_p 0} 
 }
 
-
+if {![exists_and_not_null customer_id]} {
+    unset customer_id
+}
 set elements [list \
 		  title [list label "Title"]\
 		  customer [list label "Customer"]\
@@ -57,9 +60,7 @@
 
 
 db_multirow -extend { customer supplier title description } complaint get_complaints { } {
-    acs_user::get -user_id $customer_id -array customer_info
-    acs_user::get -user_id $supplier_id -array supplier_info
-    set customer "$customer_info(first_names) $customer_info(last_name)"
-    set supplier "$supplier_info(first_names) $supplier_info(last_name)"
+    set customer "[contact::name -party_id $customer_id]"
+    set supplier "[contact::name -party_id $supplier_id]"
     db_1row get_revision_info { }
 }
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.2 -r1.3
--- openacs-4/packages/contacts/lib/contacts-master.adp	28 Jun 2005 04:09:25 -0000	1.2
+++ openacs-4/packages/contacts/lib/contacts-master.adp	9 Aug 2005 12:44:19 -0000	1.3
@@ -18,8 +18,12 @@
 </if>
 <else>
   <master src="@contacts_master_template@">
+  <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>
 </else>
-
 <slave>
 
 
Index: openacs-4/packages/contacts/lib/contacts.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contacts.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/contacts/lib/contacts.tcl	7 Aug 2005 05:50:56 -0000	1.19
+++ openacs-4/packages/contacts/lib/contacts.tcl	9 Aug 2005 12:44:19 -0000	1.20
@@ -73,11 +73,11 @@
 append name_label "&nbsp;&nbsp;&nbsp;[_ contacts.Get]: <a href=\"[export_vars -base $base_url -url {{format csv} search_id query page orderby page_size}]\">[_ contacts.CSV]</a>"
 
 template::multirow create bulk_acts pretty link detailed
-template::multirow append bulk_acts "[_ contacts.Add_to_Group]" "group-parties-add" "[_ contacts.Add_to_group]"
-template::multirow append bulk_acts "[_ contacts.Remove_From_Group]" "group-parties-remove" "[_ contacts.lt_Remove_from_this_Grou]"
-template::multirow append bulk_acts "[_ contacts.Mail_Merge]" "message" "[_ contacts.lt_E-mail_or_Mail_the_se]"
+template::multirow append bulk_acts "[_ contacts.Add_to_Group]" "${base_url}group-parties-add" "[_ contacts.Add_to_group]"
+template::multirow append bulk_acts "[_ contacts.Remove_From_Group]" "${base_url}group-parties-remove" "[_ contacts.lt_Remove_from_this_Grou]"
+template::multirow append bulk_acts "[_ contacts.Mail_Merge]" "${base_url}message" "[_ contacts.lt_E-mail_or_Mail_the_se]"
 if { [permission::permission_p -object_id $package_id -privilege "admin"] } {
-    template::multirow append bulk_acts "[_ contacts.Bulk_Update]" "bulk-update" "[_ contacts.lt_Bulk_update_the_seclected_C]"
+    template::multirow append bulk_acts "[_ contacts.Bulk_Update]" "${base_url}bulk-update" "[_ contacts.lt_Bulk_update_the_seclected_C]"
 }
 callback contacts::bulk_actions -multirow "bulk_acts"
 
Index: openacs-4/packages/contacts/lib/contacts.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contacts.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/contacts/lib/contacts.xql	28 Jun 2005 03:33:31 -0000	1.4
+++ openacs-4/packages/contacts/lib/contacts.xql	9 Aug 2005 12:44:19 -0000	1.5
@@ -4,7 +4,7 @@
 <fullquery name="contacts_pagination">
       <querytext>
 select parties.party_id
-  from parties left join cr_items on (parties.party_id = cr_items.item_id) left join cr_revisions on (cr_items.latest_revision = cr_revisions.revision_id ) , group_distinct_member_map
+  from parties left join cr_items on (parties.party_id = cr_items.item_id) left join cr_revisions on (cr_items.latest_revision = cr_revisions.revision_id ), group_distinct_member_map
  where parties.party_id = group_distinct_member_map.member_id
    and group_distinct_member_map.group_id $where_group_id
 [contact::search_clause -and -search_id $search_id -query $query -party_id "parties.party_id" -revision_id "revision_id"]
Index: openacs-4/packages/contacts/lib/history.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/history.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/lib/history.adp	16 Jul 2005 20:14:43 -0000	1.2
+++ openacs-4/packages/contacts/lib/history.adp	9 Aug 2005 12:44:19 -0000	1.3
@@ -11,7 +11,7 @@
       <dd class="<if @history.creation_user@ eq @user_id@>mine-</if><if @history.rownum@ odd>odd</if><else>even</else>">
    
 	<if @history.include@ nil>
-	      <p>@history.content;noquote@</p>
+	      @history.content;noquote@
         </if>
         <else>
               <include src=@history.include@ content=@history.content;noquote@ object_id=@history.object_id@ party_id=@party_id@>
Index: openacs-4/packages/contacts/lib/letter.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/letter.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/contacts/lib/letter.tcl	27 Jul 2005 14:07:35 -0000	1.7
+++ openacs-4/packages/contacts/lib/letter.tcl	9 Aug 2005 12:44:19 -0000	1.8
@@ -16,6 +16,31 @@
     }
 }
 
+if {[exists_and_not_null header_id]} {
+    contact::message::get -item_id $header_id -array header_info
+    set header [ad_html_text_convert \
+		     -to "text/html" \
+		     -from $header_info(content_format) \
+		     -- $header_info(content) \
+		    ]
+} else {
+    set header "<div class=\"mailing-address\">{name}<br />
+{mailing_address}</div>"
+}
+
+if {[exists_and_not_null footer_id]} {
+    contact::message::get -item_id $footer_id -array footer_info
+    set footer [ad_html_text_convert \
+		     -to "text/html" \
+		     -from $footer_info(content_format) \
+		     -- $footer_info(content) \
+		    ]
+} else {
+    set footer ""
+}
+
+
+    
 set date [split [dt_sysdate] "-"]
 append form_elements {
     message_id:key
@@ -33,16 +58,21 @@
     {date:date(date)
 	{label "[_ contacts.Date]"}
     }
-    {address:text(inform),optional
-	{label "[_ contacts.Address]"}
-	{value "{name}<br>{mailing_address}"}
+    {header:text(inform),optional
+	{label "[_ contacts.Header]"}
+	{value "$header"}
 	{help_text {[_ contacts.lt_The_recipeints_name_a]}}
     }
     {content:richtext(richtext)
 	{label "[_ contacts.Message]"}
 	{html {cols 70 rows 24}}
 	{help_text {[_ contacts.lt_remember_that_you_can]}}
     }
+    {footer:text(inform),optional
+	{label "[_ contacts.Footer]"}
+	{value "$footer"}
+	{help_text {[_ contacts.lt_The_recipeints_name_a]}}
+    }
 }
 
 ad_form -action message \
@@ -116,13 +146,23 @@
 		break
 	    }
 
-	    set letter "<div class=\"message\">
-<div class=\"mailing-address\">$name<br />
-$mailing_address</div>
-<div class=\"content\">$content</div>
+	    set letter "<table heigth=\"3000\" width=\"650\" cellpadding=\"0\" cellspacing=\"0\" align=\"center\" border=\"0\">
+	<tr>
+		<td>
+$header
+			<br><br>
+		</td>
+	</tr>
+	<tr>
+<td>
+$content
+</td>
+</tr>
+<tr valign=\"bottom\">
+<td>
+$footer
+</td>"
 
-</div>"
-
 	    set values [list]
 	    foreach element [list first_names last_name name mailing_address date salutation] {
 		lappend values [list "{$element}" [set $element]]
Index: openacs-4/packages/contacts/sql/postgresql/contacts-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/sql/postgresql/contacts-create.sql,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/contacts/sql/postgresql/contacts-create.sql	8 Aug 2005 21:53:12 -0000	1.9
+++ openacs-4/packages/contacts/sql/postgresql/contacts-create.sql	9 Aug 2005 12:44:19 -0000	1.10
@@ -138,11 +138,13 @@
 			references cr_revisions(revision_id)
 			on delete cascade,
 	customer_id 	integer
-			constraint contact_complaint_tracking_fk
-			references users(user_id) on delete cascade,
+			constraint contact_complaint_tracking_customer_fk
+			references parties(party_id) on delete cascade,
 	turnover	float,
 	percent		integer,
-	supplier_id	integer,
+	supplier_id	integer
+       			constraint contact_complaint_tracking_supplier_fk
+			references parties(party_id) on delete cascade,
 	paid		float,
 	object_id	integer,
 	state 		varchar(10),
Index: openacs-4/packages/contacts/www/contact.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact.adp,v
diff -u -r1.26 -r1.27
--- openacs-4/packages/contacts/www/contact.adp	21 Jul 2005 20:44:11 -0000	1.26
+++ openacs-4/packages/contacts/www/contact.adp	9 Aug 2005 12:44:19 -0000	1.27
@@ -46,6 +46,7 @@
 	
 	<h3 class="contact-title"><a href="/invoices">#invoices.Billable_Projects#</a></h3>
 	<include src="/packages/invoices/lib/projects-billable" organization_id="@party_id@" elements="checkbox project_id title amount_open" package_id="@iv_package_id@" base_url="@iv_base_url@" />
+	<include src="/packages/glossar/lib/glossar-list" owner_id=@party_id@ orderby=@orderby@ customer_id=@party_id@ format=table></include>
       </if>
     </if>
     <if @update_date@ not nil>
Index: openacs-4/packages/contacts/www/group-party-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/group-party-add.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/www/group-party-add.tcl	28 Jun 2005 19:13:26 -0000	1.2
+++ openacs-4/packages/contacts/www/group-party-add.tcl	9 Aug 2005 12:44:19 -0000	1.3
@@ -12,12 +12,15 @@
 
 set party_id [lindex $party_id 0]
 switch [contact::type -party_id $party_id] {
-     person {
-         set rel_type "membership_rel"
-     }
-     organization {
-         set rel_type "organization_rel"
-     }
+    person {
+	set rel_type "membership_rel"
+    }
+    organization {
+	set rel_type "organization_rel"
+    }
+    default {
+	set rel_type "membership_rel"
+    }
 }
 relation_add -member_state "approved" $rel_type $group_id $party_id
 
Index: openacs-4/packages/contacts/www/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/index.vuh,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/contacts/www/index.vuh	28 Jun 2005 20:25:02 -0000	1.6
+++ openacs-4/packages/contacts/www/index.vuh	9 Aug 2005 12:44:19 -0000	1.7
@@ -37,6 +37,7 @@
                message       { set file "message" }
 	       letter        { set file "letter" }
 	       email         { set file "email" }
+	       complaint     { set file "complaint" }
 	       history       { set file "history" }
                default       { set file [parameter::get -parameter "ContactSummaryViewTemplate" -default "/packages/contacts/www/contact"] }
            }
Index: openacs-4/packages/contacts/www/message.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/message.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/contacts/www/message.adp	1 Jul 2005 22:45:23 -0000	1.10
+++ openacs-4/packages/contacts/www/message.adp	9 Aug 2005 12:44:19 -0000	1.11
@@ -29,6 +29,8 @@
 	item_id=@item_id@
         signature_id=@signature_id@ 
         recipients=@recipients;noquote@
+        footer_id=@footer_id@
+        header_id=@header_id@
         >
   </else>
 </if>
Index: openacs-4/packages/contacts/www/message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/message.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/contacts/www/message.tcl	1 Jul 2005 22:45:23 -0000	1.11
+++ openacs-4/packages/contacts/www/message.tcl	9 Aug 2005 12:44:19 -0000	1.12
@@ -9,6 +9,8 @@
     {party_ids:optional}
     {message_type ""}
     {message:optional}
+    {header_id:integer ""}
+    {footer_id:integer ""}
     {return_url "./"}
     {object_id:integer,multiple,optional}
     {file_ids ""}
@@ -26,6 +28,7 @@
 	}
     }
 }
+
 if { [exists_and_not_null message] && ![exists_and_not_null message_type] } {
     set message_type [lindex [split $message "."] 0]
     set item_id [lindex [split $message "."] 1]
@@ -137,42 +140,70 @@
 }
 
 
-if { [string is false [exists_and_not_null message_type]] } {
+if { ![exists_and_not_null message_type] } {
 
     set message_type_options [ams::util::localize_and_sort_list_of_lists \
 				  -list [db_list_of_lists get_message_types { select pretty_name, message_type from contact_message_types }] \
 				 ]
 
     set message_options [list]
     foreach op $message_type_options {
-	lappend message_options [list "-- [_ contacts.New] [lindex $op 0] --" [lindex $op 1]]
+	set message_type [lindex $op 1]
+	if {$message_type == "letter" || $message_type == "email"} {
+	    lappend message_options [list "-- [_ contacts.New] [lindex $op 0] --" $message_type]
+	} else {
+	    set ${message_type}_options [list [list [_ contacts.--none--] ""]]
+	}
+	
 	# set email_text and letter_text and others in the future
-	set "[lindex $op 1]_text" [lindex $op 0]
+	set "${message_type}_text" [lindex $op 0]
     }
 
     set public_text [_ contacts.Public]
     set package_id [ad_conn package_id]
+
+    db_foreach get_messages {
+	select CASE WHEN owner_id = :package_id THEN :public_text ELSE contact__name(owner_id) END as public_display,
+	title,
+	to_char(item_id,'FM9999999999999999999999') as item_id,
+	message_type
+	from contact_messages
+	where owner_id in ( select party_id from parties )
+	or owner_id = :package_id
+	order by CASE WHEN owner_id = :package_id THEN '000000000' ELSE upper(contact__name(owner_id)) END, message_type, upper(title)
+    } {
+	if {$message_type == "letter" || $message_type == "email"} {
+	    lappend ${message_type}_options [list "$public_display [set ${message_type}_text]:$title" "${message_type}.$item_id"]
+	} else {
+	    lappend ${message_type}_options [list "$public_display:$title" "$item_id"]
+	}
+    }
     set message_options [concat \
 			     $message_options \
-			     [db_list_of_lists get_messages {
-				 select CASE WHEN owner_id = :package_id THEN :public_text ELSE contact__name(owner_id) END || ' ' || CASE WHEN message_type = 'email' THEN :email_text WHEN message_type = 'letter' THEN :letter_text END || ': ' || title,
-				        message_type || '.' || to_char(item_id,'FM9999999999999999999999')
-                                   from contact_messages
-                                  where owner_id in ( select party_id from parties )
-                                     or owner_id = :package_id
-                                  order by CASE WHEN owner_id = :package_id THEN '000000000' ELSE upper(contact__name(owner_id)) END, message_type, upper(title)
-			     }] \
-			    ]
+			     $letter_options \
+			     $email_options]
 
+    if {[exists_and_not_null header_options]} {
+	lappend form_elements [list \
+			       header_id:text(select) \
+			       [list label "[_ contacts.Header]"] \
+			       [list options $header_options] \
+			      ]
+    }
+
     lappend form_elements [list \
 			       message:text(select) \
 			       [list label "[_ contacts.Message]"] \
 			       [list options $message_options] \
 			      ]
+
+    set message_type ""
     set title [_ contacts.create_a_message]
+
 } else {
     set title [_ contacts.create_$message_type]
 }
+
 set context [list $title]
 
 if { [string is false [exists_and_not_null message]] } {
@@ -199,6 +230,14 @@
     
 }
 
+if {[exists_and_not_null footer_options]} {
+    lappend form_elements [list \
+			       footer_id:text(select) \
+			       [list label "[_ contacts.Footer]"] \
+			       [list options $footer_options] \
+			      ]
+}
+
 set edit_buttons [list [list "[_ contacts.Next]" create]]
 
 # the message form will rest party_ids so we need to carry it over
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.4 -r1.5
--- openacs-4/packages/contacts/www/relationship-ae.tcl	7 Jun 2005 07:45:40 -0000	1.4
+++ openacs-4/packages/contacts/www/relationship-ae.tcl	9 Aug 2005 12:44:19 -0000	1.5
@@ -74,6 +74,7 @@
 	set creation_ip [ad_conn peeraddr]
 	set rel_id [db_exec_plsql create_rel {}]
         db_dml insert_contact_rel {}
+	#	callback contact::insert_contact_rel -package_id $package_id -form party_ae -object_type $object_type
         util_user_message -message "[_ contacts.Relationship_Added]"
     } else {
         util_user_message -message "[_ contacts.Relationship_Updated]"
Index: openacs-4/packages/contacts/www/resources/contacts.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/resources/contacts.css,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/contacts/www/resources/contacts.css	28 Jun 2005 19:22:02 -0000	1.10
+++ openacs-4/packages/contacts/www/resources/contacts.css	9 Aug 2005 12:44:20 -0000	1.11
@@ -25,16 +25,15 @@
   text-align: right;
 }
 dl.comments {
-  font-size: 85%;
+  font-size: 100%;
   margin: 0px;
   padding: 0px;
   }
 dl.comments dt {
-  padding: 5px;
   margin: 5px 0px 0px 0px;
   background: #EEE;
   font-weight: normal;
-  font-size: 75%;
+  font-size: 100%;
   }
 dl.comments dd {
   padding: 5px;
@@ -45,10 +44,10 @@
   background: #DDD;
   }
 dl.comments dt.mine-odd, dl.comments dd.mine-odd {
-  background: #FDE;
+  background: #FFFFFF;
   }
 dl.comments dt.mine-even, dl.comments dd.mine-even {
-  background: #FDE;
+  background: #FFFFFF;
   }
 dl.comments .number {
   padding: 0px 5px 0px 0px;