From cb5e1a205aa40903bbf7d53e67e97c8b05cabbfa Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 11 May 2018 16:35:19 +0800
Subject: [PATCH]  * finish task #4090.

---
 module/mail/view/ztcloud.html.php           |  16 +--
 module/testcase/view/importfromlib.html.php | 118 +++++++++++---------
 2 files changed, 71 insertions(+), 63 deletions(-)

diff --git a/module/mail/view/ztcloud.html.php b/module/mail/view/ztcloud.html.php
index aa31ca4b2e..e5b894464d 100644
--- a/module/mail/view/ztcloud.html.php
+++ b/module/mail/view/ztcloud.html.php
@@ -13,7 +13,7 @@
 <?php include $this->app->getModuleRoot() . 'message/view/header.html.php';?>
 <div id='mainContent' class='main-content'>
   <div class='center-block mw-800px'>
-  <?php if($step == 'license'):?>
+    <?php if($step == 'license'):?>
     <div class='main-header'>
       <h2><?php echo $lang->mail->license;?></h2>
     </div>
@@ -24,7 +24,7 @@
         <?php echo html::a(inlink('index'), $lang->mail->disagree, '', "class='btn'");?>
       </p>
     </div>
-  <?php else:?>
+    <?php else:?>
     <div class='main-header'>
       <h2>
         <?php echo $lang->mail->common;?>
@@ -34,7 +34,7 @@
     <form method='post' target='hiddenwin' id='dataform'>
       <table class='table table-form'>
         <tr>
-          <th class='rowhead w-120px'><?php echo $lang->mail->turnon; ?></th>
+          <th class='w-80px'><?php echo $lang->mail->turnon; ?></th>
           <td class='w-250px'><?php echo html::radio('turnon', $lang->mail->turnonList, isset($mailConfig->turnon) ? $mailConfig->turnon : 1);?></td>
         </tr>
         <?php if(!empty($config->global->cron)):?>
@@ -50,17 +50,17 @@
         <tr>
           <th><?php echo $lang->mail->fromAddress; ?></th>
           <td><?php echo html::input('fromAddress', $mailConfig->fromAddress, "class='form-control' autocomplete='off'");?></td>
-          <td colspan='2'><?php echo $lang->mail->addressWhiteList?></td>
+          <td><?php echo $lang->mail->addressWhiteList?></td>
         </tr>
         <tr>
           <th><?php echo $lang->mail->fromName; ?></th>
-          <td colspan='3'>
-            <div class='required required-wrapper'></div>
+          <td>
+            <div class='required'></div>
             <?php echo html::input('fromName', $mailConfig->fromName, "class='form-control' autocomplete='off'");?>
           </td>
         </tr>
         <tr>
-          <td colspan='5' class='text-center'>
+          <td colspan='3' class='text-center'>
             <?php
             echo html::submitButton('', '', 'btn btn-primary btn-wide');
             if($this->config->mail->turnon and $mailExist) echo html::a(inlink('test'), $lang->mail->test, '', "class='btn btn-wide'");
@@ -71,7 +71,7 @@
         </tr>
       </table>
     </form>
-  <?php endif;?>
+    <?php endif;?>
   </div>
 </div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/testcase/view/importfromlib.html.php b/module/testcase/view/importfromlib.html.php
index 6203829c94..ea8c66fee2 100644
--- a/module/testcase/view/importfromlib.html.php
+++ b/module/testcase/view/importfromlib.html.php
@@ -11,65 +11,73 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<div id='titlebar'>
-  <div class='heading'>
-    <div class='input-group pull-left' style='font-weight:normal;'>
-      <span class='input-group-addon'><strong style='font-size:15px'><?php echo $lang->testcase->selectLib;?></strong></span>
+<div id='mainMenu' class='clearfix'>
+  <div class='btn-toolbar pull-left'>
+    <div class='input-group w-150px'>
+      <span class='input-group-addon'><?php echo $lang->testcase->selectLib;?></span>
       <?php echo html::select('fromlib', $libraries, $libID, "onchange='reload(this.value)' class='form-control chosen'");?>
     </div>
   </div>
 </div>
