Index: branches/RC/themes/default2009/platform/inc/script.js
===================================================================
diff -u -r11427 -r11872
--- branches/RC/themes/default2009/platform/inc/script.js	(.../script.js)	(revision 11427)
+++ branches/RC/themes/default2009/platform/inc/script.js	(.../script.js)	(revision 11872)
@@ -129,6 +129,95 @@
 	this.MoreCategoriesField.value = this.MoreCategories.length ? '|' + this.MoreCategories.join('|') + '|' : '';
 }
 
-function jq(myid) {
-	return '#'+myid.replace(/:/g,"\\:").replace(/\./g,"\\.");
+function jq($selector) {
+	return $selector.replace(/(\[|\]|\.|:)/g, '\\$1');
 }
+
+function MultiLanguageSelector($language_info, $current_language) {
+	this._languageInfo = $language_info;
+	this._currentLanguage = $current_language;
+	this._controls = new Array ();
+
+	var $me = this;
+
+	$(document).ready(
+		function() {
+			$me.init();
+		}
+	);
+}
+
+MultiLanguageSelector.prototype.init = function () {
+	var $i = 0;
+	var $me = this;
+
+	while ($i < this._controls.length) {
+		// set current language
+		$( jq('#' + this._controls[$i]) ).data('PrevLanguage', this._currentLanguage);
+
+		for (var $language_id in this._languageInfo) {
+			var $id = this.inputForLanguage(this._controls[$i], $language_id);
+
+			$( jq('#' + $id + '_flag') ).each(
+				function() {
+					$(this)
+					.data('MainControl', $me._controls[$i])
+					.data('ThisLanguage', $language_id)
+					.click(
+						function ($event) {
+							var $this_flag = $(this);
+							var $this_language = $this_flag.data('ThisLanguage');
+
+							var $main_control = $('#' + jq($this_flag.data('MainControl')) );
+
+							var $prev_language = $main_control.data('PrevLanguage');
+							var $prev_flag = $( jq('#' + $me.inputForLanguage($main_control.attr('id'), $prev_language) + '_flag') );
+
+							var $language_info;
+
+							if ($this_language != $prev_language) {
+								// hide prev language input + enable it's flag
+								var $prev_image = $prev_flag.children('img:first');
+								if ($prev_image.length) {
+									// found image for given language
+									$language_info = $me._languageInfo[$prev_language];
+									$prev_image.attr('src', $prev_image.attr('src').replace($language_info.off, $language_info.on));
+								}
+								$( jq('#' + $prev_flag.attr('id').replace(/_flag$/, '_input') ) ).hide();
+
+								// show this language input + disable it's flag
+								var $this_image = $this_flag.children('img:first');
+								if ($this_image.length) {
+									// found image for given language
+									$language_info = $me._languageInfo[$this_language];
+									$this_image.attr('src', $this_image.attr('src').replace($language_info.on, $language_info.off));
+								}
+								var $this_container = $( jq('#' + $this_flag.attr('id').replace(/_flag$/, '_input') ) );
+								$this_container.show();
+
+								// focus on shown control
+								$('input:first, textarea:first', $this_container).focus();
+
+								// remember last used language
+								$main_control.data('PrevLanguage', $this_language);
+							}
+
+							$event.preventDefault();
+						}
+					);
+				}
+			);
+		}
+
+		$i++;
+	}
+}
+
+MultiLanguageSelector.prototype.inputForLanguage = function ($control_id, $language_id) {
+	return $control_id.replace('l' + this._currentLanguage + '_', 'l' + $language_id + '_');
+}
+
+MultiLanguageSelector.prototype.registerControl = function ($id) {
+	this._controls.push($id);
+}
+
Index: branches/RC/themes/default2009/platform/elements/forms.elm.tpl
===================================================================
diff -u -r11858 -r11872
--- branches/RC/themes/default2009/platform/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 11858)
+++ branches/RC/themes/default2009/platform/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 11872)
@@ -49,14 +49,17 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_field_caption" no_editing="1" title="">
+<inp2:m_DefineElement name="inp_edit_field_caption" no_editing="1" additional_render_as="" title="">
 	<inp2:m_inc param="tab_index" by="1"/>
 	<td class="field-name" nowrap>
 		<inp2:m_if check="m_Param" name="title">
-			<label for="<inp2:{$prefix}_InputName field="$field"/>">
+			<label for="<inp2:{$prefix}_InputName field='$field'/>">
 				<span <inp2:m_if check="{$prefix}_HasError" field="$field">class="field-required"</inp2:m_if>>
 				<inp2:m_phrase label="$title"/></span><inp2:m_if check="{$prefix}_IsRequired" field="$field"><span class="field-required"> *</span></inp2:m_if>:
 			</label>
