Index: branches/RC/core/units/custom_fields/custom_fields_config.php
===================================================================
diff -u -r10902 -r10913
--- branches/RC/core/units/custom_fields/custom_fields_config.php	(.../custom_fields_config.php)	(revision 10902)
+++ branches/RC/core/units/custom_fields/custom_fields_config.php	(.../custom_fields_config.php)	(revision 10913)
@@ -90,8 +90,20 @@
 													'Value'			=>	Array('type' => 'string', 'default' => ''),
 													'OriginalValue'	=>	Array('type' => 'string', 'default' => ''),
 													'Error'			=>	Array('type' => 'string', 'default' => ''),
-													'DirectOptions' =>	Array('type' => 'string', 'default' => '')
+													'DirectOptions' =>	Array('type' => 'string', 'default' => ''),
+													
+													'SortValues'	=>	Array (
+														'type' => 'int',
+														'formatter' => 'kOptionsFormatter',
+														'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
+														'default' => 0,
+													),
 
+													// for ValueList field editing via "inp_edit_minput" control
+													'OptionKey' => Array ('type' => 'int', 'not_null' => 1, 'default' => ''),
+													'OptionTitle' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+													'Options' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+
 										),
 
 					'Grids'	=> Array(
Index: branches/RC/core/units/custom_fields/custom_fields_event_handler.php
===================================================================
diff -u -r8929 -r10913
--- branches/RC/core/units/custom_fields/custom_fields_event_handler.php	(.../custom_fields_event_handler.php)	(revision 8929)
+++ branches/RC/core/units/custom_fields/custom_fields_event_handler.php	(.../custom_fields_event_handler.php)	(revision 10913)
@@ -83,7 +83,7 @@
 
 			$ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
 			/* @var $ml_helper kMultiLanguageHelper */
-			
+
 			// call main item config to clone cdata table
 			$this->Application->getUnitOption($main_prefix, 'TableName');
 			$ml_helper->deleteField($main_prefix.'-cdata', $event->getEventParam('id'));
@@ -119,7 +119,7 @@
 
 			$ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
 			/* @var $ml_helper kMultiLanguageHelper */
-			
+
 			// call main item config to clone cdata table
 			$this->Application->getUnitOption($main_prefix, 'TableName');
 			$ml_helper->createFields($main_prefix.'-cdata');
@@ -145,5 +145,89 @@
 			$object =& $event->getObject();
 			$object->SetDBField('Type', $this->Application->GetVar('cf_type'));
 		}
+
+		/**
+		 * Prepares ValueList field's value as xml for editing
+		 *
+		 * @param kEvent $event
+		 */
+		function OnAfterItemLoad(&$event)
+		{
+			parent::OnAfterItemLoad($event);
+
+			$object =& $event->getObject();
+			/* @var $object kDBItem */
+
+			if (!in_array($object->GetDBField('ElementType'), $this->_getMultiElementTypes())) {
+				return ;
+			}
+
+			$custom_field_helper =& $this->Application->recallObject('InpCustomFieldsHelper');
+			/* @var $custom_field_helper InpCustomFieldsHelper */
+
+			$options = $custom_field_helper->GetValuesHash( $object->GetDBField('ValueList') );
+
+			$records = Array ();
+			foreach ($options as $option_key => $option_title) {
+				if ($option_key > 0) {
+					$records[] = Array ('OptionKey' => $option_key, 'OptionTitle' => $option_title);
+				}
+			}
+
+			$minput_helper =& $this->Application->recallObject('MInputHelper');
+			/* @var $minput_helper MInputHelper */
+
+			$xml = $minput_helper->prepareMInputXML($records, Array ('OptionKey', 'OptionTitle'));
+			$object->SetDBField('Options', $xml);
+		}
+
+		/**
+		 * Returns custom field element types, that will use minput control
+		 *
+		 * @return unknown
+		 */
+		function _getMultiElementTypes()
+		{
+			return Array ('select', 'multiselect', 'radio');
+		}
+
+		/**
+		 * Saves minput content to ValueList field
+		 *
+		 * @param kEvent $event
+		 */
+		function OnBeforeItemUpdate(&$event)
+		{
+			parent::OnBeforeItemUpdate($event);
+
+			$object =& $event->getObject();
+			/* @var $object kDBItem */
+
+			if (!in_array($object->GetDBField('ElementType'), $this->_getMultiElementTypes())) {
+				return ;
+			}
+
+			$minput_helper =& $this->Application->recallObject('MInputHelper');
+			/* @var $minput_helper MInputHelper */
+
+			$ret = $object->GetDBField('ElementType') == 'multiselect' ? Array () : Array ('' => '=+');
+			$records = $minput_helper->parseMInputXML($object->GetDBField('Options'));
+
+			if ($object->GetDBField('SortValues')) {
+				usort($records, Array (&$this, '_sortValues'));
+				ksort($records);
+			}
+
+			foreach ($records as $record) {
+				$ret[] = $record['OptionKey'] . '=+' . $record['OptionTitle'];
+			}
+
+			$object->SetDBField('ValueList', implode(VALUE_LIST_SEPARATOR, $ret));
+		}
+
+		function _sortValues($record_a, $record_b)
+		{
+			return strcasecmp($record_a['OptionTitle'], $record_b['OptionTitle']);
+		}
 	}
 ?>