-<div id='querybox' class='show'></div>
-<form class='form-condensed' method='post' target='hiddenwin' id='importFromLib'>
-  <table class='table tablesorter table-fixed table-selectable'>
-    <thead>
-    <?php $vars = "productID=$productID&branch=$branch&libID=$libID&orderBy=%s&browseType=$browseType&queryID=$queryID&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";?>
-    <tr class='colhead'>
-      <th class='w-id'>   <?php common::printOrderLink('id',  $orderBy, $vars, $lang->idAB);?></th>
-      <?php if($branches):?>
-      <th class='w-100px'><?php echo $lang->testcase->branch ?></th>
-      <?php endif;?>
-      <th class='w-pri'>  <?php common::printOrderLink('pri',   $orderBy, $vars, $lang->priAB);?></th>
-      <th>                <?php common::printOrderLink('title', $orderBy, $vars, $lang->testcase->title);?></th>
-      <th class='w-200px'><?php echo $lang->testcase->fromModule ?></th>
-      <th class='w-200px'><?php echo $lang->testcase->module ?></th>
-      <th class='w-100px'><?php common::printOrderLink('type',  $orderBy, $vars, $lang->testcase->type)?></th>
-    </tr>
-    </thead>
-    <tbody>
-    <?php foreach($cases as $case):?>
-    <tr class='text-center'>
-      <td class='cell-id'>
-        <input type='checkbox' name='caseIdList[<?php echo $case->id?>]' value='<?php echo $case->id;?>' />
-        <?php if(!common::printLink('testcase', 'view', "caseID=$case->id", sprintf('%03d', $case->id))) printf('%03d', $case->id);?>
-      </td>
-      <?php if($branches):?>
-      <td><?php echo html::select("branch[{$case->id}]", $branches, $branch, "class='form-control'")?></td>
-      <?php endif;?>
-      <td><span class='<?php echo 'pri' . zget($lang->testcase->priList, $case->pri, $case->pri)?>'><?php echo $case->pri == '0' ? '' : zget($lang->testcase->priList, $case->pri, $case->pri);?></span></td>
-      <td class='text-left nobr'><?php if(!common::printLink('testcase', 'view', "caseID=$case->id", $case->title)) echo $case->title;?></td>
-      <?php $libModule = zget($libModules, $case->module, '');?>
-      <td class='text-left' title='<?php echo $libModule?>'><?php echo $libModule;?></th>
-      <td class='text-left' data-module='<?php echo $case->module?>' style='overflow:visible'><?php echo html::select("module[{$case->id}]", $modules, 0, "class='form-control chosen' onchange='setModule(this)'");?></th>
-      <td><?php echo zget($lang->testcase->typeList, $case->type);?></th>
-    </tr>
-    <?php endforeach;?>
-    <tfoot>
-      <tr>
-        <td colspan='<?php echo empty($branches) ? 6 : 7?>'>
-          <div class='table-actions clearfix'>
-            <?php echo html::selectButton();?>
-            <?php echo html::submitButton($lang->testcase->import);?>
-            <?php echo html::linkButton($lang->goback, $this->session->caseList);?>
-          </div>
-          <?php $pager->show();?>
-        </td>
-      </tr>
-    </tfoot>
-    </tbody>
-  </table>
-  <div></div>
-</form>
+<div id='mainContent' class='main-content'>
+  <div id='querybox' class='show'></div>
+  <hr class='small' />
+  <form class='main-table' method='post' target='hiddenwin' id='importFromLib' data-ride='table'>
+    <table class='table has-sort-head table-fixed'>
+      <thead>
+        <?php $vars = "productID=$productID&branch=$branch&libID=$libID&orderBy=%s&browseType=$browseType&queryID=$queryID&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";?>
+        <tr>
+          <th class='c-id'>
+            <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
+              <label></label>
+            </div>
+            <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
+          </th>
+          <?php if($branches):?>
+          <th class='w-100px'><?php echo $lang->testcase->branch ?></th>
+          <?php endif;?>
+          <th class='w-pri'>  <?php common::printOrderLink('pri',   $orderBy, $vars, $lang->priAB);?></th>
+          <th>                <?php common::printOrderLink('title', $orderBy, $vars, $lang->testcase->title);?></th>
+          <th class='w-200px'><?php echo $lang->testcase->fromModule ?></th>
+          <th class='w-200px'><?php echo $lang->testcase->module ?></th>
+          <th class='w-100px'><?php common::printOrderLink('type',  $orderBy, $vars, $lang->testcase->type)?></th>
+        </tr>
+      </thead>
+      <tbody>
+        <?php foreach($cases as $case):?>
+        <tr>
+          <td class='c-id'>
+            <div class="checkbox-primary">
+              <input type='checkbox' name='caseIdList[<?php echo $case->id?>]' value='<?php echo $case->id;?>' />
+              <label></label>
+            </div>
+            <?php printf('%03d', $case->id);?>
+          </td>
+          <?php if($branches):?>
+          <td><?php echo html::select("branch[{$case->id}]", $branches, $branch, "class='form-control'")?></td>
+          <?php endif;?>
+          <td><span class='label-pri <?php echo 'label-pri-' . $case->pri;?>'><?php echo $case->pri == '0' ? '' : zget($lang->testcase->priList, $case->pri, $case->pri);?></span></td>
+          <td class='text-left nobr'><?php if(!common::printLink('testcase', 'view', "caseID=$case->id", $case->title)) echo $case->title;?></td>
+          <?php $libModule = zget($libModules, $case->module, '');?>
+          <td class='text-left' title='<?php echo $libModule?>'><?php echo $libModule;?></th>
+          <td class='text-left' data-module='<?php echo $case->module?>' style='overflow:visible'><?php echo html::select("module[{$case->id}]", $modules, 0, "class='form-control chosen' onchange='setModule(this)'");?></th>
+          <td><?php echo zget($lang->testcase->typeList, $case->type);?></th>
+        </tr>
+        <?php endforeach;?>
+      </tbody>
+    </table>
+    <?php if($cases):?>
+    <div class='table-footer'>
+      <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
+      <div class='table-actions btn-toolbar'>
+        <?php echo html::submitButton($lang->testcase->import);?>
+      </div>
+      <?php echo html::linkButton($lang->goback, $this->session->caseList);?>
+      <?php $pager->show('right', 'pagerjs');?>
+    </div>
+    <?php endif;?>
+  </form>
+</div>
 <?php js::set('productID', $productID)?>
 <?php js::set('branch', $branch)?>
 <?php include '../../common/view/footer.html.php';?>