Index: openacs-4/packages/contacts/contacts.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/contacts.info,v
diff -u -N -r1.86 -r1.87
--- openacs-4/packages/contacts/contacts.info	8 Jan 2007 12:53:33 -0000	1.86
+++ openacs-4/packages/contacts/contacts.info	14 Jan 2007 11:35:23 -0000	1.87
@@ -7,14 +7,14 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="1.2b25" url="http://openacs.org/repository/download/apm/contacts-1.2b25.apm">
+    <version name="1.2b26" url="http://openacs.org/repository/download/apm/contacts-1.2b26.apm">
         <owner url="mailto:openacs@geddert.com">Matthew Geddert</owner>
         <summary>This application lets you collaboratively view, edit and categorize contacts.</summary>
         <release-date>2006-06-25</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.2b25"/>
+        <provides url="contacts" version="1.2b26"/>
         <requires url="acs-datetime" version="4.1"/>
         <requires url="acs-events" version="0.5d3"/>
         <requires url="acs-tcl" version="5.3.0d2"/>
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 -N -r1.29 -r1.30
--- openacs-4/packages/contacts/catalog/contacts.de_DE.ISO-8859-1.xml	14 Dec 2006 09:19:30 -0000	1.29
+++ openacs-4/packages/contacts/catalog/contacts.de_DE.ISO-8859-1.xml	14 Jan 2007 11:35:23 -0000	1.30
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="contacts" package_version="1.2b22" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="contacts" package_version="1.2b26" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="--_select_a_group_--">-- eine Gruppe markieren --</msg>
   <msg key="--add_column--">-- Reihe hinzuf�gen --</msg>
@@ -22,6 +22,7 @@
   <msg key="Add_complaint_to">Eine Beschwerde hinzuf�gen f�r</msg>
   <msg key="Add_Condition">Bedingung hinzuf�gen</msg>
   <msg key="Add_Email_Message">e-Mail Nachricht hinzuf�gen</msg>
+  <msg key="Add_Employee">Neuer Mitarbeiter</msg>
   <msg key="Add_Group">Gruppe hinzuf�gen</msg>
   <msg key="Add_Letter_Message">Brief hinzuf�gen</msg>
   <msg key="Add_Message">Nachricht hinzuf�gen</msg>
@@ -57,6 +58,7 @@
   <msg key="All">Alle</msg>
   <msg key="All__Edit">Daten �ndern</msg>
   <msg key="All_Contacts">Alle Kontakte</msg>
+  <msg key="AMSParameters">AMS Parameter</msg>
   <msg key="and">und</msg>
   <msg key="Answer">Antwort</msg>
   <msg key="Any">einer</msg>
@@ -322,7 +324,7 @@
   <msg key="lt_has_not_logged_in_wit">hat sich nicht eingeloggt innerhalb -&gt;</msg>
   <msg key="lt_If_in_a_normal_search">In einer normalen Suche suchen wir nach &quot;D Jane&quot;. Das erste Suchwort (&quot;D&quot;) findet Kontakt 123 (via &quot;Doe&quot;), 234 (via &quot;Doe&quot;) und 345 (via &quot;Alfred&quot;). Das zweite Suchwort (&quot;Jane&quot;) finder nur den Kontakt 123. Daher entspricht nur ein Kontakt beiden Suchkriterien und nur &quot;Jane Doe&quot; (Kontakt 123) wird vom System angezeigt.</msg>
   <msg key="lt_If_multiple_words_are">Wenn mehrere W�rter verwendet werden, dann m�ssen alle W�rter den o.g. Kriterien entsprechen. Wenn z.B. unsere Kontaktdatenbank die folgenden Eintr�ge enth�lt:</msg>
-  <msg key="lt_Instance_Permissions_">Instanz Berechtigungen - !NOCH UNFERTIG!</msg>
+  <msg key="lt_Instance_Permissions_">Allgemeine Berechtigungen</msg>
   <msg key="lt_Insufficient_Permissi">Ungen�gende Berechtigungen</msg>
   <msg key="lt_interacted_in_the_last_-">letzte Interaktion innerhalb der letzten -&gt;</msg>
   <msg key="lt_Invalid_input_you_spe">Ung�ltige Eingabe, Sie gaben f�r die Eingabemaske '%form%'an,  sollten aber nur eingeben: top, bottom, none</msg>
@@ -582,6 +584,7 @@
   <msg key="Showing">Anzeigen</msg>
   <msg key="Signature">Signatur</msg>
   <msg key="signatures">Signaturen</msg>
+  <msg key="SMSText">SMS Text</msg>
   <msg key="Sort_By">Sortieren nach</msg>
   <msg key="Sort_by">Sortieren nach:</msg>
   <msg key="stateprovince_is_-">Bundesland ist -&gt;</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 -N -r1.93 -r1.94
--- openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml	16 Dec 2006 11:27:19 -0000	1.93
+++ openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml	14 Jan 2007 11:35:23 -0000	1.94
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="contacts" package_version="1.2b22" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="contacts" package_version="1.2b26" locale="en_US" charset="ISO-8859-1">
 
   <msg key="--_select_a_group_--">-- select a group --</msg>
   <msg key="--add_column--">-- add column --</msg>
@@ -63,6 +63,7 @@
   <msg key="All">All</msg>
   <msg key="All__Edit">All / Edit</msg>
   <msg key="All_Contacts">All Contacts</msg>
+  <msg key="AMSParameters">AMS Parameters</msg>
   <msg key="and">and</msg>
   <msg key="Answer">Answer</msg>
   <msg key="Any">Any</msg>
@@ -682,6 +683,7 @@
   <msg key="Showing">Showing</msg>
   <msg key="Signature">Signature</msg>
   <msg key="signatures">signatures</msg>
+  <msg key="SMSText">SMS Text</msg>
   <msg key="Sort_By">Sort By</msg>
   <msg key="Sort_by">Sort by</msg>
   <msg key="stateprovince_is_-">state/province is -&gt;</msg>
Index: openacs-4/packages/contacts/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/admin/index.adp,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/contacts/www/admin/index.adp	13 Dec 2006 13:03:53 -0000	1.11
+++ openacs-4/packages/contacts/www/admin/index.adp	14 Jan 2007 11:35:24 -0000	1.12
@@ -7,6 +7,7 @@
 <a href="group-ae" class="button">#contacts.Add_Group#</a>
 <a href="permissions" class="button">#contacts.lt_Instance_Permissions_#</a>
 <a href="@parameter_url@" class="button">#acs-subsite.Parameters#</a>
+<a href="@ams_parameter_url@" class="button">#contacts.AMSParameters#</a>
 <a href="ext-search-options" class="button">#contacts.Extended_search_opt#</a>
 <if @populate_url@ ne ""><a href="@populate_url@" class="button">#contacts.Populate_CRM#</a></if>
 
Index: openacs-4/packages/contacts/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/admin/index.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/contacts/www/admin/index.tcl	13 Dec 2006 13:03:53 -0000	1.13
+++ openacs-4/packages/contacts/www/admin/index.tcl	14 Jan 2007 11:35:24 -0000	1.14
@@ -14,6 +14,7 @@
 set context {}
 set package_id [ad_conn package_id]
 set parameter_url [export_vars -base "/shared/parameters" {package_id {return_url "[ad_conn url]"}}]
+set ams_parameter_url [export_vars -base "/shared/parameters" {{package_id "[apm_package_id_from_key ams]"} {return_url "[ad_conn url]"}}]
 template::list::create \
     -name "groups" \
     -multirow "groups" \