From eedea7b49c1c1d5c2ad9fc026aa690d8e373c443 Mon Sep 17 00:00:00 2001
From: liugang <liugang@cnezsoft.com>
Date: Tue, 15 May 2018 19:22:34 +0800
Subject: [PATCH 1/6] * Adjust style.

---
 module/company/view/browse.html.php      |  6 +++---
 module/group/view/browse.html.php        |  4 ++--
 module/task/view/recordestimate.html.php | 19 ++++---------------
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/module/company/view/browse.html.php b/module/company/view/browse.html.php
index ffef983157..f037d4dfde 100644
--- a/module/company/view/browse.html.php
+++ b/module/company/view/browse.html.php
@@ -91,10 +91,10 @@ js::set('confirmDelete', $lang->user->confirmDelete);
           <td class='c-actions'>
             <div class='more'>
               <?php
-              if($user->ranzhi) common::printIcon('user', 'unbind', "userID=$user->account", '', 'list', 'unlink', "hiddenwin");
-              if((strtotime(date('Y-m-d H:i:s')) - strtotime($user->locked)) < $this->config->user->lockMinutes * 60)
+              if(true or $user->ranzhi) common::printIcon('user', 'unbind', "userID=$user->account", '', 'list', 'unlink', "hiddenwin");
+              if(true or (strtotime(date('Y-m-d H:i:s')) - strtotime($user->locked)) < $this->config->user->lockMinutes * 60)
               {
-                  common::printIcon('user', 'unlock', "userID=$user->account", '', 'list', '', "hiddenwin");
+                  common::printIcon('user', 'unlock', "userID=$user->account", '', 'list', 'unlock', "hiddenwin");
               }
               ?>
             </div>
diff --git a/module/group/view/browse.html.php b/module/group/view/browse.html.php
index 02ed975ed1..5152c420b3 100644
--- a/module/group/view/browse.html.php
+++ b/module/group/view/browse.html.php
@@ -54,11 +54,11 @@
         if(common::hasPriv('group', 'delete') and $group->role != 'limited')
         {
             $deleteURL = $this->createLink('group', 'delete', "groupID=$group->id&confirm=yes");
-            echo html::a("javascript:ajaxDelete(\"$deleteURL\", \"groupList\", confirmDelete)", '<i class="icon icon-sm icon-close"></i>', '', "title='{$lang->group->delete}' class='btn'");
+            echo html::a("javascript:ajaxDelete(\"$deleteURL\", \"groupList\", confirmDelete)", '<i class="icon icon-trash"></i>', '', "title='{$lang->group->delete}' class='btn'");
         }
         else
         {
-            echo "<button class='btn disabled'><i class='icon icon-sm icon-close disabled' title='{$lang->group->delete}'></i></button>";
+            echo "<button class='btn disabled'><i class='icon icon-trash disabled' title='{$lang->group->delete}'></i></button>";
         }
         ?>
       </td>
diff --git a/module/task/view/recordestimate.html.php b/module/task/view/recordestimate.html.php
index f574012cb4..f0b1f638ab 100644
--- a/module/task/view/recordestimate.html.php
+++ b/module/task/view/recordestimate.html.php
@@ -36,17 +36,17 @@
     </div>
     <form id="recordForm" method='post' target='hiddenwin' style='margin-top:25px'>
       <table class='table table-form table-fixed'>
-        <?php if(count($estimates)):?>
         <thead>
           <tr class='text-center'>
             <th class="w-id"><?php echo $lang->idAB;?></th>
-            <th class="w-100px"><?php echo $lang->task->date;?></th>
+            <th class="w-120px"><?php echo $lang->task->date;?></th>
             <th class="w-60px"><?php echo $lang->task->consumedThisTime;?></th>
             <th class="w-60px"><?php echo $lang->task->leftThisTime;?></th>
             <th><?php echo $lang->comment;?></th>
-            <th class="w-60px"><?php echo $lang->actions;?></th>
+            <th class='w-10px'></th>
           </tr>
         </thead>
+        <?php if(count($estimates)):?>
         <?php foreach($estimates as $estimate):?>
         <tr class="text-center">
           <td><?php echo $estimate->id;?></td>
@@ -67,16 +67,6 @@
         <?php endforeach;?>
         <?php endif;?>
         <?php if(in_array($task->status, array('wait', 'pause', 'doing'))):?>
-        <thead>
-          <tr class='text-center'>
-            <th class="w-id"><?php echo $lang->idAB;?></th>
-            <th class="w-120px"><?php echo $lang->task->date;?></th>
-            <th class="w-60px"><?php echo $lang->task->consumedThisTime;?></th>
-            <th class="w-60px"><?php echo $lang->task->leftThisTime;?></th>
-            <th><?php echo $lang->comment;?></th>
-            <th class='w-10px'></th>
-          </tr>
-        </thead>
         <?php for($i = 1; $i <= 3; $i++):?>
         <tr class="text-center">
           <td><?php echo $i . html::hidden("id[$i]", $i);?></td>
@@ -87,14 +77,13 @@
           <td></td>
         </tr>
         <?php endfor;?>
+        <?php endif;?>
         <tr>
           <td colspan='6' class='text-center'><?php echo html::submitButton() . html::backButton();?></td>
         </tr>
       </table>
-      <?php endif;?>
     </form>
     <?php endif;?>
   </div>
 </div>
 <?php include '../../common/view/footer.lite.html.php';?>
-<?php endif;?>

From f2058e9b9f94964e5411f8416fd3ee39e1aa977e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <admin@lvtao.net>
Date: Wed, 16 May 2018 09:08:57 +0800
Subject: [PATCH 2/6] * Task#4118.

---
 module/testcase/view/exporttemplet.html.php | 49 ++++++++++-----------
 module/testcase/view/import.html.php        | 11 +++--
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/module/testcase/view/exporttemplet.html.php b/module/testcase/view/exporttemplet.html.php
index 80e5e9e311..c7625af41b 100644
--- a/module/testcase/view/exporttemplet.html.php
+++ b/module/testcase/view/exporttemplet.html.php
@@ -19,31 +19,30 @@ function closeWindow()
     }
 }
 </script>
-<div id='titlebar'>
-  <div class='heading'>
-    <span class='prefix'><?php echo html::icon($lang->icons['export']);?></span>
-    <strong><?php echo $lang->testcase->exportTemplet;?></strong>
+<div class='main-content'>
+  <div class='main-header'>
+    <h2><?php echo $lang->testcase->exportTemplet;?></h2>
   </div>
