Index: openacs-4/packages/contacts/contacts.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/contacts.info,v
diff -u -r1.58 -r1.59
--- openacs-4/packages/contacts/contacts.info	26 Dec 2005 16:45:59 -0000	1.58
+++ openacs-4/packages/contacts/contacts.info	31 Dec 2005 07:39:37 -0000	1.59
@@ -7,14 +7,14 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="1.1d10" url="http://openacs.org/repository/download/apm/contacts-1.1d10.apm">
+    <version name="1.1d11" url="http://openacs.org/repository/download/apm/contacts-1.1d11.apm">
         <owner url="mailto:openacs@geddert.com">Matthew Geddert</owner>
         <summary>This application lets you collaboratively view, edit and categorize contacts.</summary>
         <release-date>2005-11-23</release-date>
         <description format="text/plain">Contacts is an application for managing all those people and or organization you need to keep track of. It has a complete UI for storing and categorizing contacts. Each contact can have an arbitrary number of custom attributes associated with it, including other contacts (i.e. a certain contact &quot;belongs&quot; to a certain organization). It also functions as a service contract provider for attributes related to users in your system</description>
         <maturity>0</maturity>
 
-        <provides url="contacts" version="1.1d10"/>
+        <provides url="contacts" version="1.1d11"/>
         <requires url="acs-tcl" version="5.2.0b3"/>
         <requires url="acs-datetime" version="4.2"/>
         <requires url="acs-events" version="0.5d3"/>
@@ -30,6 +30,7 @@
             <callback type="after-instantiate"  proc="contacts::install::package_instantiate"/>
         </callbacks>
         <parameters>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultOrganizationID"  default="0" description="Organization ID of the organization running this site"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="AcceptableFileUploadMIMETypes"  default="*" description="* for any. CSV of acceptable MIME Types for File Upload" section_name="File Upload"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="AcceptablePhotoUploadMIMETypes"  default="image/jpeg,image/gif,image/png,image/bmp,image/tiff" description="CSV of acceptable MIME Types for Photo Upload" section_name="Photos"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="AddEditComplaint"  default="/packages/contacts/templates/ae-complaint" description="The template for the display of the complaint form" section_name="Portal Templates"/>
Index: openacs-4/packages/contacts/bin/convert.sh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/bin/Attic/convert.sh,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/contacts/bin/convert.sh	31 Dec 2005 07:39:38 -0000	1.1
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Set the display variable to the home of the user who has write access to the X11 server
+# which is running on the display port. This could either be VNC or something else.
+
+export HOME=/home/malte
+/etc/openoffice.org-2.0/program/soffice.bin -writer -headless -pt pdfconv $1 -display lektor:1.0
\ No newline at end of file
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.21 -r1.22
--- openacs-4/packages/contacts/catalog/contacts.de_DE.ISO-8859-1.xml	27 Dec 2005 08:39:02 -0000	1.21
+++ openacs-4/packages/contacts/catalog/contacts.de_DE.ISO-8859-1.xml	31 Dec 2005 07:39:39 -0000	1.22
@@ -136,7 +136,7 @@
   <msg key="Email">e-Mail</msg>
   <msg key="email">EMail</msg>
   <msg key="Email_Address">e-Mail Adresse</msg>
-  <msg key="Employee">Angestellter</msg>
+  <msg key="Employee">Kundenkontakt</msg>
   <msg key="Employees">Angestellte</msg>
   <msg key="Employer">Arbeitgeber</msg>
   <msg key="Employers">Arbeitgeber</msg>
@@ -188,6 +188,7 @@
   <msg key="is_not_set">ist nicht eingerichtet</msg>
   <msg key="is_set">ist eingerichtet</msg>
   <msg key="last">letztes</msg>
+  <msg key="Last_Modified">Letzte �nderung</msg>
   <msg key="Last_Name">Nachnamen</msg>
   <msg key="Last_updated">Letzte �nderung</msg>
   <msg key="Latest">Sp�tester</msg>
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.57 -r1.58
--- openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml	27 Dec 2005 09:08:13 -0000	1.57
+++ openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml	31 Dec 2005 07:39:39 -0000	1.58
@@ -188,6 +188,7 @@
   <msg key="is_not_set">is not set</msg>
   <msg key="is_set">is set</msg>
   <msg key="last">last</msg>
