Index: branches/5.1.x/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r12657 -r13086
--- branches/5.1.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 12657)
+++ branches/5.1.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 13086)
@@ -15,11 +15,8 @@
 			<table cellpadding="0" cellspacing="0" border="0" width="100%">
 				<!--## <tr<inp2:m_ifnot check="m_ModuleEnabled" module="Proj-Base"> style="background: url(<inp2:adm_SectionInfo section="$section" parent="$parent" info="module_path"/>img/logo_bg.gif) no-repeat top right; height: 55px;"</inp2:m_ifnot>> ##-->
 				<tr>
-					<td valign="top" class="admintitle" align="left" style="padding-top: 10px; padding-bottom: 10px;">
-					<!--##
-			    		<img width="46" height="46" src="<inp2:adm_SectionInfo section='$section' parent='$parent' info='module_path'/>img/icons/icon46_<inp2:adm_SectionInfo section='$section' parent='$parent' info='icon'/>.gif" align="absmiddle" title="<inp2:adm_SectionInfo section='$section' parent='$parent' info='label'/>" alt=""/>&nbsp;
-			    	##-->
-			    		<inp2:adm_SectionInfo section="$section" parent="$parent" info="label"/>
+					<td valign="top" class="admintitle" align="left" <!--##style="padding-top: 10px; padding-bottom: 10px;"##-->>
+			    		<img width="46" height="46" src="<inp2:adm_SectionInfo section='$section' parent='$parent' info='module_path'/>img/icons/icon46_<inp2:adm_SectionInfo section='$section' parent='$parent' info='icon'/>.png" align="absmiddle" title="<inp2:adm_SectionInfo section='$section' parent='$parent' info='label' no_editing='1'/>" alt=""/><inp2:adm_SectionInfo section="$section" parent="$parent" info="label"/>
 			   		</td>
 			   		<inp2:m_if check="m_Param" name="additional_title_render_as">
 						<inp2:m_RenderElement name="$additional_title_render_as" pass_params="1"/>
@@ -579,9 +576,9 @@
 			<td class="control-cell">
 				<table cellpadding="0" cellspacing="0">
 					<tr>
-						<td id="<inp2:{$prefix}_InputName field='$field'/>_path">
+						<td id="<inp2:{$prefix}_InputName field='$field'/>_path"<inp2:m_ifnot check="Field" name="$field" db="db"> style="display: none;"</inp2:m_ifnot>>
 							<inp2:m_DefineElement name="category_caption">
-								<inp2:m_ifnot check="c_HomeCategory" equals_to="$cat_id">
+								<inp2:m_ifnot check="m_Param" name="is_first">
 									<inp2:m_param name="separator"/>
 								</inp2:m_ifnot>
 								<inp2:m_param name="cat_name"/>
@@ -596,14 +593,36 @@
 				          		 <img src="img/icons/icon24_cat.gif" width="24" height="24" border="0"/>
 				         	</a>
 
-				         	<a href="#" onclick="disable_category('<inp2:m_Param name='field'/>'); return false;"><inp2:m_Phrase name="la_Text_Disable"/></a>
+				         	<a href="#" id="<inp2:{$prefix}_InputName field='$field'/>_disable_link"<inp2:m_ifnot check="Field" name="$field" db="db"> style="display: none;"</inp2:m_ifnot>><inp2:m_Phrase name="la_Text_Disable"/></a>
 
 				         	<script type="text/javascript">
-					         	function disable_category($field) {
-					         		var $field = '<inp2:{$prefix}_InputName field="#FIELD_NAME#"/>'.replace('#FIELD_NAME#', $field);
-							    	set_hidden_field($field, '');
-							    	document.getElementById($field + '_path').style.display = 'none';
-							    }
+								function CategorySelector() {
+								}
+
+								CategorySelector.getField = function ($field) {
+									return jq('<inp2:{$prefix}_InputName field="#FIELD_NAME#"/>'.replace('#FIELD_NAME#', $field));
+								}
+
+								CategorySelector.disableCategory = function ($field) {
+									var $field_id = this.getField($field);
+
+					         		$('#' + $field_id).val('');
+					         		$('#' + $field_id + '_path, #' + $field_id + '_disable_link').hide();
+								}
+
+				         		$(document).ready(
+									function() {
+										var $field_id = CategorySelector.getField('<inp2:m_Param name="field" js_escape="1"/>');
+
+										$('#' + $field_id + '_disable_link').click(
+											function ($e) {
+												CategorySelector.disableCategory('<inp2:m_Param name="field" js_escape="1"/>');
+
+												return false;
+											}
+										);
+									}
+								);
 						    </script>
 						</td>
 					</tr>
@@ -755,7 +774,7 @@
 	##-->
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_weight" class="" is_last="" hint_label="" maxlength="">
+<inp2:m_DefineElement name="inp_edit_weight" class="" is_last="" hint_label="" size="" maxlength="" onblur="">
 	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
 		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
 			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" hint_label="$hint_label" is_last="$is_last"/>
@@ -1022,7 +1041,7 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="ml_selector" prefix="" field="Translated">
+<inp2:m_DefineElement name="ml_selector" prefix="">
 	<inp2:m_if check="lang_IsMultiLanguage">
 		<td align="right" style="padding-right: 5px;">
 			<table width="100%" cellpadding="0" cellspacing="0">
@@ -1031,25 +1050,13 @@
 						<inp2:m_phrase name="la_fld_Language"/>:
 						<select name="language" onchange="submit_event('<inp2:m_param name='prefix'/>', 'OnPreSaveAndChangeLanguage');">
 							<inp2:m_DefineElement name="lang_elem">
-								<option value="<inp2:Field name='LanguageId'/>" <inp2:m_if check="SelectedLanguage">selected="selected"</inp2:m_if> ><inp2:Field name="LocalName" no_special='no_special' /></option>
+								<option value="<inp2:Field name='LanguageId'/>" <inp2:m_if check="SelectedLanguage" type="data">selected="selected"</inp2:m_if> ><inp2:Field name="LocalName" no_special='no_special' /></option>
 							</inp2:m_DefineElement>
 							<inp2:lang_PrintList render_as="lang_elem"/>
 						</select>
 					</td>
 				</tr>
 				<tr>
-					<td align="right">
-						<inp2:m_if check="lang_IsPrimaryLanguage">
-							<input type="hidden" id="<inp2:{$prefix}_InputName field='$field'/>" name="<inp2:{$prefix}_InputName field='$field'/>" value="1">
-							<input type="checkbox" disabled id="_cb_<inp2:{$prefix}_InputName field='$field'/>" name="_cb_<inp2:{$prefix}_InputName field='$field'/>" checked="checked"/>
-						<inp2:m_else/>
-							<input type="hidden" id="<inp2:{$prefix}_InputName field='$field'/>" name="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>">
-							<input type="checkbox" id="_cb_<inp2:{$prefix}_InputName field='$field'/>" name="_cb_<inp2:{$prefix}_InputName field='$field'/>" <inp2:{$prefix}_Field field="$field" checked="checked"/> onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field='$field'/>'));" />
-						</inp2:m_if>
-						<label for="_cb_<inp2:{$prefix}_InputName field='$field'/>"><inp2:m_Phrase label="la_Translated"/></label>
-					</td>
-				</tr>
-				<tr>
 					<td align="right" style="vertical-align: bottom; padding: 2px 0px 5px 2px;">
 						<span style="color: red">*</span>&nbsp;<span class="req-note"><inp2:m_Phrase name="la_text_RequiredFields"/></span>
 					</td>