-</div>
 
-<form class='form-condensed' method='post' target='hiddenwin' onsubmit='setDownloading();' style='padding: 40px 5%'>
-<table class='w-p100'>
-  <tr>
-    <td>
-      <div class='input-group'>
-        <span class='input-group-addon'><?php echo $lang->testcase->num;?></span>
-        <?php
-          echo html::input('num', '10', "class='form-control' autocomplete='off'");
-        ?>
-      </div>
-    </td>
-    <td class='w-100px'>
-      <?php echo html::select('encode', $config->charsets[$this->cookie->lang], 'utf-8', "class='form-control'");?>
-    </td>
-    <td>
-      <?php echo html::submitButton();?>
-    </td>
-  </tr>
-</table>
-</form>
+  <form method='post' target='hiddenwin' onsubmit='setDownloading();' style='padding: 40px 5%'>
+    <table class='w-p100'>
+      <tr>
+        <td>
+          <div class='input-group'>
+            <span class='input-group-addon'><?php echo $lang->testcase->num;?></span>
+            <?php
+            echo html::input('num', '10', "class='form-control' autocomplete='off'");
+            ?>
+          </div>
+        </td>
+        <td class='w-100px'>
+          <?php echo html::select('encode', $config->charsets[$this->cookie->lang], 'utf-8', "class='form-control'");?>
+        </td>
+        <td>
+          <?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
+        </td>
+      </tr>
+    </table>
+  </form>
+</div>
 <?php include '../../common/view/footer.lite.html.php';?>
diff --git a/module/testcase/view/import.html.php b/module/testcase/view/import.html.php
index 5f8a96a6d4..d1ea464b4b 100644
--- a/module/testcase/view/import.html.php
+++ b/module/testcase/view/import.html.php
@@ -1,7 +1,10 @@
 <?php include '../../common/view/header.lite.html.php';?>
-<div class='container mw-600px'>
-  <form class='form-condensed' method='post' enctype='multipart/form-data' target='hiddenwin' style="padding:30px">
-  <table class='table table-form'>
+<div class='main-content'>
+  <div class='main-header'>
+    <h2><?php echo $lang->testcase->importFile;?></h2>
+  </div>
+  <form method='post' enctype='multipart/form-data' target='hiddenwin' style="padding:30px">
+  <table class='table table-form w-p100'>
     <tr>
       <td align='center'>
         <input type='file' name='file' class='form-control'/>
@@ -10,7 +13,7 @@
         <?php echo html::select('encode', $config->charsets[$this->cookie->lang], 'utf-8', "class='form-control'");?>
       </td>
       <td>
-        <?php echo html::submitButton();?>
+        <?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
       </td>
     </tr>
   </table>

From f1d8d22691f8d08a43bf642acf99d004bde2609d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <admin@lvtao.net>
Date: Wed, 16 May 2018 09:13:05 +0800
Subject: [PATCH 3/6] * Task#4125.

---
 module/testsuite/view/exporttemplet.html.php | 48 ++++++++++----------
 module/testsuite/view/import.html.php        |  9 ++--
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/module/testsuite/view/exporttemplet.html.php b/module/testsuite/view/exporttemplet.html.php
index 80e5e9e311..d86f7e61be 100644
--- a/module/testsuite/view/exporttemplet.html.php
+++ b/module/testsuite/view/exporttemplet.html.php
@@ -19,31 +19,29 @@ function closeWindow()
     }
 }
 </script>
-<div id='titlebar'>
-  <div class='heading'>
-    <span class='prefix'><?php echo html::icon($lang->icons['export']);?></span>
-    <strong><?php echo $lang->testcase->exportTemplet;?></strong>
+<div class='main-content'>
+  <div class='main-header'>
+    <h2><?php echo $lang->testcase->exportTemplet;?></h2>
   </div>
-</div>
-
-<form class='form-condensed' method='post' target='hiddenwin' onsubmit='setDownloading();' style='padding: 40px 5%'>
-<table class='w-p100'>
-  <tr>
-    <td>
-      <div class='input-group'>
-        <span class='input-group-addon'><?php echo $lang->testcase->num;?></span>
-        <?php
+  <form method='post' target='hiddenwin' onsubmit='setDownloading();' style='padding: 40px 5%'>
+  <table class='w-p100'>
+    <tr>
+      <td>
+        <div class='input-group'>
+          <span class='input-group-addon'><?php echo $lang->testcase->num;?></span>
+          <?php
           echo html::input('num', '10', "class='form-control' autocomplete='off'");
-        ?>
-      </div>
-    </td>
-    <td class='w-100px'>
-      <?php echo html::select('encode', $config->charsets[$this->cookie->lang], 'utf-8', "class='form-control'");?>
-    </td>
-    <td>
-      <?php echo html::submitButton();?>
-    </td>
-  </tr>
-</table>
-</form>
+          ?>
+        </div>
+      </td>
+      <td class='w-100px'>
+        <?php echo html::select('encode', $config->charsets[$this->cookie->lang], 'utf-8', "class='form-control'");?>
+      </td>
+      <td>
+        <?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
+      </td>
+    </tr>
+  </table>
+  </form>
+</div>
 <?php include '../../common/view/footer.lite.html.php';?>
diff --git a/module/testsuite/view/import.html.php b/module/testsuite/view/import.html.php
index 5f8a96a6d4..775c6f7f16 100644
--- a/module/testsuite/view/import.html.php
+++ b/module/testsuite/view/import.html.php
@@ -1,6 +1,9 @@
 <?php include '../../common/view/header.lite.html.php';?>
-<div class='container mw-600px'>
-  <form class='form-condensed' method='post' enctype='multipart/form-data' target='hiddenwin' style="padding:30px">
+<div class='main-content'>
+  <div class='main-header'>
+    <h2><?php echo $lang->testcase->importFile;?></h2>
+  </div>
+  <form method='post' enctype='multipart/form-data' target='hiddenwin' style="padding:30px">
   <table class='table table-form'>
     <tr>
       <td align='center'>
@@ -10,7 +13,7 @@
         <?php echo html::select('encode', $config->charsets[$this->cookie->lang], 'utf-8', "class='form-control'");?>
       </td>
       <td>
-        <?php echo html::submitButton();?>
+        <?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
       </td>
     </tr>
   </table>

From da32e7d4de5885d2b71d689db8ee57aacdad9d19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <admin@lvtao.net>
Date: Wed, 16 May 2018 09:36:26 +0800
Subject: [PATCH 4/6] * Task#4125.

