From fed918ab7972cafa6b005e163ffb07a619c21426 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 10 Jan 2013 03:28:05 +0000
Subject: [PATCH]  * adjust hide selectAll button when no cases.

---
 module/testcase/view/browse.html.php   | 22 +++++++++++++---------
 module/testtask/lang/zh-cn.php         |  2 +-
 module/testtask/view/cases.html.php    |  2 ++
 module/testtask/view/linkcase.html.php |  2 ++
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index 19a931d3d7..6e45ab9042 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -10,14 +10,15 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/datepicker.html.php';?>
-<?php include '../../common/view/treeview.html.php';?>
-<?php include '../../common/view/colorize.html.php';?>
-<script language="Javascript">
-var browseType = '<?php echo $browseType;?>';
-var moduleID   = '<?php echo $moduleID;?>';
-</script>
+<?php
+include '../../common/view/header.html.php';
+include '../../common/view/datepicker.html.php';
+include '../../common/view/treeview.html.php';
+include '../../common/view/colorize.html.php';
+js::set('browseType', $browseType);
+js::set('moduleID'  , $moduleID);
+?>
+
 <div id='featurebar'>
   <div class='f-left'>
     <?php
@@ -105,7 +106,9 @@ var moduleID   = '<?php echo $moduleID;?>';
           </thead>
          <tfoot>
            <tr>
-             <td colspan='10'>
+             <?php $mergeColums = $browseType == 'needconfirm' ? 5 : 10;?>
+             <td colspan='<?php echo $mergeColums?>'>
+               <?php if($cases):?>
                <div class='f-left'>
                <?php
                echo html::selectAll() . html::selectReverse(); 
@@ -113,6 +116,7 @@ var moduleID   = '<?php echo $moduleID;?>';
                if(common::hasPriv('testtask', 'batchRun')) echo html::submitButton($lang->testtask->batchRun,  "onclick='changeAction(\"" . $this->createLink('testtask', 'batchRun', "productID=$productID&orderBy=$orderBy") . "\")'");
                ?>
                </div>
+               <?php endif?>
                <?php $pager->show();?>
              </td>
            </tr>
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index b1eeb456dd..025d24a078 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -67,7 +67,7 @@ $lang->testtask->fail          = '失败';
 
 $lang->testtask->byModule      = '按模块';
 $lang->testtask->assignedToMe  = '指派给我';
-$lang->testtask->allCases      = '所有Case';
+$lang->testtask->allCases      = '所有用例';
 
 $lang->testtask->lblCases      = '用例列表';
 $lang->testtask->lblUnlinkCase = '移除用例';
diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php
index 5ee90a90f1..b42c43af53 100644
--- a/module/testtask/view/cases.html.php
+++ b/module/testtask/view/cases.html.php
@@ -86,6 +86,7 @@ var moduleID   = '<?php echo $moduleID;?>';
         <tfoot>
           <tr>
             <td colspan='10'>
+              <?php if($runs):?>
               <div class='f-left'>
               <?php 
               echo html::selectAll() . html::selectReverse();
@@ -99,6 +100,7 @@ var moduleID   = '<?php echo $moduleID;?>';
               <input class='button-s' value="<?php echo $lang->testtask->batchRun; ?>" type="button" onclick="casesform.action='<?php echo inLink('batchRUN', "productID=$productID&orderBy=id_desc&from=testtask");?>';casesform.submit();">
               <?php endif;?>
               </div>
+              <?php endif;?>
               <?php echo $pager->show();?>
             </td>
           </tr>
diff --git a/module/testtask/view/linkcase.html.php b/module/testtask/view/linkcase.html.php
index 99bb3e8e45..7124887ad8 100644
--- a/module/testtask/view/linkcase.html.php
+++ b/module/testtask/view/linkcase.html.php
@@ -60,7 +60,9 @@
   <tfoot> 
   <tr>
     <td colspan='7'>
+      <?php if($cases):?>
       <div class='f-left'><?php echo html::selectAll() . html::selectReverse() . html::submitButton();?></div>
+      <?php endif;?>
       <div class='f-right'><?php $pager->show();?></div>
     </td>
   </tr>