Index: openacs-4/packages/ams/ams.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/ams.info,v
diff -u -N -r1.24 -r1.25
--- openacs-4/packages/ams/ams.info	21 Dec 2006 18:09:43 -0000	1.24
+++ openacs-4/packages/ams/ams.info	14 Jan 2007 11:36:27 -0000	1.25
@@ -8,14 +8,14 @@
     <singleton-p>t</singleton-p>
     <auto-mount>ams</auto-mount>
 
-    <version name="1.1d16" url="http://openacs.org/repository/download/apm/ams-1.1d16.apm">
+    <version name="1.1d17" url="http://openacs.org/repository/download/apm/ams-1.1d17.apm">
         <owner url="mailto:openacs@geddert.com">Matthew Geddert</owner>
         <summary>Store attributes via the Content Repository, and auto generate input forms</summary>
         <release-date>2006-02-17</release-date>
         <description format="text/html">AMS (Attribute Management System) helps in customizing your website. It lets you adjust what information is collected and displayed for any package that is integrated with it. AMS allows you to easily and dynamically add attributes to forms and display pages, using a Tcl API or an admin interface. AMS uses the content repository to store attribute history for any object on the system.</description>
         <maturity>0</maturity>
 
-        <provides url="ams" version="1.1d16"/>
+        <provides url="ams" version="1.1d17"/>
         <requires url="acs-lang" version="5.1.5d1"/>
         <requires url="postal-address" version="0.1d"/>
         <requires url="ref-countries" version="1.1"/>
@@ -34,6 +34,7 @@
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ForceCountryCodeOneFormatting"  default="0" description="If set to &quot;1&quot; AMS will force phone numbers to follow the country zone code 1 rules (US, Canada, etc.), all phone numbers will need to follow the 'three digit area code'-'three digits - 4 digits'x'Extension' format. All &quot;international&quot; numbers will need to have the format &quot;011-'Country_Code'-'Area_Code'-'Subscriber_number'x'Extension' format. If set to &quot;0&quot; telecom numbers will not be seperated into these elements, and the whole number will be entered in the DB as the subscriber number just as input in the form." section_name="telecom-number-widget"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="HideISOCountryCode"  description="Specify the country names to hide when displaying addresses. Specify they ISO Country Code(s) here as a space seperated list for all countries that apply. If all your workers mail letters from one country you will likely not want to or need to print that country's name on letters, envelopes, reports, etc." section_name="address-widget"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="PhoneURL"  description="If this is set, all phone numbers will be underlined with a URL, so you could click on the phone number and your Windows application starts a Phone Connection to the number you clicked on. Usually this is done using the phone protocol, so a save value is 'phone:$telecom_number'" section_name="telecom-number-widget"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="MobileURL"  description="If this is set, all <b>mobile</b> phone numbers will have an SMS button with a URL, so you could click on the number and send an SMS using the URL specified. The target of the URL should recieve the mobile_phone_number as a value and provide an interface to type a textmessage which will be send as SMS." section_name="telecom-number-widget"/>
         </parameters>
 
     </version>
Index: openacs-4/packages/ams/catalog/ams.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/catalog/ams.de_DE.ISO-8859-1.xml,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/ams/catalog/ams.de_DE.ISO-8859-1.xml	30 Jan 2006 22:44:59 -0000	1.10
+++ openacs-4/packages/ams/catalog/ams.de_DE.ISO-8859-1.xml	14 Jan 2007 11:36:27 -0000	1.11
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="ams" package_version="1.1d12" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="ams" package_version="1.1d17" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="Action">Aktion</msg>
   <msg key="Add_an_AMS_Attribute">Ein AMS Attribut hinzuf�gen</msg>
@@ -33,6 +33,7 @@
   <msg key="lt_Update_ordering_from_">Update Reihenfolge</msg>
   <msg key="Map">Zuweisen</msg>
   <msg key="Mapped_Attributes">Zugewiesene Attribute</msg>
