Index: openacs-4/packages/ams/tcl/address-widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/tcl/address-widget-procs.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/ams/tcl/address-widget-procs.tcl	28 Jul 2005 17:05:27 -0000	1.9
+++ openacs-4/packages/ams/tcl/address-widget-procs.tcl	12 Sep 2005 22:09:17 -0000	1.10
@@ -68,7 +68,6 @@
     }
 
     # Different formats depending on the country
-    
     switch $country_code {
 	"US" {
 	    set address "$delivery_address
@@ -80,9 +79,15 @@
 $postal_code $municipality"
 	}	    
 	default {
-	    set address "$delivery_address
-$postal_code $municipality
+	    if { [parameter::get_from_package_key -package_key "ams" -parameter "DefaultAdressLayoutP" -default 1] } {
+		set address "$delivery_address
+$municipality $region $postal_code
 $country"
+	    } else {
+		set address "$delivery_address
+$postal_code $municipality $region
+$country"
+	    }
 	}	    
     }
     return [ad_text_to_html $address]
@@ -457,16 +462,32 @@
     <td colspan=\"3\"><small>[_ ams.delivery_address]</small><br></td>
   </tr>
   <tr>
-    <td><input type=\"text\" name=\"$element(id).municipality\" value=\"[ad_quotehtml $municipality]\" size=\"20\" class=\"address-widget-municipality\" ></td>
-    <td><input type=\"text\" name=\"$element(id).region\" value=\"[ad_quotehtml $region]\" size=\"10\" class=\"address-widget-region\" ></td>
-    <td><input type=\"text\" name=\"$element(id).postal_code\" value=\"[ad_quotehtml $postal_code]\" size=\"7\" class=\"address-widget-postal_code\" ></td>
-  </tr>
+"
+      if  { [parameter::get_from_package_key -package_key "ams" -parameter "DefaultAdressLayoutP" -default 1] } {
+	  append output "
+            <td><input type=\"text\" name=\"$element(id).municipality\" value=\"[ad_quotehtml $municipality]\" size=\"20\" class=\"address-widget-municipality\" ></td>
+            <td><input type=\"text\" name=\"$element(id).region\" value=\"[ad_quotehtml $region]\" size=\"10\" class=\"address-widget-region\" ></td>
+            <td><input type=\"text\" name=\"$element(id).postal_code\" value=\"[ad_quotehtml $postal_code]\" size=\"7\" class=\"address-widget-postal_code\" ></td>
+        </tr>
+        <tr>
+           <td align=\"left\"><small>[_ ams.municipality]</small></td>
+           <td align=\"center\"><small>[_ ams.region]</small></td>
+           <td align=\"right\"><small>[_ ams.postal_code]</small></td>
+        </tr>"
+      } else {
+	  append output "
+            <td><input type=\"text\" name=\"$element(id).postal_code\" value=\"[ad_quotehtml $postal_code]\" size=\"7\" class=\"address-widget-postal_code\" ></td>
+            <td><input type=\"text\" name=\"$element(id).municipality\" value=\"[ad_quotehtml $municipality]\" size=\"20\" class=\"address-widget-municipality\" ></td>
+            <td><input type=\"text\" name=\"$element(id).region\" value=\"[ad_quotehtml $region]\" size=\"10\" class=\"address-widget-region\" ></td>
+        </tr>
+        <tr>
+           <td align=\"right\"><small>[_ ams.postal_code]</small></td>
+           <td align=\"left\"><small>[_ ams.municipality]</small></td>
+           <td align=\"center\"><small>[_ ams.region]</small></td>
+        </tr>"
+      }
+      append output "
   <tr>
-    <td align=\"left\"><small>[_ ams.municipality]</small></td>
-    <td align=\"center\"><small>[_ ams.region]</small></td>
-    <td align=\"right\"><small>[_ ams.postal_code]</small></td>
-  </tr>
-  <tr>
     <td colspan=\"3\">[menu $element(id).country_code [template::util::address::country_options] $country_code attributes]</td>
   </tr>
   <tr>
Index: openacs-4/packages/ams/tcl/ams-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/tcl/ams-install-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ams/tcl/ams-install-procs.tcl	9 Sep 2005 17:08:30 -0000	1.1
+++ openacs-4/packages/ams/tcl/ams-install-procs.tcl	12 Sep 2005 22:01:56 -0000	1.2
@@ -29,6 +29,9 @@
 		    }
 		}
 	    }
+	    1.1d3 1.1d4 {
+		apm_parameter_register "DefaultAdressLayoutP" "Especify the default template for input and display layout for the address. Set to 1 for { street, city, state, zip, country } or 0 for { street, zip, city, state, country }" "ams" "1" "number" "address-widget"
+	    }
 	}
 }