From 305b7805954366c4d848adf89bd5620d98a3b2ed Mon Sep 17 00:00:00 2001
From: zhujinyong <zhujinyong@cnezsoft.com>
Date: Wed, 11 Jul 2012 08:36:27 +0000
Subject: [PATCH]  * move report list to blockreportlist.html.php.

---
 module/report/control.php                    |  4 ++++
 module/report/lang/en.php                    |  7 ++++++-
 module/report/lang/zh-cn.php                 |  7 ++++++-
 module/report/view/blockreportlist.html.php  | 13 +++++++++++++
 module/report/view/bugsummary.html.php       |  7 +------
 module/report/view/productinfo.html.php      |  7 +------
 module/report/view/projectdeviation.html.php |  8 +-------
 module/report/view/workload.html.php         |  7 +------
 8 files changed, 33 insertions(+), 27 deletions(-)
 create mode 100644 module/report/view/blockreportlist.html.php

diff --git a/module/report/control.php b/module/report/control.php
index 801d3e4597..9f769dcd0c 100644
--- a/module/report/control.php
+++ b/module/report/control.php
@@ -32,6 +32,7 @@ class report extends control
     {
         $this->view->header->title = $this->lang->report->projectDeviation;
         $this->view->projects      = $this->report->getProjects();
+        $this->view->submenu       = 'project';
         $this->display();
     }
 
@@ -48,6 +49,7 @@ class report extends control
         $this->app->loadLang('story');
         $this->view->header->title = $this->lang->report->productInfo;
         $this->view->products      = $this->report->getProducts();
+        $this->view->submenu       = 'product';
         $this->display();
     }
 
@@ -82,6 +84,7 @@ class report extends control
         $this->view->begin         = $begin;
         $this->view->end           = $end;
         $this->view->bugs          = $this->report->getBugs($begin, $end);
+        $this->view->submenu       = 'test';
         $this->display(); 
     }
 
@@ -96,6 +99,7 @@ class report extends control
         $this->view->header->title = $this->lang->report->workload;
         $this->view->workload      = $this->report->getWorkload();
         $this->view->users         = $this->loadModel('user')->getPairs('noletter|noclosed');
+        $this->view->submenu       = 'staff';
         $this->display();
     }
 }
diff --git a/module/report/lang/en.php b/module/report/lang/en.php
index fa40d4bad4..64b0943339 100644
--- a/module/report/lang/en.php
+++ b/module/report/lang/en.php
@@ -35,8 +35,13 @@ $lang->report->singleColor[] = 'F6BD0F';
 
 $lang->report->projectDeviation = 'Project deviation';
 $lang->report->productInfo      = 'Product information';
-$lang->report->workload         = 'Workload';
 $lang->report->bugSummary       = 'Bug summary';
+$lang->report->workload         = 'Workload';
+
+$lang->reportList->project->lists[10] = 'Project deviation|report|projectdeviation';
+$lang->reportList->product->lists[10] = 'Product information|report|productinfo';
+$lang->reportList->test->lists[10]    = 'Bug summary|report|bugsummary';
+$lang->reportList->staff->lists[10]   = 'Workload|report|workload';
 
 $lang->report->id            = 'ID';
 $lang->report->project       = 'Project';
diff --git a/module/report/lang/zh-cn.php b/module/report/lang/zh-cn.php
index d6e350a423..9f1526648e 100644
--- a/module/report/lang/zh-cn.php
+++ b/module/report/lang/zh-cn.php
@@ -35,8 +35,13 @@ $lang->report->singleColor[] = 'F6BD0F';
 
 $lang->report->projectDeviation = '项目偏差报表';
 $lang->report->productInfo      = '产品信息统计表';
-$lang->report->workload         = '员工负载表';
 $lang->report->bugSummary       = 'Bug汇总表';