+			<inp2:m_if check="m_Param" name="additional_render_as">
+				<inp2:m_RenderElement name="$additional_render_as" pass_params="1"/>
+			</inp2:m_if>
 		<inp2:m_else/>
 			&nbsp;
 		</inp2:m_if>
@@ -98,21 +101,68 @@
 	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_box_ml">
+<inp2:m_DefineElement name="ml_input_element">
 	<inp2:Field name="LanguageId" result_to_var="language_id"/>
-	<inp2:m_if check="SelectedLanguage">
-		<inp2:m_RenderElement name="inp_edit_box" field="l{$language_id}_{$field}" title="{$title}" prefix="{$prefix}" style="{$style}" />
-	<inp2:m_else/>
-		<inp2:Field name="PackName" result_to_var="language_name"/>
-		<inp2:m_RenderElement name="inp_edit_box" field="l{$language_id}_{$field}" title="{$title}_{$language_name}" prefix="{$prefix}" style="{$style}" />
-		<inp2:m_if check="IsPrimaryLanguageInList">
-			<inp2:m_if check="{$prefix}_IsRequired" field="$field">
-				<input type="hidden" name="<inp2:{$prefix}_FieldModifier name="l{$language_id}_{$field}" type="required"/>" value="1"/>
+
+	<div id="<inp2:{$prefix}_InputName field="l{$language_id}_{$field}"/>_input"<inp2:m_ifnot check="{$prefix}_LanguageVisible" field="l{$language_id}_{$field}"> style="display: none;"</inp2:m_ifnot>>
+		<inp2:m_if check="{$prefix}_HasError" field="l{$language_id}_{$field}">
+			<span class="field-error"><inp2:{$prefix}_Error field="l{$language_id}_{$field}"/></span><br/>
+		</inp2:m_if>
+
+		<div style="float: left; height: 15px; vertical-align: top; width: auto;">
+			<input type="text" class="input-text" name="<inp2:{$prefix}_InputName field='l{$language_id}_{$field}'/>" id="<inp2:{$prefix}_InputName field='l{$language_id}_{$field}'/>" value="<inp2:{$prefix}_Field field='l{$language_id}_{$field}' format='no_default'/>" tabindex="<inp2:m_get param='tab_index'/>" maxlength="<inp2:m_param name='maxlength'/>" style="<inp2:m_param name='style'/>">
+		</div>
+
+		<div style="float: left; margin-left: 3px; height: 15px; vertical-align: top; width: auto;">
+			<inp2:m_if check="Field" name="IconURL">
+				<img src="<inp2:m_TemplatesBase module='In-Portal'/>img/language_icons/<inp2:Field name='IconURL'/>" alt="<inp2:Field name='LocalName' html_escape='1'/>" border="0"/>
+			<inp2:m_else/>
+				<inp2:Field name="LocalName"/>
 			</inp2:m_if>
+		</div>
+	</div>
+	<div style="clear: both;"></div>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="field_language_element">
+	<inp2:Field name="LanguageId" result_to_var="language_id"/>
+	<a href="#" id="<inp2:{$prefix}_InputName field="l{$language_id}_{$field}"/>_flag">
+		<inp2:m_if check="Field" name="IconURL">
+			<inp2:m_if check='SelectedLanguage'>
+				<img src="<inp2:m_TemplatesBase module='In-Portal'/>img/language_icons/<inp2:Field name='IconDisabledURL'/>" alt="<inp2:Field name='LocalName' html_escape='1'/>" border="0"/>
+			<inp2:m_else/>
+				<img src="<inp2:m_TemplatesBase module='In-Portal'/>img/language_icons/<inp2:Field name='IconURL'/>" alt="<inp2:Field name='LocalName' html_escape='1'/>" border="0"/>
+			</inp2:m_if>
+		<inp2:m_else/>
+			<inp2:Field name="LocalName"/>
 		</inp2:m_if>
-	</inp2:m_if>
+	</a>
+	<inp2:m_ifnot check="m_Param" name="is_last"> </inp2:m_ifnot>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="field_languages_element">
+	<inp2:m_ifnot check="{$prefix}_HasLanguageError" field="$field">
+		<br/>
+		<inp2:lang.enabled_PrintList render_as="field_language_element" pass_params="1" strip_nl="2"/>
+	</inp2:m_ifnot>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_box_ml" style="" maxlength="" no_editing="1" is_last="0" title="">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" additional_render_as="field_languages_element" field="$field" title="$title"/>
+		<td class="field-value">
+			<inp2:lang.enabled_PrintList render_as="ml_input_element" pass_params="1"/>
+
+			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
+		</td>
+	</tr>
+	<script type="text/javascript">
+		<inp2:m_Get name="m_lang" result_to_var="current_language"/>
+		aMultiLanguageSelector.registerControl('<inp2:{$prefix}_InputName field="l{$current_language}_{$field}"/>');
+	</script>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="inp_edit_password" style="" no_editing="1" is_last="0">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
@@ -275,21 +325,45 @@
 	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_textarea_ml">
