Index: trunk/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -r7635 -r7855
--- trunk/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 7635)
+++ trunk/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 7855)
@@ -1,11 +1,11 @@
-<inp2:m_DefineElement name="combined_header">
+<inp2:m_DefineElement name="combined_header" module="">
 	<inp2:m_RequireLogin permissions="$section.view" system="1"/>
 	<inp2:m_if check="m_Param" name="prefix" inverse="1"><inp2:adm_SectionInfo section="$section" info="SectionPrefix" result_to_var="prefix"/></inp2:m_if>
 	<inp2:m_if check="m_get" var="m_wid" inverse="1">
 		<table cellpadding="0" cellspacing="0" border="0" width="100%">
-			<tr style="background: url(<inp2:adm_SectionInfo section="$section" parent="1" info="module_path"/>img/logo_bg.gif) no-repeat top right; height: 55px;">
+			<tr style="background: url(<inp2:adm_SectionInfo section="$section" info="module_path"/>img/logo_bg.gif) no-repeat top right; height: 55px;">
 				<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"/>">&nbsp;<inp2:adm_SectionInfo section="$section" parent="1" info="label"/>
+		    		<img width="46" height="46" src="<inp2:adm_SectionInfo section="$section" info="module_path" module="$module"/>img/icons/icon46_<inp2:adm_SectionInfo section="$section" info="icon"/>.gif" align="absmiddle" title="<inp2:adm_SectionInfo section="$section" info="label"/>">&nbsp;<inp2:adm_SectionInfo section="$section" info="label"/>
 		   		</td>
 			</tr>
 		</table>
@@ -59,8 +59,8 @@
 
 <inp2:m_DefineElement name="section_header_new" module="#session#">
 		<table cellpadding="0" cellspacing="0" border="0" width="100%">
-			<tr style="background: url(<inp2:ModulePath module="$module"/>img/logo_bg.gif) no-repeat top right; height: 65px;">
-				<td valign="top" class="admintitle" align="left" style="padding-top: 15px; padding-bottom: 15px;">
+			<tr style="background: url(<inp2:ModulePath module="$module"/>img/logo_bg.gif) no-repeat top right; height: 55px;">
+				<td valign="top" class="admintitle" align="left" style="padding-top: 10px; padding-bottom: 10px;">
 		    		<img width="46" height="46" src="<inp2:ModulePath module="$module"/>img/icons/<inp2:adm_GetSectionIcon icon="$icon"/>.gif" align="absmiddle" title="<inp2:adm_GetSectionTitle phrase="$title"/>">&nbsp;<inp2:adm_GetSectionTitle phrase="$title"/>
 		   		</td>
 			</tr>
@@ -283,7 +283,7 @@
 			<inp2:m_if check="m_ParamEquals" name="old_style" value="1">
 				<a href="#" onclick="return OpenUserSelector('','kernel_form','<inp2:$prefix_InputName field="$field"/>');">
 			<inp2:m_else/>
-				<a href="javascript:openSelector('<inp2:m_param name="prefix"/>', '<inp2:m_t t="user_selector" pass="all,$prefix" escape="1"/>', '<inp2:m_param name="field"/>');">
+				<a href="javascript:openSelector('<inp2:m_param name="prefix"/>', '<inp2:m_t t="in-portal/user_selector" pass="all,$prefix" escape="1"/>', '<inp2:m_param name="field"/>');">
 			</inp2:m_if>
           		 <img src="img/icons/icon24_link_user.gif" style="cursor:hand;" border="0">
          	</a>