---
 module/testcase/view/showimport.html.php | 198 ++++++++++++-----------
 1 file changed, 100 insertions(+), 98 deletions(-)

diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php
index ae4feecb56..3ace4698ad 100644
--- a/module/testcase/view/showimport.html.php
+++ b/module/testcase/view/showimport.html.php
@@ -5,104 +5,106 @@
 <?php if(isset($suhosinInfo)):?>
 <div class='alert alert-info'><?php echo $suhosinInfo?></div>
 <?php else:?>
-<form target='hiddenwin' method='post' class='form-condensed'>
-  <table class='table table-fixed active-disabled table-custom' id='showData'>
-    <thead>
-      <tr>
-      <th class='w-50px'><?php echo $lang->lineNumber?></th>
-        <th class='w-70px'><?php echo $lang->testcase->id?></th>
-        <th><?php echo $lang->testcase->title?></th>
-        <?php if(!empty($branches)):?>
-        <th class='w-100px'><?php echo $lang->testcase->branch?></th>
-        <?php endif;?>
-        <th class='w-100px'><?php echo $lang->testcase->module?></th>
-        <th class='w-120px'><?php echo $lang->testcase->story?></th>
-        <th class='w-70px'><?php echo $lang->testcase->pri?></th>
-        <th class='w-100px'><?php echo $lang->testcase->type?></th>
-        <th><?php echo $lang->testcase->stage?></th>
-        <th class='w-80px'><?php echo $lang->testcase->keywords?></th>
-        <th><?php echo $lang->testcase->precondition?></th>
-        <th class='w-300px'>
-          <table class='w-p100 table-borderless'>
-            <tr>
-              <th><?php echo $lang->testcase->stepDesc?></th>
-              <th><?php echo $lang->testcase->stepExpect?></th>
-            </tr>
-          </table>
-        </th>
-      </tr>
-    </thead>
-    <tbody>
-      <?php
-      $insert = true;
-      $addID  = 1;
-      ?>
-      <?php foreach($caseData as $key => $case):?>
-      <?php if(empty($case->title)) continue;?>
-      <tr valign='top' align='center'>
-        <td><?php echo $key;?></td>
-        <td>
-          <?php
-          if(!empty($case->id))
-          {
-              echo $case->id . html::hidden("id[$key]", $case->id);
-              $insert = false;
-          }
-          else
-          {
-              echo "<sub class='gray' style='vertical-align:sub;'>{$lang->testcase->new}</sub>";
-          }
-          echo html::hidden("product[$key]", $productID);
-          ?>
-        </td>
-        <td><?php echo html::input("title[$key]", htmlspecialchars($case->title, ENT_QUOTES), "class='form-control'")?></td>
-        <?php if(!empty($branches)):?>
-        <td class='text-left' style='overflow:visible'><?php echo html::select("branch[$key]", $branches, (isset($case->branch) and $case->branch !== '') ? $case->branch : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->branch : $branch), "class='form-control chosen'")?></td>
-        <?php endif;?>
-        <td class='text-left' style='overflow:visible'><?php echo html::select("module[$key]", $modules, isset($case->module) ? $case->module : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->module : ''), "class='form-control chosen'")?></td>
-        <td class='text-left' style='overflow:visible'><?php echo html::select("story[$key]", $stories, isset($case->story) ? $case->story : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->story : ''), "class='form-control chosen'")?></td>
-        <td><?php echo html::select("pri[$key]", $lang->testcase->priList, isset($case->pri) ? $case->pri : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->pri : ''), "class='form-control'")?></td>
-        <td><?php echo html::select("type[$key]", $lang->testcase->typeList, $case->type, "class='form-control'")?></td>
-        <td class='text-left' style='overflow:visible'><?php echo html::select("stage[$key][]", $lang->testcase->stageList, !empty($case->stage) ? $case->stage : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->stage : ''), "multiple='multiple' class='form-control chosen'")?></td>
-        <td><?php echo html::input("keywords[$key]", isset($case->keywords) ? $case->keywords : "", "class='form-control' autocomplete='off'")?></td>
-        <td><?php echo html::textarea("precondition[$key]", isset($case->precondition) ? htmlspecialchars($case->precondition) : "", "class='form-control'")?></td>
-        <td>
-          <?php if(isset($stepData[$key]['desc'])):?>
-          <table class='w-p100 bd-0'>
-          <?php foreach($stepData[$key]['desc'] as $id => $desc):?>
-          <?php if(empty($desc['content'])) continue;?>
-            <tr class='step'>
-              <td><?php echo $id . html::hidden("stepType[$key][$id]", $desc['type'])?></td>
-              <td><?php echo html::textarea("desc[$key][$id]", htmlspecialchars($desc['content']), "class='form-control'")?></td>
-              <td><?php if($desc['type'] != 'group') echo html::textarea("expect[$key][$id]", isset($stepData[$key]['expect'][$id]['content']) ? htmlspecialchars($stepData[$key]['expect'][$id]['content']) : '', "class='form-control'")?></td>
-            </tr>
-          <?php endforeach;?>
-          </table>
+<div id="mainContent" class="main-content">
+  <form target='hiddenwin' method='post' class='form-condensed'>
+    <table class='table table-fixed active-disabled table-custom' id='showData'>
+      <thead>
+        <tr>
+        <th class='w-50px'><?php echo $lang->lineNumber?></th>
+          <th class='w-70px'><?php echo $lang->testcase->id?></th>
+          <th><?php echo $lang->testcase->title?></th>
+          <?php if(!empty($branches)):?>
+          <th class='w-100px'><?php echo $lang->testcase->branch?></th>
           <?php endif;?>