+  <msg key="Last_Modified">Last updated</msg>
   <msg key="Last_Name">Last Name</msg>
   <msg key="Last_updated">Last updated</msg>
   <msg key="Latest">Latest</msg>
@@ -524,6 +525,7 @@
   <msg key="Upload_file">Upload File</msg>
   <msg key="Upload_More">Upload More</msg>
   <msg key="User_Account_Information">User Account Information</msg>
+  <msg key="Users">Users</msg>
   <msg key="valid">Valid</msg>
   <msg key="Var_name">Variable Name</msg>
   <msg key="var_name_help">Name of the variable to use in the extend search.</msg>
Index: openacs-4/packages/contacts/lib/ap-tasks-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/ap-tasks-portlet.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/lib/ap-tasks-portlet.adp	17 Nov 2005 16:24:30 -0000	1.2
+++ openacs-4/packages/contacts/lib/ap-tasks-portlet.adp	31 Dec 2005 07:39:39 -0000	1.3
@@ -15,6 +15,7 @@
 		orderby_p="@orderby_p@"
 		display_mode="list"
 		pt_orderby="@pt_orderby@"
+		status_id="@status_id@"
 		elements="@elements@"
 	    />
         </td>
Index: openacs-4/packages/contacts/lib/contacts.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contacts.tcl,v
diff -u -r1.37 -r1.38
--- openacs-4/packages/contacts/lib/contacts.tcl	14 Dec 2005 17:26:53 -0000	1.37
+++ openacs-4/packages/contacts/lib/contacts.tcl	31 Dec 2005 07:39:39 -0000	1.38
@@ -93,22 +93,32 @@
 }
 
 
+set last_modified_join ""
+set last_modified_clause ""
+
 switch $orderby {
     "first_names,asc" {
-        set name_label "[_ contacts.Sort_by]: [_ contacts.First_Names] | <a href=\"[export_vars -base $base_url -url {format search_id query page page_size {orderby {last_name,asc}}}]\">[_ contacts.Last_Name]</a> | <a href=\"[export_vars -base $base_url -url {format search_id query page page_size {orderby {organization,asc}}}]\">[_ contacts.Organization]</a>"
+        set name_label "[_ contacts.Sort_by]: [_ contacts.First_Names] | <a href=\"[export_vars -base $base_url -url {format search_id query page page_size {orderby {last_name,asc}}}]\">[_ contacts.Last_Name]</a> | <a href=\"[export_vars -base $base_url -url {format search_id query page page_size {orderby {organization,asc}}}]\">[_ contacts.Organization]</a> | <a href=\"[export_vars -base $base_url -url {format search_id query page page_size {orderby {last_modified,desc}}}]\">[_ contacts.Last_Modified]</a>"
 	set left_join "left join persons on (parties.party_id = persons.person_id)"
 	set sort_item "lower(first_names)"
     }
     "last_name,asc" {
-        set name_label "[_ contacts.Sort_by] <a href=\"[export_vars -base $base_url -url {format search_id query page page_size {orderby {first_names,asc}}}]\">[_ contacts.First_Names]</a> | [_ contacts.Last_Name] | <a href=\"[export_vars -base $base_url -url {format search_id query page page_size {orderby {organization,asc}}}]\">[_ contacts.Organization]</a>"
+        set name_label "[_ contacts.Sort_by] <a href=\"[export_vars -base $base_url -url {format search_id query page page_size {orderby {first_names,asc}}}]\">[_ contacts.First_Names]</a> | [_ contacts.Last_Name] | <a href=\"[export_vars -base $base_url -url {format search_id query page page_size {orderby {organization,asc}}}]\">[_ contacts.Organization]</a> | <a href=\"[export_vars -base $base_url -url {format search_id query page page_size {orderby {last_modified,desc}}}]\">[_ contacts.Last_Modified]</a>"
 	set left_join "left join persons on (parties.party_id = persons.person_id)"
 	set sort_item "lower(last_name)"
     }
     "organization,asc" {
-        set name_label "[_ contacts.Sort_by] <a href=\"[export_vars -base $base_url -url {format search_id query page page_size {orderby {first_names,asc}}}]\">[_ contacts.First_Names]</a>  | <a href=\"[export_vars -base $base_url -url {format search_id query page page_size {orderby {last_name,asc}}}]\">[_ contacts.Last_Name]</a> | [_ contacts.Organization]"
+        set name_label "[_ contacts.Sort_by] <a href=\"[export_vars -base $base_url -url {format search_id query page page_size {orderby {first_names,asc}}}]\">[_ contacts.First_Names]</a>  | <a href=\"[export_vars -base $base_url -url {format search_id query page page_size {orderby {last_name,asc}}}]\">[_ contacts.Last_Name]</a> | [_ contacts.Organization] | <a href=\"[export_vars -base $base_url -url {format search_id query page page_size {orderby {last_modified,desc}}}]\">[_ contacts.Last_Modified]</a>"
 	set left_join "left join organizations on (parties.party_id = organizations.organization_id)"
 	set sort_item "lower(organizations.name)"
     }
+    "last_modified,desc" {
+        set name_label "[_ contacts.Sort_by] <a href=\"[export_vars -base $base_url -url {format search_id query page page_size {orderby {first_names,asc}}}]\">[_ contacts.First_Names]</a>  | <a href=\"[export_vars -base $base_url -url {format search_id query page page_size {orderby {last_name,asc}}}]\">[_ contacts.Last_Name]</a> | <a href=\"[export_vars -base $base_url -url {format search_id query page page_size {orderby {organization,asc}}}]\">[_ contacts.Organization]</a> | [_ contacts.Last_Modified]"
+	set left_join "left join organizations on (parties.party_id = organizations.organization_id)"
+	set sort_item "acs_objects.last_modified"
+	set last_modified_join "acs_objects, "
+	set last_modified_clause "and parties.party_id = acs_objects.object_id"
+    }
 }
 
 append name_label " &nbsp;&nbsp; [_ contacts.Show]: "
