Index: openacs-4/packages/ams/ams.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/ams.info,v
diff -u -N -r1.25 -r1.26
--- openacs-4/packages/ams/ams.info	14 Jan 2007 11:36:27 -0000	1.25
+++ openacs-4/packages/ams/ams.info	12 Jul 2007 08:24:07 -0000	1.26
@@ -8,14 +8,14 @@
     <singleton-p>t</singleton-p>
     <auto-mount>ams</auto-mount>
 
-    <version name="1.1d17" url="http://openacs.org/repository/download/apm/ams-1.1d17.apm">
+    <version name="1.1d18" url="http://openacs.org/repository/download/apm/ams-1.1d18.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>
+        <release-date>2007-07-12</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.1d17"/>
+        <provides url="ams" version="1.1d18"/>
         <requires url="acs-lang" version="5.1.5d1"/>
         <requires url="postal-address" version="0.1d"/>
         <requires url="ref-countries" version="1.1"/>
@@ -33,8 +33,8 @@
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="DefaultStreetSize"  default="100" description="Maximum number of characters the street address might have" section_name="address-widget"/>
             <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="MobileURL"  description="If this is set, all &lt;b&gt;mobile&lt;/b&gt; 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"/>
             <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.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.27 -r1.28
--- openacs-4/packages/ams/catalog/ams.en_US.ISO-8859-1.xml	14 Jan 2007 11:36:27 -0000	1.27
+++ openacs-4/packages/ams/catalog/ams.en_US.ISO-8859-1.xml	12 Jul 2007 08:24:07 -0000	1.28
@@ -4,7 +4,7 @@
   <msg key="Action">Action</msg>
   <msg key="Add_an_AMS_Attribute">Add an AMS Attribute</msg>
   <msg key="Add_Attribute">Add Attribute</msg>
-  <msg key="Add_Heading">Add Heading</msg>
+  <msg key="Add_Heading">Add/Stop Section</msg>
   <msg key="Add_Html_options">Add Html Options</msg>
   <msg key="Address">Address</msg>
   <msg key="AIM">AOL Instant Messenger ID</msg>
@@ -32,6 +32,7 @@
   <msg key="Checkbox">Checkbox - Multiple Options Allowed</msg>
   <msg key="cit_cntry">Citizenship</msg>
   <msg key="cit_cntry_plural">Citizenships</msg>
+  <msg key="Content">Content</msg>
   <msg key="country">Country</msg>
   <msg key="country_AD">Andorra</msg>
   <msg key="country_AE">United Arab Emirates</msg>
@@ -281,14 +282,14 @@
   <msg key="Define_Widget">Define Widget</msg>
   <msg key="degree">Degree From Previous School</msg>
   <msg key="degree_plural">Degree From Previous Schools</msg>
-  <msg key="Delete_Heading">Delete Heading</msg>
+  <msg key="Delete_Heading">Delete Section</msg>
   <msg key="Delete_html">Delete Html Options</msg>
   <msg key="delivery_address">Street</msg>
   <msg key="denomination">Denomination</msg>
   <msg key="denomination_plural">Denominations</msg>
   <msg key="division">App Division</msg>
   <msg key="division_plural">App Divisions</msg>
-  <msg key="EditDelete_Heading">Edit/Delete Heading</msg>
+  <msg key="EditDelete_Heading">Edit/Delete Section</msg>
   <msg key="EditDelete_Html">Edit/Delete Html Options</msg>
   <msg key="Email">Email</msg>
   <msg key="enrl_int">Enrollment Interest Level</msg>
@@ -300,10 +301,12 @@
   <msg key="fee_rec">Application Fee Recieved</msg>
   <msg key="fee_rec_plural">Application Fees Recieved</msg>
   <msg key="Form_Preview">Form Preview</msg>
+  <msg key="Format">Format</msg>
   <msg key="gender">Gender</msg>
   <msg key="gender_plural">Genders</msg>
   <msg key="has_been_added_as_an_attribute_to">has been added as an attribute to</msg>
-  <msg key="Heading">Heading</msg>
+  <msg key="Heading">Section</msg>
+  <msg key="Heading_Stop">Stop Previous Section</msg>
   <msg key="Help_text">Help text</msg>
   <msg key="hsgrad_yr">Bachelor's Graduation Year</msg>
   <msg key="hsgrad_yr_plural">Bachelor's Graduation Years</msg>
Index: openacs-4/packages/ams/tcl/ams-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/tcl/ams-procs.tcl,v
diff -u -N -r1.52 -r1.53
--- openacs-4/packages/ams/tcl/ams-procs.tcl	23 Jan 2007 14:43:50 -0000	1.52
+++ openacs-4/packages/ams/tcl/ams-procs.tcl	12 Jul 2007 08:24:08 -0000	1.53
@@ -527,10 +527,14 @@
 			     -html_options $html_options \
 			     -optional_p [string is false $required_p] -attribute_id $attribute_id]
 
-	    if { [exists_and_not_null section_heading] } {
-		lappend element [list section $section_heading]
-	    }
 	    if { [exists_and_not_null element]} {
+		if { [exists_and_not_null section_heading] } {
+		    if { $section_heading eq "no_section" } {
+			lappend element_list {-section ""}
+		    } else {
+			lappend element_list [list "-section" "sec$attribute_id" [list legendtext $section_heading]]
+		    }
+		}
 		lappend element_list $element
 	    }
 	}
Index: openacs-4/packages/ams/www/list-attribute-section-heading.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/www/list-attribute-section-heading.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/ams/www/list-attribute-section-heading.tcl	28 May 2005 15:37:27 -0000	1.3
+++ openacs-4/packages/ams/www/list-attribute-section-heading.tcl	12 Jul 2007 08:24:08 -0000	1.4
@@ -32,13 +32,23 @@
 ad_form -name list_form -form {
     list_id:integer(hidden)
     attribute_id:integer(hidden)
-    {section_heading:text {label "[_ ams.Heading]"} {html {size 40 maxlength 200}}}
+    {section_heading:text,optional {label "[_ ams.Heading]"} {html {size 40 maxlength 200}}}
+    {no_section:integer(checkbox),optional {label ""} {options {{{[_ ams.Heading_Stop]} 1}}}}
     {save:text(submit) {label "[_ acs-kernel.common_Save]"}}
     {delete:text(submit) {label "[_ ams.Delete_Heading]"}}
 } -on_request {
+    if { $section_heading eq "no_section" } {
+	set section_heading ""
+	set no_section "1"
+    }
 } -on_submit {
+    set section_heading [string trim $section_heading]
     if { [string is true [exists_and_not_null delete]] } {
 	set section_heading ""
+    } elseif { $no_section eq "1" } {
+	if { $section_heading eq "" } {
+	    set section_heading "no_section"
+	}
     }
     db_dml update_section_heading {
 	update ams_list_attribute_map
Index: openacs-4/packages/ams/www/list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/www/list.tcl,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/ams/www/list.tcl	25 Sep 2006 15:21:57 -0000	1.10
+++ openacs-4/packages/ams/www/list.tcl	12 Jul 2007 08:24:08 -0000	1.11
@@ -80,7 +80,9 @@
         }
         section_heading {
             label "[_ ams.Heading]"
-            display_col section_heading
+            display_template {
+		<if @mapped_attributes.section_heading@ eq "no_section"><em>\#ams.Heading_Stop\#</em></if><else>@mapped_attributes.section_heading@</else>
+	    }
         }
 	html_options {
 	    label "[_ ams.Html_options]"