Merge branch 'master' of github.com:easysoft/zentaopms

This commit is contained in:
wangyidong
2014-11-06 01:03:42 +00:00
2 changed files with 4 additions and 1 deletions
+1 -1
View File
@@ -75,7 +75,7 @@ js::set('confirmDelete', $lang->testcase->confirmDelete);
<td><?php echo $users[$case->lastRunner];?></td>
<td><?php if(!helper::isZeroDate($case->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?></td>
<td class='<?php echo $case->lastRunResult;?>'><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
<td class='<?php if(isset($run)) echo $run->status;?> status-<?php echo $case->status?>'><?php echo $lang->testcase->statusList[$case->status];?></td>
<td class='<?php if(isset($run)) echo $run->status;?> testcase-<?php echo $case->status?>'><?php echo $lang->testcase->statusList[$case->status];?></td>
<td class='text-right'>
<?php
common::printIcon('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->version", '', 'list', 'play', '', 'runCase iframe');
+3
View File
@@ -209,6 +209,9 @@ td.delayed, td[class$="-delayed"] {background:#e84e0f!important; color:white;}
td.blocked, td[class$="-blocked"] {background:yellow!important;}
td.fail, td[class$="-fail"] {color:#d2322d}
td.draft, td[class$="-draft"] {color:#8957a1}
.bug-active, td.bug-active {color: #8957a1}
.testcase-normal, td.testcase-normal,
.story-active, td.story-active {color: #333}
/* tabs */
.nav-tabs > li > a {padding: 5px 10px; color: #333; line-height: 20px; max-height: 32px}