@@ -282,18 +292,23 @@
         first_names {
             label "[_ contacts.First_Name]"
             orderby_asc  "lower(first_names) asc"
-            orderby_desc "lower(first_names) asc"
+            orderby_desc "lower(first_names) desc"
         }
         last_name {
             label "[_ contacts.Last_Name]"
             orderby_asc  "lower(last_name) asc"
-            orderby_desc "lower(last_name) asc"
+            orderby_desc "lower(last_name) desc"
         }
         organization {
-            label "[_ contacts.Last_Name]"
+            label "[_ contacts.Organization]"
             orderby_asc  "lower(organizations.name) asc"
-            orderby_desc "lower(organizations.name) asc"
+            orderby_desc "lower(organizations.name) desc"
         }
+        last_modified {
+            label "[_ contacts.Last_Modified]"
+            orderby_asc  "acs_objects.last_modified asc"
+            orderby_desc "acs_objects.last_modified desc"
+        }
 
         default_value first_names,asc
     } -formats {
Index: openacs-4/packages/contacts/lib/contacts.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contacts.xql,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/contacts/lib/contacts.xql	14 Dec 2005 17:26:53 -0000	1.18
+++ openacs-4/packages/contacts/lib/contacts.xql	31 Dec 2005 07:39:39 -0000	1.19
@@ -6,14 +6,15 @@
 	select 
 		distinct parties.party_id, $sort_item
   	from 
-		parties
+		$last_modified_join parties
 	$left_join
       	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 
+      	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
-   	$group_where_clause
+   	$last_modified_clause
+        $group_where_clause
 	[contact::search_clause -and -search_id $search_id -query $query -party_id "parties.party_id" -revision_id "revision_id"]
 	[template::list::orderby_clause -orderby -name "contacts"]
       </querytext>
@@ -27,10 +28,11 @@
        parties.party_id,
        parties.email,
        parties.url
-  from parties 
+  from $last_modified_join parties
       left join persons on (parties.party_id = persons.person_id)
       left join organizations on (parties.party_id = organizations.organization_id)
  where 1 = 1
+$last_modified_clause
 [template::list::page_where_clause -and -name "contacts" -key "party_id"]
 $group_by_group_id
 [template::list::orderby_clause -orderby -name "contacts"]
Index: openacs-4/packages/contacts/lib/groups.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/groups.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/contacts/lib/groups.adp	20 Oct 2005 14:04:19 -0000	1.12
+++ openacs-4/packages/contacts/lib/groups.adp	31 Dec 2005 07:39:39 -0000	1.13
@@ -17,6 +17,10 @@
 <if @groups.sub_p@>)</if>
 </td></tr>
 </multiple>