-        </td>
-      </tr>
-      <?php endforeach;?>
-    </tbody>
-    <tfoot>
-      <tr>
-        <td colspan='<?php echo !empty($branches) ? 12 : 11;?>' class='text-center'>
-          <?php
-          if(!$insert)
-          {
-            include '../../common/view/noticeimport.html.php';
-            echo "<button type='button' data-toggle='myModal' class='btn btn-primary'>{$lang->save}</button>";
-          }
-          else
-          {
-              echo html::submitButton();
-          }
-          echo ' &nbsp; ' . html::backButton()
-          ?>
-        </td>
-      </tr>
-    </tfoot>
-  </table>
-</form>
+          <th class='w-100px'><?php echo $lang->testcase->module?></th>
+          <th class='w-120px'><?php echo $lang->testcase->story?></th>
+          <th class='w-70px'><?php echo $lang->testcase->pri?></th>
+          <th class='w-100px'><?php echo $lang->testcase->type?></th>
+          <th><?php echo $lang->testcase->stage?></th>
+          <th class='w-80px'><?php echo $lang->testcase->keywords?></th>
+          <th><?php echo $lang->testcase->precondition?></th>
+          <th class='w-300px'>
+            <table class='w-p100 table-borderless'>
+              <tr>
+                <th><?php echo $lang->testcase->stepDesc?></th>
+                <th><?php echo $lang->testcase->stepExpect?></th>
+              </tr>
+            </table>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <?php
+        $insert = true;
+        $addID  = 1;
+        ?>
+        <?php foreach($caseData as $key => $case):?>
+        <?php if(empty($case->title)) continue;?>
+        <tr valign='top' align='center'>
+          <td><?php echo $key;?></td>
+          <td>
+            <?php
+            if(!empty($case->id))
+            {
+                echo $case->id . html::hidden("id[$key]", $case->id);
+                $insert = false;
+            }
+            else
+            {
+                echo "<sub class='gray' style='vertical-align:sub;'>{$lang->testcase->new}</sub>";
+            }
+            echo html::hidden("product[$key]", $productID);
+            ?>
+          </td>
+          <td><?php echo html::input("title[$key]", htmlspecialchars($case->title, ENT_QUOTES), "class='form-control'")?></td>
+          <?php if(!empty($branches)):?>
+          <td class='text-left' style='overflow:visible'><?php echo html::select("branch[$key]", $branches, (isset($case->branch) and $case->branch !== '') ? $case->branch : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->branch : $branch), "class='form-control chosen'")?></td>
+          <?php endif;?>
+          <td class='text-left' style='overflow:visible'><?php echo html::select("module[$key]", $modules, isset($case->module) ? $case->module : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->module : ''), "class='form-control chosen'")?></td>
+          <td class='text-left' style='overflow:visible'><?php echo html::select("story[$key]", $stories, isset($case->story) ? $case->story : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->story : ''), "class='form-control chosen'")?></td>
+          <td><?php echo html::select("pri[$key]", $lang->testcase->priList, isset($case->pri) ? $case->pri : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->pri : ''), "class='form-control'")?></td>
+          <td><?php echo html::select("type[$key]", $lang->testcase->typeList, $case->type, "class='form-control'")?></td>
+          <td class='text-left' style='overflow:visible'><?php echo html::select("stage[$key][]", $lang->testcase->stageList, !empty($case->stage) ? $case->stage : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->stage : ''), "multiple='multiple' class='form-control chosen'")?></td>
+          <td><?php echo html::input("keywords[$key]", isset($case->keywords) ? $case->keywords : "", "class='form-control' autocomplete='off'")?></td>
+          <td><?php echo html::textarea("precondition[$key]", isset($case->precondition) ? htmlspecialchars($case->precondition) : "", "class='form-control'")?></td>
+          <td>
+            <?php if(isset($stepData[$key]['desc'])):?>
+            <table class='w-p100 bd-0'>
+            <?php foreach($stepData[$key]['desc'] as $id => $desc):?>
+            <?php if(empty($desc['content'])) continue;?>
+              <tr class='step'>
+                <td><?php echo $id . html::hidden("stepType[$key][$id]", $desc['type'])?></td>
+                <td><?php echo html::textarea("desc[$key][$id]", htmlspecialchars($desc['content']), "class='form-control'")?></td>
+                <td><?php if($desc['type'] != 'group') echo html::textarea("expect[$key][$id]", isset($stepData[$key]['expect'][$id]['content']) ? htmlspecialchars($stepData[$key]['expect'][$id]['content']) : '', "class='form-control'")?></td>
+              </tr>
+            <?php endforeach;?>
+            </table>
+            <?php endif;?>
+          </td>
+        </tr>
+        <?php endforeach;?>
+      </tbody>
+      <tfoot>
+        <tr>
+          <td colspan='<?php echo !empty($branches) ? 12 : 11;?>' class='text-center'>
+            <?php
+            if(!$insert)
+            {
+              include '../../common/view/noticeimport.html.php';
+              echo "<button type='button' data-toggle='myModal' class='btn btn-primary btn-wide'>{$lang->save}</button>";
+            }
+            else
+            {
+                echo html::submitButton('', '', 'btn btn-primary btn-wide');
+            }
+            echo ' &nbsp; ' . html::backButton('', '', 'btn btn-wide')
+            ?>
+          </td>
+        </tr>
+      </tfoot>
+    </table>
+  </form>
+</div>
 <?php endif;?>
 <script>
 $(function(){affix('#showData thead')})
@@ -120,7 +122,7 @@ function affix(obj)
             $('.active-disabled ' + obj + ' th').each(function(i){$('#headerClone ' + obj + ' th').eq(i).width($(this).width())});
             first = false;
         }
