From 21cbca397ba6afdddfed011f6980b0f41043cb24 Mon Sep 17 00:00:00 2001
From: flyskyko <sinsy200@gmail.com>
Date: Wed, 12 Oct 2011 05:04:04 +0000
Subject: [PATCH] issue 240, added menu for module category

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9600 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/module/conf/module.xml      |  2 +-
 modules/module/tpl/header.html      | 20 +++++++++++---------
 modules/module/tpl/module_list.html |  8 +-------
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/modules/module/conf/module.xml b/modules/module/conf/module.xml
index ab63e91af..8873951a8 100644
--- a/modules/module/conf/module.xml
+++ b/modules/module/conf/module.xml
@@ -10,7 +10,7 @@
 
         <action name="dispModuleAdminContent" type="view" standalone="true"  menu_name="installedModule" menu_index="true" admin_index="true" />
         <action name="dispModuleAdminList" type="view" standalone="true" />
-        <action name="dispModuleAdminCategory" type="view" standalone="true" />
+        <action name="dispModuleAdminCategory" type="view" standalone="true" menu_name="installedModule" />
         <action name="dispModuleAdminInfo" type="view" standalone="true" />
         <action name="dispModuleAdminModuleSetup" type="view" standalone="true" />
         <action name="dispModuleAdminModuleAdditionSetup" type="view" standalone="true" />
diff --git a/modules/module/tpl/header.html b/modules/module/tpl/header.html
index 646f4c610..da99d5d1a 100644
--- a/modules/module/tpl/header.html
+++ b/modules/module/tpl/header.html
@@ -1,12 +1,14 @@
-<load target="js/module_admin.js" usecdn="true"
+<load target="js/module_admin.js" usecdn="true" />
 
-<h3 class="xeAdmin">{$lang->module} <span class="gray">{$lang->cmd_management}</span></h3>
+<script type="text/javascript">
+	xe.lang.favorite_on = '{$lang->favorite}({$lang->on})';
+	xe.lang.favorite_off = '{$lang->favorite}({$lang->off})';
+</script>
 
-<!--@if($act == 'dispModuleAdminContent')-->
-<div class="infoText">{nl2br($lang->about_module)}</div>
-<!--@end-->
+<h1 class="h1">{$lang->installed_module}</h1>
 
-<ul class="localNavigation">
-    <li <!--@if($act=='dispModuleAdminContent')-->class="on"<!--@end-->><a href="{getUrl('act','dispModuleAdminContent')}">{$lang->module_index}</a></li>
-    <li <!--@if($act=='dispModuleAdminCategory')-->class="on"<!--@end-->><a href="{getUrl('act','dispModuleAdminCategory')}">{$lang->module_category}</a></li>
-</ul>
+<div class="cnb">
+	<a href="{getUrl('', 'module', 'admin', 'act', 'dispModuleAdminContent')}" class="active"|cond="$act=='dispModuleAdminContent'">{$lang->installed_module}</a>
+	|
+	<a href="{getUrl('', 'module', 'admin', 'act', 'dispModuleAdminCategory')}" class="active"|cond="$act=='dispModuleAdminCategory'">{$lang->module_category}</a>
+</div>
diff --git a/modules/module/tpl/module_list.html b/modules/module/tpl/module_list.html
index 0b9d5b272..0ac5b2a05 100644
--- a/modules/module/tpl/module_list.html
+++ b/modules/module/tpl/module_list.html
@@ -1,11 +1,5 @@
-<load target="js/module_admin.js" usecdn="true" />
+<include target="header.html" />
 
-<script type="text/javascript">
-	xe.lang.favorite_on = '{$lang->favorite}({$lang->on})';
-	xe.lang.favorite_off = '{$lang->favorite}({$lang->off})';
-</script>
-
-<h1 class="h1">{$lang->installed_module}</h1>
 <div class="table even easyList">
 	<table width="100%" border="1" cellspacing="0">
 		<caption>