Index: branches/RC/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r11635 -r11661
--- branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 11635)
+++ branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 11661)
@@ -1,4 +1,4 @@
-<inp2:m_DefineElement name="combined_header" permission_type="view" perm_section="" perm_prefix="" perm_event="" system_permission="1" title_preset="" tab_preset="" additional_title_render_as="" additional_blue_bar_render_as="" pagination_prefix="" grid="Default">
+<inp2:m_DefineElement name="combined_header" permission_type="view" perm_section="" perm_prefix="" perm_event="" system_permission="1" title_preset="" title_render_as="" tab_preset="" additional_title_render_as="" additional_blue_bar_render_as="" pagination_prefix="" grid="Default">
 	<inp2:m_if check="m_Param" name="perm_section" inverse="1">
 		<inp2:adm_SectionInfo section="$section" info="perm_section" result_to_var="perm_section"/>
 	</inp2:m_if>
@@ -50,11 +50,17 @@
 			<td class="header_left_bg" nowrap="nowrap" style="vertical-align: middle;">
 				<inp2:adm_SectionInfo section="$section" info="label" result_to_var="default_title"/>
 				<inp2:adm_SectionInfo section="$section" parent="1" info="label" result_to_var="group_title"/>
-				<span class="tablenav_link" id="blue_bar"><inp2:$prefix_SectionTitle title_preset="$title_preset" section="$section" title="$default_title" group_title="$group_title" cut_first="100" pass_params="true"/></span>
+				<span class="tablenav_link" id="blue_bar">
+					<inp2:m_if check="m_Param" name="title_render_as">
+						<inp2:m_RenderElement name="$title_render_as" pass_params="1"/>
+					<inp2:m_else/>
+						<inp2:$prefix_SectionTitle title_preset="$title_preset" section="$section" title="$default_title" group_title="$group_title" cut_first="100" pass_params="true"/>
+					</inp2:m_if>
+				</span>
 			</td>
 			<td align="right" class="tablenav" style="vertical-align: middle;">
 				<inp2:m_if check="m_Param" name="additional_blue_bar_render_as">
-					<inp2:m_RenderElement name="$additional_blue_bar_render_as" />
+					<inp2:m_RenderElement name="$additional_blue_bar_render_as" pass_params="1"/>
 				<inp2:m_else/>
 					<inp2:m_if check="m_Param" name="pagination">
 						<inp2:$prefix_SelectParam possible_names="pagination_prefix,prefix" result_to_var="pagination_prefix"/>
@@ -67,7 +73,7 @@
 
 	<script type="text/javascript">
 		var $visible_toolbar_buttons = <inp2:m_if check="{$prefix}_VisibleToolbarButtons" title_preset="$title_preset">[<inp2:$prefix_VisibleToolbarButtons title_preset="$title_preset"/>]<inp2:m_else/>true</inp2:m_if>;
-		set_window_title( RemoveTranslationLink(document.getElementById('blue_bar').innerHTML, false).replace(/(<[^<]+>)/g, '') + ' - <inp2:m_Phrase label="la_AdministrativeConsole"/>');
+		set_window_title( RemoveTranslationLink(document.getElementById('blue_bar').innerHTML, false).replace(/(<[^<]+>)/g, '').replace(/\s+/g, ' ').trim() + ' - <inp2:m_Phrase label="la_AdministrativeConsole"/>');
 		setHelpLink('<inp2:lang.current_Field name="UserDocsUrl" js_escape="1"/>', '<inp2:m_Param name="title_preset" js_escape="1"/>');
 	</script>
 </inp2:m_DefineElement>
@@ -110,7 +116,7 @@
 	<td><inp2:$prefix.original_Field field="$field" nl2br="1"/></td>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="subsection" prefix="" colspan="4">
