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] * 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;