Index: branches/1.0.x/elements/forms.elm.tpl
===================================================================
diff -u -N -r14805 -r14822
--- branches/1.0.x/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 14805)
+++ branches/1.0.x/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 14822)
@@ -358,6 +358,47 @@
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="inp_edit_country" title="lu_fld_{$field}" state_field="" style="" has_empty="0" empty_value="" empty_label="" field_type="select" no_editing="1">
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<select class="field" tabindex="<inp2:m_get param="tab_index"/>" state_field="<inp2:m_Param name='state_field'/>" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" style="<inp2:m_param name="style"/>">
+			<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_item" selected="selected" has_empty="$has_empty" empty_value="$empty_value" empty_label="$empty_label"/>
+		</select>
+
+		<script type="text/javascript">
+			$(document).ready(
+				function () {
+					var $field_mask = '<inp2:$prefix_InputName field="#FIELD_NAME#" js_escape="1"/>';
+
+					$( get_control($field_mask, '<inp2:m_Param name="field"/>') ).change(
+						function ($e) {
+							var	$me = $(this),
+								$state_dropdown = $( get_control($field_mask, $me.attr('state_field')) ),
+								$url = '<inp2:m_Link country-state_event="OnGetStatesJSON" country_iso="#ISO#" pass="m,country-state" no_amp="1" js_escape="1"/>';
+
+							$.getJSON(
+								$url.replace('#ISO#', $me.val()),
+								function ($states) {
+									var $selected = $state_dropdown.val();
+
+									$state_dropdown.empty().append('<option value=""></option>');
+
+									if ( !$.isArray($states) ) {
+										for (var $state_iso in $states) {
+											$state_dropdown.append('<option value="' + $state_iso + '">' + $states[$state_iso] + '</option>');
+										}
+									}
+
+									$state_dropdown.val($selected);
+								}
+							);
+						}
+					);
+				}
+			);
+		</script>
+	</inp2:m_RenderElement>
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="inp_radio_item" style="" onclick="" has_br="0">
 	<input type="radio" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>" <inp2:m_param name="checked"/> name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:{$prefix}_InputName field="$field"/>_<inp2:m_param name="key"/>">&nbsp;<inp2:m_param name="option"/></label><inp2:m_if check="m_Param" name="has_br"><br/><inp2:m_else/>&nbsp;&nbsp;</inp2:m_if>
 </inp2:m_DefineElement>