+<inp2:m_DefineElement name="subsection" prefix="" colspan="3">
 	<tr class="subsectiontitle">
 		<td colspan="<inp2:m_param name='colspan'/>"><inp2:m_phrase label="$title"/></td>
 		<inp2:m_if check="m_ParamEquals" name="prefix" value="" inverse="inverse">
@@ -142,14 +148,15 @@
 	</script>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_label" is_last="" subfield="" style="" format="" hint_label="" as_label="" currency="" nl2br="0" is_last="">
+<inp2:m_DefineElement name="inp_label" is_last="" subfield="" style="" format="" db="" hint_label="" as_label="" currency="" nl2br="0" is_last="">
 	<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" is_last="$is_last"/>
 		<td class="control-cell" valign="top">
 			<span style="<inp2:m_Param name="style"/>" id="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>">
 				<inp2:{$prefix}_Field field="$field" format="$format" as_label="$as_label" currency="$currency" nl2br="$nl2br"/>
 			</span>
 			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
+			<input type="hidden" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field' db='$db'/>">
 		</td>
     	<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
     	<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
@@ -158,11 +165,10 @@
 	</tr>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_id_label" db="">
-	<inp2:m_if check="{$prefix}_FieldEquals" field="$field" value="" inverse="inverse">
+<inp2:m_DefineElement name="inp_id_label">
+	<inp2:m_ifnot check="Field" field="$field" equals_to="">
 		<inp2:m_RenderElement name="inp_label" pass_params="true"/>
-	</inp2:m_if>
-	<input type="hidden" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" db="$db"/>">
+	</inp2:m_ifnot>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_error">
@@ -465,9 +471,9 @@
 	</tr>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_fck" subfield="" class="" is_last="" maxlength="" bgcolor="" onblur="" size="" onkeyup="" style="" control_options="false">