-        else if(scroH<fixH)    
+        else if(scroH<fixH)
         {
             $("#headerClone").remove();
             first = true;

From 1273cc071529bb8d1c38857eae640596b08e965e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <admin@lvtao.net>
Date: Wed, 16 May 2018 09:51:29 +0800
Subject: [PATCH 5/6] * Task#4125.

---
 module/testcase/view/showimport.html.php  |   2 +-
 module/testsuite/view/showimport.html.php | 158 +++++++++++-----------
 2 files changed, 81 insertions(+), 79 deletions(-)

diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php
index 3ace4698ad..568bc45645 100644
--- a/module/testcase/view/showimport.html.php
+++ b/module/testcase/view/showimport.html.php
@@ -6,7 +6,7 @@
 <div class='alert alert-info'><?php echo $suhosinInfo?></div>
 <?php else:?>
 <div id="mainContent" class="main-content">
-  <form target='hiddenwin' method='post' class='form-condensed'>
+  <form target='hiddenwin' method='post'>
     <table class='table table-fixed active-disabled table-custom' id='showData'>
       <thead>
         <tr>
diff --git a/module/testsuite/view/showimport.html.php b/module/testsuite/view/showimport.html.php
index 19a8e4abfd..5e4822ce56 100644
--- a/module/testsuite/view/showimport.html.php
+++ b/module/testsuite/view/showimport.html.php
@@ -5,92 +5,94 @@
 <?php if(isset($suhosinInfo)):?>
 <div class='alert alert-info'><?php echo $suhosinInfo?></div>
 <?php else:?>
-<form target='hiddenwin' method='post' class='form-condensed'>
-<table class='table table-fixed active-disabled table-custom'>
-  <thead>
-    <tr>
-      <th class='w-70px'><?php echo $lang->testcase->id?></th>
-      <th><?php echo $lang->testcase->title?></th>
-      <th class='w-100px'><?php echo $lang->testcase->module?></th>
-      <th class='w-70px'><?php echo $lang->testcase->pri?></th>
-      <th class='w-100px'><?php echo $lang->testcase->type?></th>
-      <th><?php echo $lang->testcase->stage?></th>
-      <th class='w-80px'><?php echo $lang->testcase->keywords?></th>
-      <th><?php echo $lang->testcase->precondition?></th>
-      <th class='w-300px'>
-        <table class='w-p100 table-borderless'>
-          <tr>
-            <th><?php echo $lang->testcase->stepDesc?></th>
-            <th><?php echo $lang->testcase->stepExpect?></th>
-          </tr>
-        </table>
-      </th>
-    </tr>
-  </thead>
-  <tbody>
-  <?php $insert = true;?>
-  <?php foreach($caseData as $key => $case):?>
-  <?php if(empty($case->title)) continue;?>
-  <?php if(!empty($case->id) and !isset($cases[$case->id])) $case->id = 0;?>
-  <tr valign='top' align='center'>
-    <td>
-      <?php
-      if(!empty($case->id))
-      {
-          echo $case->id . html::hidden("id[$key]", $case->id);
-          $insert = false;
-      }
-      else
-      {
-          echo $key . " <sub class='gray' style='vertical-align:sub;'>{$lang->testcase->new}</sub>";
-      }
-      echo html::hidden("lib[$key]", $libID);
-      ?>
-    </td>
-    <td><?php echo html::input("title[$key]", $case->title, "class='form-control' style='margin-top:2px' autocomplete='off'")?></td>
-    <td class='text-left' style='overflow:visible'><?php echo html::select("module[$key]", $modules, isset($case->module) ? $case->module : (!empty($case->id) ? $cases[$case->id]->module : ''), "class='form-control chosen'")?></td>
-    <td><?php echo html::select("pri[$key]", $lang->testcase->priList, isset($case->pri) ? $case->pri : (!empty($case->id) ? $cases[$case->id]->pri : ''), "class='form-control'")?></td>
-    <td><?php echo html::select("type[$key]", $lang->testcase->typeList, isset($case->type) ? $case->type : (!empty($case->id) ? $cases[$case->id]->type : ''), "class='form-control'")?></td>
-    <td class='text-left' style='overflow:visible'><?php echo html::select("stage[$key][]", $lang->testcase->stageList, !empty($case->stage) ? $case->stage : (!empty($case->id) ? $cases[$case->id]->stage : ''), "multiple='multiple' class='form-control chosen'")?></td>
-    <td><?php echo html::input("keywords[$key]", isset($case->keywords) ? $case->keywords : "", "class='form-control' autocomplete='off'")?></td>
-    <td><?php echo html::textarea("precondition[$key]", isset($case->precondition) ? htmlspecialchars($case->precondition) : "", "class='form-control'")?></td>
-    <td>
-      <?php if(isset($stepData[$key]['desc'])):?>
-      <table class='w-p100 bd-0'>
-      <?php foreach($stepData[$key]['desc'] as $id => $desc):?>
-      <?php if(empty($desc['content'])) continue;?>
-        <tr class='step'>
-          <td><?php echo $id . html::hidden("stepType[$key][$id]", $desc['type'])?></td>
-          <td><?php echo html::textarea("desc[$key][$id]", htmlspecialchars($desc['content']), "class='form-control'")?></td>
-          <td><?php if($desc['type'] != 'group') echo html::textarea("expect[$key][$id]", isset($stepData[$key]['expect'][$id]['content']) ? htmlspecialchars($stepData[$key]['expect'][$id]['content']) : '', "class='form-control'")?></td>
-        </tr>
-      <?php endforeach;?>
-      </table>
-      <?php endif;?>
-    </td>
-  </tr>
-  <?php endforeach;?>
-  </tbody>
-  <tfoot>
-    <tr>
-      <td colspan='9' class='text-center'>
+<div id="mainContent" class="main-content">
+  <form target='hiddenwin' method='post'>
+  <table class='table table-fixed active-disabled table-custom'>
+    <thead>
+      <tr>
+        <th class='w-70px'><?php echo $lang->testcase->id?></th>
+        <th><?php echo $lang->testcase->title?></th>
+        <th class='w-100px'><?php echo $lang->testcase->module?></th>
+        <th class='w-70px'><?php echo $lang->testcase->pri?></th>
+        <th class='w-100px'><?php echo $lang->testcase->type?></th>
+        <th><?php echo $lang->testcase->stage?></th>
+        <th class='w-80px'><?php echo $lang->testcase->keywords?></th>
+        <th><?php echo $lang->testcase->precondition?></th>
+        <th class='w-300px'>
+          <table class='w-p100 table-borderless'>
+            <tr>
+              <th><?php echo $lang->testcase->stepDesc?></th>
+              <th><?php echo $lang->testcase->stepExpect?></th>
+            </tr>
+          </table>
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+    <?php $insert = true;?>
+    <?php foreach($caseData as $key => $case):?>
+    <?php if(empty($case->title)) continue;?>
+    <?php if(!empty($case->id) and !isset($cases[$case->id])) $case->id = 0;?>
+    <tr valign='top' align='center'>
+      <td>
         <?php
-        if(!$insert)
+        if(!empty($case->id))
         {
-          include '../../common/view/noticeimport.html.php';
-          echo "<button type='button' data-toggle='myModal' class='btn btn-primary'>{$lang->save}</button>";
+            echo $case->id . html::hidden("id[$key]", $case->id);
+            $insert = false;
         }
         else
         {
-            echo html::submitButton();
+            echo $key . " <sub class='gray' style='vertical-align:sub;'>{$lang->testcase->new}</sub>";
         }
-        echo ' &nbsp; ' . html::backButton()
+        echo html::hidden("lib[$key]", $libID);
         ?>
       </td>
+      <td><?php echo html::input("title[$key]", $case->title, "class='form-control' style='margin-top:2px' autocomplete='off'")?></td>
+      <td class='text-left' style='overflow:visible'><?php echo html::select("module[$key]", $modules, isset($case->module) ? $case->module : (!empty($case->id) ? $cases[$case->id]->module : ''), "class='form-control chosen'")?></td>
+      <td><?php echo html::select("pri[$key]", $lang->testcase->priList, isset($case->pri) ? $case->pri : (!empty($case->id) ? $cases[$case->id]->pri : ''), "class='form-control'")?></td>
+      <td><?php echo html::select("type[$key]", $lang->testcase->typeList, isset($case->type) ? $case->type : (!empty($case->id) ? $cases[$case->id]->type : ''), "class='form-control'")?></td>
+      <td class='text-left' style='overflow:visible'><?php echo html::select("stage[$key][]", $lang->testcase->stageList, !empty($case->stage) ? $case->stage : (!empty($case->id) ? $cases[$case->id]->stage : ''), "multiple='multiple' class='form-control chosen'")?></td>
+      <td><?php echo html::input("keywords[$key]", isset($case->keywords) ? $case->keywords : "", "class='form-control' autocomplete='off'")?></td>
+      <td><?php echo html::textarea("precondition[$key]", isset($case->precondition) ? htmlspecialchars($case->precondition) : "", "class='form-control'")?></td>
+      <td>
+        <?php if(isset($stepData[$key]['desc'])):?>
+        <table class='w-p100 bd-0'>
+        <?php foreach($stepData[$key]['desc'] as $id => $desc):?>
+        <?php if(empty($desc['content'])) continue;?>
+          <tr class='step'>
+            <td><?php echo $id . html::hidden("stepType[$key][$id]", $desc['type'])?></td>
+            <td><?php echo html::textarea("desc[$key][$id]", htmlspecialchars($desc['content']), "class='form-control'")?></td>
+            <td><?php if($desc['type'] != 'group') echo html::textarea("expect[$key][$id]", isset($stepData[$key]['expect'][$id]['content']) ? htmlspecialchars($stepData[$key]['expect'][$id]['content']) : '', "class='form-control'")?></td>
+          </tr>
+        <?php endforeach;?>
+        </table>
+        <?php endif;?>
+      </td>
     </tr>
-  </tfoot>
-</table>
-</form>
+    <?php endforeach;?>
+    </tbody>
+    <tfoot>
+      <tr>
+        <td colspan='9' class='text-center'>
+          <?php
+          if(!$insert)
+          {
+            include '../../common/view/noticeimport.html.php';
+            echo "<button type='button' data-toggle='myModal' class='btn btn-primary btn-wide'>{$lang->save}</button>";
+          }
+          else
+          {
+              echo html::submitButton('', '', 'btn btn-primary btn-wide');
+          }
+          echo ' &nbsp; ' . html::backButton('', '', 'btn btn-wide')
+          ?>
+        </td>
+      </tr>
+    </tfoot>
+  </table>
+  </form>
+</div>
 <?php endif;?>
 <script>
 $(function(){affix('thead')})
@@ -108,7 +110,7 @@ function affix(obj)
             $('.active-disabled ' + obj + ' th').each(function(i){$('#headerClone ' + obj + ' th').eq(i).width($(this).width())});
             first = false;
         }