+$lang->report->workload         = '员工负载表';
+
+$lang->reportList->project->lists[10] = '项目偏差报表|report|projectdeviation';
+$lang->reportList->product->lists[10] = '产品信息统计表|report|productinfo';
+$lang->reportList->test->lists[10]    = 'Bug汇总表|report|bugsummary';
+$lang->reportList->staff->lists[10]   = '员工负载表|report|workload';
 
 $lang->report->id            = '编号';
 $lang->report->project       = '项目';
diff --git a/module/report/view/blockreportlist.html.php b/module/report/view/blockreportlist.html.php
new file mode 100644
index 0000000000..be63a71cba
--- /dev/null
+++ b/module/report/view/blockreportlist.html.php
@@ -0,0 +1,13 @@
+<div class='box-title'><?php echo $lang->report->list;?></div>
+<div class='box-content'>
+<ul id="report-list">
+<?php
+    ksort($lang->reportList->$submenu->lists);
+    foreach($lang->reportList->$submenu->lists as $list)
+    {
+        list($label, $module, $method) = explode('|', $list);
+        echo '<li>' . html::a($this->createLink($module, $method), $label) . '</li>';
+    }
+?>
+</ul>
+</div>
diff --git a/module/report/view/bugsummary.html.php b/module/report/view/bugsummary.html.php
index 7881cc4816..a081843a49 100644
--- a/module/report/view/bugsummary.html.php
+++ b/module/report/view/bugsummary.html.php
@@ -3,12 +3,7 @@
 <table class="cont-lt1">
   <tr valign='top'>
     <td class='side'>
-      <div class='box-title'><?php echo $lang->report->list;?></div>
-      <div class='box-content'>
-      <ul id="report-list">
-        <li><?php echo html::a(inlink('bugSummary'), $lang->report->bugSummary);?></li>
-      </ul>
-      </div>
+      <?php include 'blockreportlist.html.php';?>
     </td>
     <td class='divider'></td>
     <td>
diff --git a/module/report/view/productinfo.html.php b/module/report/view/productinfo.html.php
index 60d0a335e4..f3cda1d417 100644
--- a/module/report/view/productinfo.html.php
+++ b/module/report/view/productinfo.html.php
@@ -2,12 +2,7 @@
 <table class="cont-lt1">
   <tr valign='top'>
     <td class='side'>
-      <div class='box-title'><?php echo $lang->report->list;?></div>
-      <div class='box-content'>
-      <ul id="report-list">
-        <li><?php echo html::a(inlink('productInfo'), $lang->report->productInfo);?></li>
-      </ul>
-      </div>
+      <?php include 'blockreportlist.html.php';?>
     </td>
     <td class='divider'></td>
     <td>
diff --git a/module/report/view/projectdeviation.html.php b/module/report/view/projectdeviation.html.php
index 48428605e5..cd461361af 100644
--- a/module/report/view/projectdeviation.html.php
+++ b/module/report/view/projectdeviation.html.php
@@ -3,14 +3,8 @@
 <table class="cont-lt1">
   <tr valign='top'>
     <td class='side'>
-      <div class='box-title'><?php echo $lang->report->list;?></div>
-      <div class='box-content'>
-        <ul id="report-list">
-          <li><?php echo html::a(inlink('projectDeviation'), $lang->report->projectDeviation);?></li>
-        </ul>
-      </div>
+      <?php include 'blockreportlist.html.php';?>
       <div class='proversion'><?php echo $lang->report->proVersion;?></div>
-
     </td>
     <td class='divider'></td>
     <td>
diff --git a/module/report/view/workload.html.php b/module/report/view/workload.html.php
index 88aa10b979..215116726f 100644
--- a/module/report/view/workload.html.php
+++ b/module/report/view/workload.html.php
@@ -2,12 +2,7 @@
 <table class="cont-lt1">
   <tr valign='top'>
     <td class='side'>
-      <div class='box-title'><?php echo $lang->report->list;?></div>
-      <div class='box-content'>
-      <ul id="report-list">
-        <li><?php echo html::a(inlink('workload'), $lang->report->workload, '', 'id="workload"');?></li>
-      </ul>
-      </div>
+      <?php include 'blockreportlist.html.php';?>
     </td>
     <td class='divider'></td>
     <td>