+<inp2:m_DefineElement name="inp_edit_fck" class="" is_last="" maxlength="" bgcolor="" onblur="" size="" onkeyup="" style="" control_options="false">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<td class="control-cell" colspan="4" onmouseover="show_form_error('<inp2:m_Param name="prefix" js_escape="1"/>', '<inp2:m_Param name="field" js_escape="1"/>')" onmouseout="hide_form_error('<inp2:m_Param name="prefix" js_escape="1"/>')">
+		<td class="control-cell" colspan="3" onmouseover="show_form_error('<inp2:m_Param name="prefix" js_escape="1"/>', '<inp2:m_Param name="field" js_escape="1"/>')" onmouseout="hide_form_error('<inp2:m_Param name="prefix" js_escape="1"/>')">
 			<inp2:FCKEditor field="$field" width="100%" bgcolor="$bgcolor" height="200" late_load="1"/>
 			<script type="text/javascript">
 				if (typeof(fields['<inp2:m_Param name="prefix" js_escape="1"/>']) == 'undefined') {
@@ -481,6 +487,38 @@
 	</tr>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="inp_edit_codepress" is_last="" style="width: 100%;" language="html" control_options="false">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<td class="control-cell" colspan="3" onmouseover="show_form_error('<inp2:m_Param name="prefix" js_escape="1"/>', '<inp2:m_Param name="field" js_escape="1"/>')" onmouseout="hide_form_error('<inp2:m_Param name="prefix" js_escape="1"/>')">
+			<inp2:m_ifnot check="m_Get" name="codepress_included">
+				<script type="text/javascript" src="<inp2:m_TemplatesBase/>/themes/codepress/codepress.js"></script>
+				<script type="text/javascript">
+					CodePress.path = '<inp2:m_TemplatesBase/>/themes/codepress/'; // set path here, because script tags are not found in table cells
+				</script>
+				<inp2:m_Set codepress_included="1"/>
+			</inp2:m_ifnot>
+			<textarea id="<inp2:$prefix_InputName field='$field'/>" name="<inp2:$prefix_InputName field='$field'/>" class="codepress <inp2:m_Param name='language'/>" style="<inp2:m_Param name='style'/>"><inp2:$prefix_Field field="$field"/></textarea>
+
+			<script type="text/javascript">
+				Application.setHook(
+					new Array ('<inp2:m_Param name="prefix" js_escape="1"/>:OnPreSaveAndGoToTab', '<inp2:m_Param name="prefix" js_escape="1"/>:OnPreSaveAndGo', '<inp2:m_Param name="prefix" js_escape="1"/>:OnSave', '<inp2:m_Param name="prefix" js_escape="1"/>:OnCreate', '<inp2:m_Param name="prefix" js_escape="1"/>:OnUpdate'),
+					function($event) {
+						<inp2:m_Param name="field"/>.toggleEditor(); // enable textarea back to save data
+						$event.status = true;
+					}
+				);
+				if (typeof(fields['<inp2:m_Param name="prefix" js_escape="1"/>']) == 'undefined') {
+					fields['<inp2:m_Param name="prefix" js_escape="1"/>'] = new Object();
+				}
+				fields['<inp2:m_Param name="prefix" js_escape="1"/>']['<inp2:m_Param name="field" js_escape="1"/>'] = '<inp2:m_phrase label="$title" js_escape="1"/>'
+
+				Form.addControl('<inp2:$prefix_InputName field="$field"/>', <inp2:m_param name="control_options"/>);
+			</script>
+		</td>
+		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+	</tr>
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="inp_edit_textarea_ml">
 	<inp2:m_RenderElement name="inp_edit_textarea" format="no_default" pass_params="true"/>
 	<!--##<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
@@ -693,18 +731,18 @@
 	</tr>##-->
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_weight" subfield="" class="" is_last="" maxlength="">
+<inp2:m_DefineElement name="inp_edit_weight" class="" is_last="" maxlength="">
 	<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" subfield="$subfield" title="$title" is_last="$is_last"/>
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
 		<td class="control-cell">
 			<inp2:m_if check="lang.current_FieldEquals" field="UnitSystem" value="1">
-				<input type="text" name="<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>" id="<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>" value="<inp2:{$prefix}_Field field="$field" subfield="$subfield"/>" tabindex="<inp2:m_get param="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"/>">
+				<input type="text" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field"/>" tabindex="<inp2:m_get param="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"/>">
 				<inp2:m_phrase label="la_kg" />
 			</inp2:m_if>
 			<inp2:m_if check="lang.current_FieldEquals" field="UnitSystem" value="2">
-				<input type="text" name="<inp2:{$prefix}_InputName field="{$field}_a" subfield="$subfield"/>" id="<inp2:{$prefix}_InputName field="{$field}_a" subfield="$subfield"/>" value="<inp2:{$prefix}_Field field="{$field}_a" subfield="$subfield"/>" tabindex="<inp2:m_get param="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"/>">
+				<input type="text" name="<inp2:{$prefix}_InputName field="{$field}_a"/>" id="<inp2:{$prefix}_InputName field="{$field}_a"/>" value="<inp2:{$prefix}_Field field="{$field}_a"/>" tabindex="<inp2:m_get param="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"/>">
 				<inp2:m_phrase label="la_lbs" />
-				<input type="text" name="<inp2:{$prefix}_InputName field="{$field}_b" subfield="$subfield"/>" id="<inp2:{$prefix}_InputName field="{$field}_b" subfield="$subfield"/>" value="<inp2:{$prefix}_Field field="{$field}_b" subfield="$subfield"/>" tabindex="<inp2:m_get param="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"/>">
+				<input type="text" name="<inp2:{$prefix}_InputName field="{$field}_b"/>" id="<inp2:{$prefix}_InputName field="{$field}_b"/>" value="<inp2:{$prefix}_Field field="{$field}_b"/>" tabindex="<inp2:m_get param="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"/>">
 				<inp2:m_phrase label="la_oz" />
 			</inp2:m_if>
 		</td>