From 473e4ab805addcb6bcabd58eb7c6bb3b882347f2 Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Mon, 25 Apr 2016 11:12:20 +0800
Subject: [PATCH] * fix style for uploading and checking attached files.

---
 module/testtask/css/runcase.css       | 3 ++-
 module/testtask/view/results.html.php | 8 +++++---
 module/testtask/view/runcase.html.php | 6 +++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/module/testtask/css/runcase.css b/module/testtask/css/runcase.css
index efe0458783..9a6fc8262e 100644
--- a/module/testtask/css/runcase.css
+++ b/module/testtask/css/runcase.css
@@ -1,5 +1,6 @@
 .outer > #titlebar {display: none}
 
-.btn-file {float:right}
+.table > thead > tr > th {vertical-align: middle;}
+.btn-file {float:right; padding: 0px 5px!important}
 .fix-border td {border:0px;}
 .fix-position td {vertical-align: middle;}
diff --git a/module/testtask/view/results.html.php b/module/testtask/view/results.html.php
index 85fb9ec444..264d07de83 100644
--- a/module/testtask/view/results.html.php
+++ b/module/testtask/view/results.html.php
@@ -42,12 +42,14 @@
           <td class='w-180px'><?php echo $result->date;?></td>
           <td><?php echo $users[$result->lastRunner] . ' ' . $lang->testtask->runCase;?></td>
           <td class='w-150px'><?php echo zget($builds, $result->build, '');?></td>
-          <td class='w-50px'><?php if(!empty($result->files)) echo html::a("#caseResult{$result->id}", '<i class="icon icon-file"></i>', '', "data-toggle='modal' title='{$lang->files}' data-type='iframe'")?></td>
           <td class='w-50px text-right'><strong class='text-<?php echo $class;?>'><?php echo $lang->testcase->resultList[$result->caseResult]?></strong></td>
+          <?php if(!empty($result->files)):?>
+          <td class='w-20px'><?php echo html::a("#caseResult{$result->id}", '<i class="btn-icon icon-file"></i>', '', "data-toggle='modal' title='{$lang->files}' data-type='iframe'")?></td>
+          <?php endif;?>
           <td class='w-50px text-center'><i class='collapse-handle icon-chevron-down text-muted'></i></td>
         </tr>
         <tr class='result-detail hide'>
-          <td colspan='7' class='pd-0'>
+          <td colspan='<?php echo empty($result->files) ? 6 : 7?>' class='pd-0'>
             <table class='table table-condensed borderless mg-0'>
               <thead>
                 <tr>
@@ -71,7 +73,7 @@
                 <td class='<?php echo $stepResult['result'];?> text-center'><?php echo $lang->testcase->resultList[$stepResult['result']];?></td>
                 <td>
                   <?php echo $stepResult['real'];?>
-                  <?php if(!empty($stepResult['files'])) echo html::a("#stepResult{$modalID}", '<i class="icon icon-file"></i>', '', "data-toggle='modal' title='{$lang->files}' data-type='iframe' style='float:right'")?>
+                  <?php if(!empty($stepResult['files'])) echo html::a("#stepResult{$modalID}", '<i class="btn-icon icon-file"></i>', '', "data-toggle='modal' title='{$lang->files}' data-type='iframe' style='float:right'")?>
                 </td>
               </tr>
                 <?php else:?>
diff --git a/module/testtask/view/runcase.html.php b/module/testtask/view/runcase.html.php
index 06f4e7908b..694b01621b 100644
--- a/module/testtask/view/runcase.html.php
+++ b/module/testtask/view/runcase.html.php
@@ -25,7 +25,7 @@
         <tr>
           <td colspan='5' style='word-break: break-all;'><strong><?php echo $lang->testcase->precondition;?></strong> <?php echo $run->case->precondition;?></td>
         </tr>
-        <tr class='fix-position'>
+        <tr>
           <th class='w-40px'><?php echo $lang->testcase->stepID;?></th>
           <th class='w-p30'><?php  echo $lang->testcase->stepDesc;?></th>
           <th class='w-p30'><?php  echo $lang->testcase->stepExpect;?></th>
@@ -33,7 +33,7 @@
           <th>
             <?php echo $lang->testcase->real;?>
             <?php if(empty($run->case->steps)):?>
-            <button type='button' class='btn-file' data-toggle='modal' data-target='#fileModal'><?php echo $lang->testtask->files;?></button>
+            <button type='button' class='btn btn-file' data-toggle='modal' data-target='#fileModal'><?php echo $lang->testtask->files;?></button>
             <?php endif;?>
           </th>
         </tr>
@@ -49,7 +49,7 @@
           <table class='fix-border fix-position'>
             <tr>
               <td><?php echo html::textarea("reals[$step->id]", '', "rows=2 class='form-control fix-textarea'");?></td>
-              <td><button type='button' title='<?php echo $lang->testtask->files?>' class='btn-file' data-toggle='modal' data-target='#fileModal<?php echo $step->id?>'><i class='icon icon-paper-clip'></i></button></td>
+              <td><button type='button' title='<?php echo $lang->testtask->files?>' class='btn btn-file' data-toggle='modal' data-target='#fileModal<?php echo $step->id?>'><i class='icon icon-paper-clip'></i></button></td>
             </tr>
           </table>
         </td>