+<tr><td align="right">
+<if @user_p@ eq 1>#contacts.Users#</if>
+</td>
+</tr>
 </table>
 </ul>
 </if>
Index: openacs-4/packages/contacts/lib/groups.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/groups.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/contacts/lib/groups.tcl	4 Dec 2005 22:14:02 -0000	1.11
+++ openacs-4/packages/contacts/lib/groups.tcl	31 Dec 2005 07:39:39 -0000	1.12
@@ -73,3 +73,4 @@
     set delete_p 0
 }
 
+set user_p [contact::user_p -party_id $party_id]
\ No newline at end of file
Index: openacs-4/packages/contacts/lib/search-contact.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/search-contact.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/lib/search-contact.adp	18 Dec 2005 12:30:20 -0000	1.1
+++ openacs-4/packages/contacts/lib/search-contact.adp	31 Dec 2005 07:39:39 -0000	1.2
@@ -1,4 +1,4 @@
-<style tyle=text/css>
+<style type=text/css>
    input.search_contact {font-size: 10px;}
 </style>
 <formtemplate id="search_contact">
Index: openacs-4/packages/contacts/tcl/contact-message-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contact-message-procs.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/contacts/tcl/contact-message-procs.tcl	27 Dec 2005 20:19:02 -0000	1.14
+++ openacs-4/packages/contacts/tcl/contact-message-procs.tcl	31 Dec 2005 07:39:39 -0000	1.15
@@ -348,6 +348,9 @@
     # Strip the extension.
     set pdf_filename "[file rootname $oo_file].pdf"
     if {![file exists $pdf_filename]} {
+	###############
+	# this is a fix to use the oo file if pdf file could not be generated
+	###############
 	set pdf_filename $oo_file
     }
     set pdf_filesize [file size $pdf_filename]
@@ -398,6 +401,7 @@
     foreach filename [array names content_array] {
 	# Save the content to a file.
 	set file [open "${dir}/$filename" w]
+	fconfigure $file -encoding utf-8
 	puts $file $content_array($filename)
 	flush $file
 	close $file
Index: openacs-4/packages/contacts/tcl/contacts-populate-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-populate-procs.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/contacts/tcl/contacts-populate-procs.tcl	20 Dec 2005 16:19:39 -0000	1.19
+++ openacs-4/packages/contacts/tcl/contacts-populate-procs.tcl	31 Dec 2005 07:39:39 -0000	1.20
@@ -1203,7 +1203,11 @@
     # Register Relationships
 
     rel_types::create_role -role "parent_company" -pretty_name "Parent Company" -pretty_plural "Parent Companies"
+    lang::message::register -update_sync de_DE acs-translations "role_parent_company" "Mutterfirma"
+
     rel_types::create_role -role "subsidiary" -pretty_name "Subsidiary" -pretty_plural "Subsidiaries"
+    lang::message::register -update_sync de_DE acs-translations "role_subsidiary" "Tochterfirma"
+
     rel_types::new -table_name "contact_rels_subsidiary" -create_table_p "t" -supertype "contact_rel" -role_one "parent_company" -role_two "subsidiary" \
 	"contact_rels_subsidiary" \
 	"Contact Rel Subsidiary" \
Index: openacs-4/packages/contacts/www/message.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/message.adp,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/contacts/www/message.adp	28 Oct 2005 17:57:18 -0000	1.20
+++ openacs-4/packages/contacts/www/message.adp	31 Dec 2005 07:39:40 -0000	1.21
@@ -34,6 +34,7 @@
 	        footer_id=@footer_id@
 	        header_id=@header_id@
 	        folder_id=@folder_id@
+		title=@title@
 	        >
   </else>
 </if>