Index: branches/RC/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -r11711 -r11724
--- branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 11711)
+++ branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 11724)
@@ -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="" tab_preset="" additional_title_render_as="" additional_blue_bar_render_as="" pagination_prefix="" parent="1" 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>
@@ -13,10 +13,10 @@
 			<img src="img/spacer.gif" height="8" width="1" alt=""/>
 		<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="1" info="module_path"/>img/logo_bg.gif) no-repeat top right; height: 55px;"</inp2:m_ifnot>> ##-->
+				<!--## <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='1' info='module_path'/>img/icons/icon46_<inp2:adm_SectionInfo section='$section' parent='1' info='icon'/>.gif" align="absmiddle" title="<inp2:adm_SectionInfo section='$section' parent='1' info='label'/>" alt=""/>&nbsp;<inp2:adm_SectionInfo section="$section" parent="1" info="label"/>
+			    		<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>
 			   		<inp2:m_if check="m_Param" name="additional_title_render_as">
 						<inp2:m_RenderElement name="$additional_title_render_as" pass_params="1"/>
@@ -27,7 +27,7 @@
 	<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="1" info="module_path"/>img/logo_bg.gif) no-repeat top right; height: 55px;"</inp2:m_ifnot>> ##-->
+				<!--## <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>
@@ -49,7 +49,7 @@
 		<tr>
 			<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"/>
+				<inp2:adm_SectionInfo section="$section" parent="$parent" 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>
@@ -74,40 +74,6 @@
 	</script>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="section_header">
-	<strong>DEPRICATED. PLEASE USE "COMBINED_HEADER"</strong>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="blue_bar" module="" icon="" pagination="0">
-	<!--## DEPRICATED, BUT USED IN "no_permission.tpl". ##-->
-		<table border="0" cellpadding="2" cellspacing="0" class="bordered-no-bottom" width="100%" style="height: 30px;">
-			<tr>
-				<td class="header_left_bg" nowrap="nowrap" valign="middle">
-					<span class="tablenav_link" id="blue_bar"><inp2:{$prefix}_SectionTitle title_preset="$title_preset" title="Invalid OR Missing title preset [#preset_name#]" cut_first="100" pass_params="true"/></span>
-				</td>
-				<td align="right" class="tablenav" valign="middle">
-					<script type="text/javascript">
-						set_window_title( RemoveTranslationLink(document.getElementById('blue_bar').innerHTML, false).replace(/(<[^<]+>)/g, '') + ' - <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_if check="m_ModuleEnabled" module="In-Portal">
-						<script>
-							var $help_url='<inp2:m_t t="help" h_prefix="$prefix" h_icon="$icon" h_module="$module" h_title_preset="$title_preset" pass="all,m,h" m_opener="p" escape="escape"/>';
-							$help_url = $help_url.replace(/#/g, '%23');
-						</script>
-					</inp2:m_if>
-					<inp2:m_if check="m_Param" name="pagination">
-						<inp2:m_RenderElement name="grid_pagination_elem" PrefixSpecial="$prefix" pass_params="1"/>
-					</inp2:m_if>
-				</td>
-			</tr>
-		</table>
-
-		<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>;
-		</script>
-</inp2:m_DefineElement>
-
 <inp2:m_DefineElement name="inp_original_label">
 	<td><inp2:$prefix.original_Field field="$field" nl2br="1"/></td>
 </inp2:m_DefineElement>