-        else if(scroH<fixH)    
+        else if(scroH<fixH)
         {
             $("#headerClone").remove();
             first = true;

From ab1f2c3e258dc7bc55fc97838bc80d286cddb580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <admin@lvtao.net>
Date: Wed, 16 May 2018 10:01:29 +0800
Subject: [PATCH 6/6] * Task#410.

---
 module/testcase/view/batchedit.html.php | 232 ++++++++++++------------
 1 file changed, 119 insertions(+), 113 deletions(-)

diff --git a/module/testcase/view/batchedit.html.php b/module/testcase/view/batchedit.html.php
index 9b71a2d80b..95ac73f3a8 100644
--- a/module/testcase/view/batchedit.html.php
+++ b/module/testcase/view/batchedit.html.php
@@ -12,122 +12,128 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php js::set('dittoNotice', $this->lang->testcase->dittoNotice);?>
-<div id='titlebar'>
-  <div class='heading'>
-    <span class='prefix'><?php echo html::icon($lang->icons['testcase']);?></span>
-    <strong><small class='text-muted'><?php echo html::icon($lang->icons['batchEdit']);?></small> <?php echo $lang->testcase->common . $lang->colon . $lang->testcase->batchEdit;?></strong>
-    <div class='actions'>
-      <button type="button" class="btn btn-default" data-toggle="customModal"><i class='icon icon-cog'></i> </button>
+<div id="mainContent" class="main-content">
+  <div class="main-header">
+    <h2><?php echo $lang->testcase->common . $lang->colon . $lang->testcase->batchEdit;?></h2>
+    <div class="pull-right btn-toolbar">
+      <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=testcase&section=custom&key=batchEditFields')?>
+      <?php include '../../common/view/customfield.html.php';?>
     </div>
   </div>
-</div>
-<?php if(isset($suhosinInfo)):?>
-<div class='alert alert-info'><?php echo $suhosinInfo;?></div>
-<?php else:?>
-<?php
-$visibleFields  = array();
-$requiredFields = array();
-foreach(explode(',', $showFields) as $field)
-{
-    if($field)$visibleFields[$field] = '';
-}
-foreach(explode(',', $this->config->testcase->edit->requiredFields) as $field)
-{
-    if($field)
-    {
-        $requiredFields[$field] = '';
-        if(strpos(",{$config->testcase->customBatchEditFields},", ",{$field},") !== false) $visibleFields[$field] = '';
-    }
-}
-?>
-<form class='form-condensed' method='post' target='hiddenwin' action="<?php echo inLink('batchEdit');?>">
-  <table class='table table-form table-fixed'>
-    <thead>
-      <tr>
-        <th class='w-50px'><?php  echo $lang->idAB;?></th> 
-        <th class='w-70px<?php echo zget($visibleFields, 'pri', ' hidden')?>'>
-          <?php echo $lang->priAB;?>
-          <?php if(isset($requiredFields['pri'])) echo " <span class='required'></span>";?>
-        </th>
-        <th class='w-100px<?php echo zget($visibleFields, 'status', ' hidden')?>'>
-          <?php echo $lang->statusAB;?>
-          <?php if(isset($requiredFields['status'])) echo " <span class='required'></span>";?>
-        </th>
-        <?php if($branchProduct):?>
-        <th class='w-150px<?php echo zget($visibleFields, 'branch', ' hidden')?>'><?php echo $lang->testcase->branch;?></th>
-        <?php endif;?>
-        <th class='w-150px<?php echo zget($visibleFields, 'module', ' hidden')?>'><?php echo $lang->testcase->module;?></th>
-        <th class='w-150px<?php echo zget($visibleFields, 'story', ' hidden')?>'>
-          <?php echo $lang->testcase->story;?>
-          <?php if(isset($requiredFields['story'])) echo " <span class='required'></span>";?>
-        </th>
-        <th><?php echo $lang->testcase->title;?> <span class='required'></span></th>
-        <th class='w-120px'><?php echo $lang->testcase->type;?> <span class='required'></span></th>
-        <th class='<?php echo zget($visibleFields, 'precondition', 'hidden')?>'>
-          <?php echo $lang->testcase->precondition;?>
-          <?php if(isset($requiredFields['precondition'])) echo " <span class='required'></span>";?>
-        </th>
-        <th class='w-100px<?php echo zget($visibleFields, 'keywords', ' hidden')?>'>
-          <?php echo $lang->testcase->keywords;?>
-          <?php if(isset($requiredFields['keywords'])) echo " <span class='required'></span>";?>
-        </th>
-        <th class='w-300px<?php echo zget($visibleFields, 'stage', ' hidden')?>'>
-          <?php echo $lang->testcase->stage;?>
-          <?php if(isset($requiredFields['stage'])) echo " <span class='required'></span>";?>
-        </th>
-      </tr>
-    </thead>
-    <tbody>
-      <?php foreach($caseIDList as $caseID):?>
-      <?php
-      if(!isset($cases[$caseID])) continue;
-      if(!$productID and $branchProduct)
+  <?php if(isset($suhosinInfo)):?>
+  <div class='alert alert-info'><?php echo $suhosinInfo;?></div>
+  <?php else:?>
+  <?php
+  $visibleFields  = array();
+  $requiredFields = array();
+  foreach(explode(',', $showFields) as $field)
+  {
+      if($field)$visibleFields[$field] = '';
+  }
+  foreach(explode(',', $this->config->testcase->edit->requiredFields) as $field)
+  {
+      if($field)
       {
-          $product = $this->product->getByID($cases[$caseID]->product);
-
-          $branches = $product->type == 'normal' ? array('' => '') : $this->loadModel('branch')->getPairs($product->id);
-          if($product->type != 'normal')
-          {
-              foreach($branches as $branchID => $branchName) $branches[$branchID] = '/' . $product->name . '/' . $branchName;
-              $branches = array('ditto' => $this->lang->story->ditto) + $branches;
-          }
-
-          $modules = $this->tree->getOptionMenu($cases[$caseID]->product, $viewType = 'case', 0, $cases[$caseID]->branch);
-          $modules = array('ditto' => $this->lang->story->ditto) + $modules;
+          $requiredFields[$field] = '';
+          if(strpos(",{$config->testcase->customBatchEditFields},", ",{$field},") !== false) $visibleFields[$field] = '';
       }
-      ?>
-      <tr class='text-center'>
-        <td><?php echo $caseID . html::hidden("caseIDList[$caseID]", $caseID);?></td>
-        <td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>'>   <?php echo html::select("pris[$caseID]",     $priList, $cases[$caseID]->pri, 'class=form-control');?></td>
-        <td class='<?php echo zget($visibleFields, 'status', 'hidden')?>'><?php echo html::select("statuses[$caseID]", (array)$lang->testcase->statusList, $cases[$caseID]->status, 'class=form-control');?></td>
-        <?php if($branchProduct):?>
-        <td class='text-left<?php echo zget($visibleFields, 'branch', ' hidden')?>' style='overflow:visible'>
-          <?php $branchProductID = $productID ? $productID : $product->id;?>
-          <?php $disabled        = (isset($product) and $product->type == 'normal') ? "disabled='disabled'" : '';?>
-          <?php echo html::select("branches[$caseID]",  $branches,   $cases[$caseID]->branch, "class='form-control chosen' onchange='loadBranches($branchProductID, this.value, $caseID)', $disabled");?>
-        </td>
-        <?php endif;?>
-        <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("modules[$caseID]",  $modules,   $cases[$caseID]->module, "class='form-control chosen'");?></td>
-        <td class='text-left<?php echo zget($visibleFields, 'story', ' hidden')?>' style='overflow:visible'><?php echo html::select("stories[$caseID]",  $stories,   $cases[$caseID]->story, "class='form-control chosen'");?></td>
-        <td style='overflow:visible' title='<?php echo $cases[$caseID]->title?>'>
-          <div class='input-group'>
-          <?php echo html::hidden("colors[$caseID]", $cases[$caseID]->color, "data-provide='colorpicker' data-wrapper='input-group-btn fix-border-right' data-pull-menu-right='false' data-btn-tip='{$lang->testcase->colorTag}' data-update-text='#titles\\[{$caseID}\\]'");?>
-          <?php echo html::input("titles[$caseID]", $cases[$caseID]->title, "class='form-control' autocomplete='off'"); echo "<span class='star'>*</span>";?>
-          </div>
-        </td>
-        <td><?php echo html::select("types[$caseID]", $typeList, $cases[$caseID]->type, 'class=form-control');?></td>
-        <td class='<?php echo zget($visibleFields, 'precondition', 'hidden')?>'><?php echo html::textarea("precondition[$caseID]", $cases[$caseID]->precondition, "rows='1' class='form-control autosize'")?></td>
-        <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'>    <?php echo html::input("keywords[$caseID]", $cases[$caseID]->keywords, "class='form-control' autocomplete='off'");?></td>
-        <td class='text-left<?php echo zget($visibleFields, 'stage', ' hidden')?>' style='overflow:visible'><?php echo html::select("stages[$caseID][]", $lang->testcase->stageList, $cases[$caseID]->stage, "class='form-control chosen' multiple data-placeholder='{$lang->testcase->stage}'");?></td>
-      </tr>
-      <?php endforeach;?>
-    </tbody>
-    <tfoot>
-      <tr><td colspan='<?php echo $branchProduct ? (count($visibleFields) + 3) : (count($visibleFields) + 2);?>' class='text-center'><?php echo html::submitButton();?></td></tr>
-    </tfoot>
-  </table>
-</form>
+  }
+  ?>
+  <form method='post' target='hiddenwin' action="<?php echo inLink('batchEdit');?>">
+    <table class='table table-form table-fixed'>
+      <thead>
+        <tr>
+          <th class='w-50px'><?php  echo $lang->idAB;?></th>
+          <th class='w-70px<?php echo zget($visibleFields, 'pri', ' hidden')?>'>
+            <?php echo $lang->priAB;?>
+            <?php if(isset($requiredFields['pri'])) echo " <span class='required'></span>";?>
+          </th>
+          <th class='w-100px<?php echo zget($visibleFields, 'status', ' hidden')?>'>
+            <?php echo $lang->statusAB;?>
+            <?php if(isset($requiredFields['status'])) echo " <span class='required'></span>";?>
+          </th>
+          <?php if($branchProduct):?>
+          <th class='w-150px<?php echo zget($visibleFields, 'branch', ' hidden')?>'><?php echo $lang->testcase->branch;?></th>
+          <?php endif;?>
+          <th class='w-150px<?php echo zget($visibleFields, 'module', ' hidden')?>'><?php echo $lang->testcase->module;?></th>
+          <th class='w-150px<?php echo zget($visibleFields, 'story', ' hidden')?>'>
+            <?php echo $lang->testcase->story;?>
+            <?php if(isset($requiredFields['story'])) echo " <span class='required'></span>";?>
+          </th>
+          <th><?php echo $lang->testcase->title;?> <span class='required'></span></th>
+          <th class='w-120px'><?php echo $lang->testcase->type;?> <span class='required'></span></th>
+          <th class='<?php echo zget($visibleFields, 'precondition', 'hidden')?>'>
+            <?php echo $lang->testcase->precondition;?>
+            <?php if(isset($requiredFields['precondition'])) echo " <span class='required'></span>";?>
+          </th>
+          <th class='w-100px<?php echo zget($visibleFields, 'keywords', ' hidden')?>'>
+            <?php echo $lang->testcase->keywords;?>
+            <?php if(isset($requiredFields['keywords'])) echo " <span class='required'></span>";?>
+          </th>
+          <th class='w-300px<?php echo zget($visibleFields, 'stage', ' hidden')?>'>
+            <?php echo $lang->testcase->stage;?>
+            <?php if(isset($requiredFields['stage'])) echo " <span class='required'></span>";?>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <?php foreach($caseIDList as $caseID):?>
+        <?php
+        if(!isset($cases[$caseID])) continue;
+        if(!$productID and $branchProduct)
+        {
+            $product = $this->product->getByID($cases[$caseID]->product);
+
+            $branches = $product->type == 'normal' ? array('' => '') : $this->loadModel('branch')->getPairs($product->id);
+            if($product->type != 'normal')
+            {
+                foreach($branches as $branchID => $branchName) $branches[$branchID] = '/' . $product->name . '/' . $branchName;
+                $branches = array('ditto' => $this->lang->story->ditto) + $branches;
+            }
+
+            $modules = $this->tree->getOptionMenu($cases[$caseID]->product, $viewType = 'case', 0, $cases[$caseID]->branch);
+            $modules = array('ditto' => $this->lang->story->ditto) + $modules;
+        }
+        ?>
+        <tr class='text-center'>
+          <td><?php echo $caseID . html::hidden("caseIDList[$caseID]", $caseID);?></td>
+          <td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>'>   <?php echo html::select("pris[$caseID]",     $priList, $cases[$caseID]->pri, 'class=form-control');?></td>
+          <td class='<?php echo zget($visibleFields, 'status', 'hidden')?>'><?php echo html::select("statuses[$caseID]", (array)$lang->testcase->statusList, $cases[$caseID]->status, 'class=form-control');?></td>
+          <?php if($branchProduct):?>
+          <td class='text-left<?php echo zget($visibleFields, 'branch', ' hidden')?>' style='overflow:visible'>
+            <?php $branchProductID = $productID ? $productID : $product->id;?>
+            <?php $disabled        = (isset($product) and $product->type == 'normal') ? "disabled='disabled'" : '';?>
+            <?php echo html::select("branches[$caseID]",  $branches,   $cases[$caseID]->branch, "class='form-control chosen' onchange='loadBranches($branchProductID, this.value, $caseID)', $disabled");?>
+          </td>
+          <?php endif;?>
+          <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("modules[$caseID]",  $modules,   $cases[$caseID]->module, "class='form-control chosen'");?></td>
+          <td class='text-left<?php echo zget($visibleFields, 'story', ' hidden')?>' style='overflow:visible'><?php echo html::select("stories[$caseID]",  $stories,   $cases[$caseID]->story, "class='form-control chosen'");?></td>
+          <td style='overflow:visible' title='<?php echo $cases[$caseID]->title?>'>
+            <div class='input-group'>
+              <div class="input-control has-icon-right">
+                <?php echo html::input("title[$caseID]", $cases[$caseID]->title, "class='form-control' autocomplete='off'");?>
+                <div class="colorpicker">
+                  <button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
+                  <ul class="dropdown-menu clearfix">
+                    <li class="heading"><?php echo $lang->testcase->colorTag;?><i class="icon icon-close"></i></li>
+                  </ul>
+                  <?php echo html::hidden("color[$caseID]", $cases[$caseID]->color, "data-provide='colorpicker' data-icon='color' data-wrapper='input-control-icon-right'  data-update-color='#title\\[$caseID\\]'");?>
+                </div>
+              </div>
+            </div>
+          </td>
+          <td><?php echo html::select("types[$caseID]", $typeList, $cases[$caseID]->type, 'class=form-control');?></td>
+          <td class='<?php echo zget($visibleFields, 'precondition', 'hidden')?>'><?php echo html::textarea("precondition[$caseID]", $cases[$caseID]->precondition, "rows='1' class='form-control autosize'")?></td>
+          <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'>    <?php echo html::input("keywords[$caseID]", $cases[$caseID]->keywords, "class='form-control' autocomplete='off'");?></td>
+          <td class='text-left<?php echo zget($visibleFields, 'stage', ' hidden')?>' style='overflow:visible'><?php echo html::select("stages[$caseID][]", $lang->testcase->stageList, $cases[$caseID]->stage, "class='form-control chosen' multiple data-placeholder='{$lang->testcase->stage}'");?></td>
+        </tr>
+        <?php endforeach;?>
+      </tbody>
+      <tfoot>
+        <tr><td colspan='<?php echo $branchProduct ? (count($visibleFields) + 3) : (count($visibleFields) + 2);?>' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td></tr>
+      </tfoot>
+    </table>
+  </form>
 <?php endif;?>
-<?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=testcase&section=custom&key=batchEditFields')?>
-<?php include '../../common/view/customfield.html.php';?>
+</div>
 <?php include '../../common/view/footer.html.php';?>