Index: branches/RC/core/admin_templates/modules/modules_list.tpl
===================================================================
diff -u -N -r8929 -r10832
--- branches/RC/core/admin_templates/modules/modules_list.tpl	(.../modules_list.tpl)	(revision 8929)
+++ branches/RC/core/admin_templates/modules/modules_list.tpl	(.../modules_list.tpl)	(revision 10832)
@@ -1,10 +1,8 @@
-<inp2:m_RequireLogin permissions="in-portal:mod_status.view" system="1"/>
+<inp2:adm_CheckPermCache cache_update_t="in-portal/categories/cache_updater"/>
+
 <inp2:m_include t="incs/header" />
+<inp2:m_RenderElement name="combined_header" section="in-portal:mod_status" prefix="mod" pagination="1"/>
 
-<inp2:m_RenderElement name="section_header" prefix="mod" module="in-portal" icon="icon46_modules" title="!la_title_Module_Status!"/>
-
-<inp2:m_RenderElement name="blue_bar" prefix="mod" title_preset="modules_list" module="in-portal" icon="icon46_modules"/>
-
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
@@ -24,7 +22,6 @@
 						}
 				 ) );
 
-
 				a_toolbar.AddButton( new ToolBarButton('deny', '<inp2:m_phrase label="la_ToolTip_Disable" escape="1"/>', function() {
 							submit_event('mod','OnMassDecline');
 						}
@@ -40,16 +37,47 @@
 				a_toolbar.Render();
 			</script>
 		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="mod" grid="Default"/>
 	</tr>
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="mod" IdField="Name" grid="Default" menu_filters="yes"/>
+<inp2:m_DefineElement name="error_element">
+	<inp2:m_Param name="error"/><br />
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_module_td" format="" no_special="" nl2br="" first_chars="" td_style="" currency="">
+	<td valign="top" class="text" style="<inp2:m_param name="td_style"/>">
+		<inp2:m_RenderElement name="grid_module_platform_td" pass_params="1"/>
+	</td>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_module_platform_td" format="" no_special="" nl2br="" first_chars="" td_style="" currency="">
+	<inp2:m_if check="ModuleLicensed">
+		<inp2:m_if check="PrerequisitesMet">
+			<inp2:m_if check="AlreadyInstalled">
+				<inp2:Field name="$field"/>
+			<inp2:m_else/>
+				<a href="<inp2:InstallLink/>"><inp2:m_Phrase name="la_text_ready_to_install"/></a>
+			</inp2:m_if>
+		<inp2:m_else/>
+			<div style="color: red;">
+				<inp2:ListPrerequisites render_as="error_element"/>
+			</div>
+		</inp2:m_if>
+	<inp2:m_else/>
+		<a href="<inp2:m_Link template='dummy' prefix='_FRONT_END_' index_file='core/install.php' preset='already_installed' next_preset='update_license'/>" style="color: red;" target="_blank"><inp2:m_Phrase name="la_module_not_licensed"/></a>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="mod" IdField="Name" per_page="-1" grid="Default" menu_filters="yes"/>
 <script type="text/javascript">
 	Grids['mod'].SetDependantToolbarButtons( new Array('approve','deny') );
 	<inp2:m_if check="m_GetEquals" name="RefreshTree" value="1">
 		var $tree_frame = getFrame('menu');
-  		$tree_frame.location = $tree_frame.location;
+  		$tree_frame.location.href = $tree_frame.location.href;
+  		window.location.href = '<inp2:m_Link/>';
   	</inp2:m_if>
 </script>