+  <msg key="Mobile_Number">Mobilfunknummer</msg>
   <msg key="Multiselect">Menu - Mehrere Optionen erlaubt</msg>
   <msg key="municipality">Stadt</msg>
   <msg key="Object_Type">Objekttyp</msg>
Index: openacs-4/packages/ams/catalog/ams.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/catalog/ams.en_US.ISO-8859-1.xml,v
diff -u -N -r1.26 -r1.27
--- openacs-4/packages/ams/catalog/ams.en_US.ISO-8859-1.xml	3 Jun 2006 03:52:59 -0000	1.26
+++ openacs-4/packages/ams/catalog/ams.en_US.ISO-8859-1.xml	14 Jan 2007 11:36:27 -0000	1.27
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="ams" package_version="1.1d16" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="ams" package_version="1.1d17" locale="en_US" charset="ISO-8859-1">
 
   <msg key="Action">Action</msg>
   <msg key="Add_an_AMS_Attribute">Add an AMS Attribute</msg>
Index: openacs-4/packages/ams/tcl/ams-widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/tcl/ams-widget-procs.tcl,v
diff -u -N -r1.34 -r1.35
--- openacs-4/packages/ams/tcl/ams-widget-procs.tcl	18 Dec 2006 19:14:23 -0000	1.34
+++ openacs-4/packages/ams/tcl/ams-widget-procs.tcl	14 Jan 2007 11:36:27 -0000	1.35
@@ -467,7 +467,7 @@
 	}
         value_text {
 	    util_unlist $value itu_id national_number area_city_code subscriber_number extension sms_enabled_p best_contact_time location phone_type_id
-	    return [ad_html_to_text -showtags -no_format [template::util::mobile_number::html_view $itu_id $national_number $subscriber_number $best_contact_time]]
+	    return [ad_html_to_text -showtags -no_format "$subscriber_number"]
 	}
         value_html {
 	    util_unlist $value itu_id national_number area_city_code subscriber_number extension sms_enabled_p best_contact_time location phone_type_id
Index: openacs-4/packages/ams/tcl/mobile-number-widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/tcl/mobile-number-widget-procs.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/ams/tcl/mobile-number-widget-procs.tcl	21 Dec 2006 18:09:43 -0000	1.3
+++ openacs-4/packages/ams/tcl/mobile-number-widget-procs.tcl	14 Jan 2007 11:36:27 -0000	1.4
@@ -6,15 +6,9 @@
     @creation-date 2006-02-02
 }
 
-namespace eval template {}
-namespace eval template::data {}
-namespace eval template::data::transform {}
-namespace eval template::data::validate {}
-namespace eval template::util {}
 namespace eval template::util::mobile_number {}
 namespace eval template::util::aim {}
 namespace eval template::util::skype {}
-namespace eval template::widget {}
 
 ad_proc -public template::util::mobile_number { command args } {
     Dispatch procedure for the mobile_number object
@@ -47,14 +41,21 @@
         if { [exists_and_not_null mobile_number] } { append mobile_number "-" }
     }
     append mobile_number "$subscriber_number"
+
+    # Now prepare the returned html
+    set return_html ""
     set mobile_url [parameter::get_from_package_key -parameter "MobileURL" -package_key "ams" -default ""]
-    if {[empty_string_p $mobile_url]} {
-	return $mobile_number
+    set phone_url [parameter::get_from_package_key -parameter "PhoneURL" -package_key "ams" -default ""]
+    if {$phone_url ne ""} {
+	set return_html "<a href=\"[eval set foo $phone_url]\">$mobile_number</a>"
     } else {
-	set recipient_mobile_phone_number $mobile_number
-	set url [export_vars -base $mobile_url {recipient_mobile_phone_number}]
-	return "<a href=\"$url\">$mobile_number</a>"
+	set return_html "$mobile_number"
     }
+
+    if {$mobile_url ne ""} {
+	set url [export_vars -base $mobile_url {mobile_number}]
+	append return_html " - <a href=\"$url\" class=button>SMS</a>"
+    }
 }
 
 ad_proc -public template::util::mobile_number::acquire { type { value "" } } {