+<inp2:m_DefineElement name="ml_textarea_element">
 	<inp2:Field name="LanguageId" result_to_var="language_id"/>
-	<inp2:m_if check="SelectedLanguage">
-		<inp2:m_RenderElement name="inp_edit_textarea" field="l{$language_id}_{$field}" title="{$title}" prefix="{$prefix}" is_last="{$is_last}" style="{$style}" cols="{$cols}" rows="{$rows}"/>
-	<inp2:m_else/>
-		<inp2:Field name="PackName" result_to_var="language_name"/>
-		<inp2:m_RenderElement name="inp_edit_textarea" field="l{$language_id}_{$field}" title="{$title}_{$language_name}" prefix="{$prefix}" is_last="{$is_last}" style="{$style}" cols="{$cols}" rows="{$rows}"/>
-		<inp2:m_if check="IsPrimaryLanguageInList">
-			<inp2:m_if check="{$prefix}_IsRequired" field="$field">
-				<input type="hidden" name="<inp2:{$prefix}_FieldModifier name="l{$language_id}_{$field}" type="required"/>" value="1"/>
-			</inp2:m_if>
+
+	<div id="<inp2:{$prefix}_InputName field="l{$language_id}_{$field}"/>_input"<inp2:m_ifnot check="{$prefix}_LanguageVisible" field="l{$language_id}_{$field}"> style="display: none;"</inp2:m_ifnot>>
+		<inp2:m_if check="{$prefix}_HasError" field="l{$language_id}_{$field}">
+			<span class="field-error"><inp2:{$prefix}_Error field="l{$language_id}_{$field}"/></span><br/>
 		</inp2:m_if>
-	</inp2:m_if>
+
+		<div style="float: left; vertical-align: top; width: auto;">
+			<textarea class="input-textarea" tabindex="<inp2:m_get param='tab_index'/>" name="<inp2:{$prefix}_InputName field='l{$language_id}_{$field}'/>" id="<inp2:{$prefix}_InputName field='l{$language_id}_{$field}'/>" cols="<inp2:m_param name='cols'/>" rows="<inp2:m_param name='rows'/>" style="<inp2:m_param name='style'/>"><inp2:{$prefix}_Field field="l{$language_id}_{$field}" format="no_default"/></textarea>
+		</div>
+
+		<div style="float: left; margin-left: 3px; vertical-align: top; width: auto;">
+			<inp2:m_if check="Field" name="IconURL">
+				<img src="<inp2:m_TemplatesBase module='In-Portal'/>img/language_icons/<inp2:Field name='IconURL'/>" alt="<inp2:Field name='LocalName' html_escape='1'/>" border="0"/>
+			<inp2:m_else/>
+				<inp2:Field name="LocalName"/>
+			</inp2:m_if>
+		</div>
+	</div>
+	<div style="clear: both;"></div>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="inp_edit_textarea_ml" style="" maxlength="" no_editing="1" is_last="0" title="">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" additional_render_as="field_languages_element" field="$field" title="$title"/>
+		<td class="field-value">
+			<inp2:lang.enabled_PrintList render_as="ml_textarea_element" pass_params="1"/>
+
+			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
+		</td>
+	</tr>
+	<script type="text/javascript">
+		<inp2:m_Get name="m_lang" result_to_var="current_language"/>
+		aMultiLanguageSelector.registerControl('<inp2:{$prefix}_InputName field="l{$current_language}_{$field}"/>');
+	</script>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="inp_option_item">
 	<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>
 </inp2:m_DefineElement>
Index: branches/RC/themes/default2009/platform/elements/html_head.elm.tpl
===================================================================
diff -u -r11834 -r11872
--- branches/RC/themes/default2009/platform/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 11834)
+++ branches/RC/themes/default2009/platform/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 11872)
@@ -21,4 +21,11 @@
 
 <script type="text/javascript">
 	var aRatingManager = new RatingManager('<inp2:m_Link template="index" events[#PREFIX#]="OnMakeVote" rating="#VOTE#" id="#ID#" no_amp="1" size="#SIZE#"/>');
-</script>
\ No newline at end of file
+
+	<inp2:m_DefineElement name="ml_selector_language_element">
+		<inp2:Field name="LanguageId"/>: {'on': '<inp2:Field name="IconURL" js_ecape="1"/>', 'off': '<inp2:Field name="IconDisabledURL" js_ecape="1"/>'}
+		<inp2:m_ifnot check="m_Param" name="is_last">,</inp2:m_ifnot>
+	</inp2:m_DefineElement>
+
+	var aMultiLanguageSelector = new MultiLanguageSelector({<inp2:lang.enabled_PrintList render_as="ml_selector_language_element" per_page="-1" strip_nl="2"/>}, <inp2:m_Get name="m_lang"/>);
+</script>