\ No newline at end of file
Index: branches/RC/core/admin_templates/custom_fields/custom_fields_edit.tpl
===================================================================
diff -u -r10856 -r10913
--- branches/RC/core/admin_templates/custom_fields/custom_fields_edit.tpl	(.../custom_fields_edit.tpl)	(revision 10856)
+++ branches/RC/core/admin_templates/custom_fields/custom_fields_edit.tpl	(.../custom_fields_edit.tpl)	(revision 10913)
@@ -67,14 +67,86 @@
 		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="cf" field="OnGeneralTab" title="!la_prompt_showgeneraltab!"/>
 		<inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="Heading" title="!la_prompt_heading!" size="40"/>
 		<inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="Prompt" title="!la_prompt_FieldPrompt!" size="40"/>
-		<inp2:m_RenderElement name="inp_edit_options" prefix="cf" field="ElementType" title="!la_prompt_InputType!" size="20"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="ValueList" title="!la_prompt_valuelist!" size="40"/>
+		<inp2:m_RenderElement name="inp_edit_options" prefix="cf" field="ElementType" title="!la_prompt_InputType!" size="20" onchange="update_layout();"/>
+
+		<inp2:m_if check="cf_Field" name="ElementType" equals_to="select|multiselect|radio" db="db" inverse="inverse">
+			<inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="ValueList" title="!la_prompt_valuelist!" size="40"/>
+		</inp2:m_if>
+
 		<inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="DefaultValue" title="la_prompt_Default"/>
 		<inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="DisplayOrder" title="!la_field_displayorder!" size="10"/>
 
 		<inp2:m_if check="m_IsDebugMode">
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="cf" field="IsSystem" title="!la_fld_IsSystem!"/>
 		</inp2:m_if>
+
+	<inp2:m_if check="cf_Field" name="ElementType" equals_to="select|multiselect|radio" db="db">
+		<inp2:m_RenderElement name="subsection" title="la_section_Values"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="cf" field="SortValues" title="la_fld_SortValues"/>
+
+			<inp2:m_RenderElement name="inp_edit_hidden" prefix="cf" field="OptionKey"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="OptionTitle" title="la_fld_OptionTitle" size="60"/>
+			<inp2:m_RenderElement name="inp_edit_minput" prefix="cf" field="Options" title="la_fld_Options" format="#OptionTitle# (#OptionKey#)" style="width: 600px; height: 500px;"/>
+	</inp2:m_if>
 </table>
 
+<inp2:m_if check="cf_Field" name="ElementType" equals_to="select|multiselect|radio" db="db">
+	<script type="text/javascript">
+		Options.registerControl('OptionKey', 'text', false);
+		Options.registerControl('OptionTitle', 'text', true);
+		Options.LoadValues();
+
+		Options.getControlValue = function ($field) {
+			var $value = this.getControl($field).value;
+
+			if ($field == 'OptionKey' && !$value) {
+				$options = this.getControl(this.FieldName, 'minput').options;
+
+				if ($options.length) {
+					var $i = 0;
+					var $max_option_key = 0;
+					while ($i < $options.length) {
+						if (parseInt(this.Records[ $options[$i].value ]['OptionKey']) > $max_option_key) {
+							$max_option_key = parseInt(this.Records[ $options[$i].value ]['OptionKey']);
+						}
+
+						$i++;
+					}
+
+					return $max_option_key + 1;
+				}
+
+				// when no this will be 1st record in list use 1
+				return 1;
+			}
+
+
+			return $value;
+		}
+
+		Options.compareRecords = function($record_a, $record_b) {
+			// compare by option title only, it's id doesn't matter
+			return $record_a['OptionTitle'].toLowerCase() == $record_b['OptionTitle'].toLowerCase();
+		}
+	</script>
+</inp2:m_if>
+
+<script type="text/javascript">
+	function update_layout() {
+		var $last_element_type = '<inp2:cf_Field name="ElementType" db="db" js_escape="1"/>';
+		var $element_type = document.getElementById('<inp2:cf_InputName name="ElementType" js_escape="1"/>').value;
+
+		// value is changed from ml supported to normal or otherwise
+		if (canHaveMultipleValues($last_element_type) != canHaveMultipleValues($element_type)) {
+			submit_event('cf', 'OnPreSave');
+		}
+	}
+
+	function canHaveMultipleValues($element_type) {
+		var $element_types = ['select', 'multiselect', 'radio'];
+
+		return $element_types.indexOf($element_type) != -1;
+	}
+</script>
+
 <inp2:m_include t="incs/footer"/>