Index: branches/5.3.x/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r16503 -r16600
--- branches/5.3.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 16503)
+++ branches/5.3.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 16600)
@@ -13,11 +13,18 @@
 	<inp2:m_if check="m_get" var="m_wid" inverse="1">
 		<inp2:m_if check="m_GetConfig" name="UseSmallHeader">
 			<img src="img/spacer.gif" height="8" width="1" alt=""/>
+
+			<inp2:m_if check="m_Param" name="additional_title_render_as">
+				<table cellpadding="0" cellspacing="0" border="0" width="100%">
+					<tr>
+						<inp2:m_RenderElement name="$additional_title_render_as" pass_params="1"/>
+					</tr>
+				</table>
+			</inp2:m_if>
 		<inp2:m_else/>
 			<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;"##-->>
+					<td valign="top" class="admintitle" align="left">
 			    		<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">
@@ -29,7 +36,6 @@
 	<inp2:m_else/>
 		<inp2:m_if check="m_Param" name="additional_title_render_as">
 			<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>
 					<inp2:m_RenderElement name="$additional_title_render_as" pass_params="1"/>
 				</tr>
@@ -183,7 +189,7 @@
 	<!--##<td class="error-cell"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>##-->
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_box" class="" format="" maxlength="" onblur="" onchange="" size="" onkeyup="" allow_html="" edit_template="popups/editor" style="width: 100%" after_text="" autocomplete="">
+<inp2:m_DefineElement name="inp_edit_box" class="" format="" maxlength="" onblur="" onchange="" size="" onkeyup="" allow_html="auto" edit_template="popups/editor" style="width: 100%" after_text="" autocomplete="">
 	<inp2:m_RenderElement design="form_row" block_name="inp_edit_box" pass_params="1">
 		<td class="control-cell">
 			<input style="<inp2:m_Param name='style'/>" type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field' format='$format'/>" tabindex="<inp2:m_Get name='tab_index'/>" size="<inp2:m_param name='size'/>" maxlength="<inp2:m_param name='maxlength'/>" class="<inp2:m_param name='class'/>" onblur="<inp2:m_Param name='onblur'/>" onkeyup="<inp2:m_Param name='onkeyup'/>" onchange="<inp2:m_Param name='onchange'/>" autocomplete="<inp2:m_Param name='autocomplete'/>"><inp2:m_Param name="after_text"/>
@@ -491,9 +497,13 @@
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="textarea_field_caption_element">
+<inp2:m_DefineElement name="textarea_field_caption_element" allow_html="auto">
 	<inp2:m_RenderElement name="default_field_caption_element" pass_params="1"/>
 
+	<inp2:m_if check="m_Param" name="allow_html" equals_to="auto">
+		<inp2:$prefix_FieldOption field="$field" option="using_fck" result_to_var="allow_html"/>
+	</inp2:m_if>
+
 	<inp2:m_if check="m_Param" name="allow_html">
 		<br>
 		<inp2:{$prefix}_InputName field="$field" result_to_var="input_name"/>
@@ -503,7 +513,7 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_textarea" caption_render_as="textarea_field_caption_element" class="" format="" edit_template="popups/editor" allow_html="" style="text-align: left; width: 100%; height: 100px;" control_options="false" row_style="height: auto">
+<inp2:m_DefineElement name="inp_edit_textarea" caption_render_as="textarea_field_caption_element" class="" format="" edit_template="popups/editor" allow_html="auto" style="text-align: left; width: 100%; height: 100px;" control_options="false" row_style="height: auto">
 	<inp2:m_RenderElement design="form_row" block_name="inp_edit_textarea" pass_params="1">
 		<td class="control-cell">
 			<textarea style="<inp2:m_Param name='style'/>" tabindex="<inp2:m_Get name='tab_index'/>" id="<inp2:{$prefix}_InputName field='$field'/>" name="<inp2:{$prefix}_InputName field='$field'/>" ><inp2:{$prefix}_Field field="$field" format="fck_ready;{$format}"/></textarea>
@@ -569,7 +579,7 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_codemirror" caption_render_as="textarea_field_caption_element" class="" format="" edit_template="popups/editor" allow_html="" style="text-align: left; width: 100%; height: 100px;" control_options="false" row_style="height: auto" codemirror_options="lineNumbers: true, styleActiveLine: true">
+<inp2:m_DefineElement name="inp_edit_codemirror" caption_render_as="textarea_field_caption_element" class="" format="" edit_template="popups/editor" allow_html="auto" style="text-align: left; width: 100%; height: 100px;" control_options="false" row_style="height: auto" codemirror_options="lineNumbers: true, styleActiveLine: true">
 	<inp2:m_RenderElement design="form_row" pass_params="1">
 		<td class="control-cell">
 			<textarea tabindex="<inp2:m_Get name='tab_index'/>" id="<inp2:{$prefix}_InputName field='$field'/>" name="<inp2:{$prefix}_InputName field='$field'/>" ><inp2:{$prefix}_Field field="$field" format="fck_ready;{$format}"/></textarea>
@@ -590,10 +600,14 @@
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="textarea_ml_field_caption_element">
+<inp2:m_DefineElement name="textarea_ml_field_caption_element" allow_html="auto">
 	<inp2:m_RenderElement name="default_field_caption_element" pass_params="1"/>
 
 	<br>
+	<inp2:m_if check="m_Param" name="allow_html" equals_to="auto">
+		<inp2:$prefix_FieldOption field="$field" option="using_fck" result_to_var="allow_html"/>
+	</inp2:m_if>
+
 	<inp2:m_if check="m_ParamEquals" name="allow_html" value="allow_html">
 		<inp2:{$prefix}_InputName field="$field" result_to_var="input_name"/>
 		<a href="<inp2:m_Link template='$edit_template' TargetField='$input_name' pass_through='TargetField' pass='m,$prefix'/>" onclick="openSelector('<inp2:m_Param name='prefix' js_escape='1'/>', this.href, '', '800x575'); return false;">