* ajusted views of module 'testtask'.

This commit is contained in:
Catouse
2014-04-01 15:14:58 +08:00
parent 9e1acb9c15
commit e02f41daa4
7 changed files with 270 additions and 220 deletions
+1
View File
@@ -555,6 +555,7 @@ class testtask extends control
$this->view->cases = $cases;
$this->view->taskID = $taskID;
$this->view->pager = $pager;
$this->view->task = $task;
$this->display();
}
+115 -111
View File
@@ -18,126 +18,130 @@
var browseType = '<?php echo $browseType;?>';
var moduleID = '<?php echo $moduleID;?>';
</script>
<div id='featurebar'>
<div class='f-left'>
<div class='heading'><?php echo html::icon($lang->icons['usecase']);?></div>
<nav class='nav'>
<?php
echo "<span id='bymoduleTab' onclick=\"browseByModule('$browseType')\"><a href='#'>" . $lang->testtask->byModule . "</a></span> ";
echo "<span id='allTab'>" . html::a($this->inlink('cases', "taskID=$taskID&browseType=all&param=0"), $lang->testtask->allCases) . "</span>";
echo "<span id='assignedtomeTab'>" . html::a($this->inlink('cases', "taskID=$taskID&browseType=assignedtome&param=0"), $lang->testtask->assignedToMe) . "</span>";
echo "<span id='bysearchTab' onclick=\"browseBySearch('$browseType')\"><a href='#'><i class='icon-search icon'></i>&nbsp;{$lang->testcase->bySearch}</a></span> ";
echo "<li id='bymoduleTab' onclick=\"browseByModule('$browseType')\"><a href='#'>" . $lang->testtask->byModule . "</a></li> ";
echo "<li id='allTab'>" . html::a($this->inlink('cases', "taskID=$taskID&browseType=all&param=0"), $lang->testtask->allCases) . "</li>";
echo "<li id='assignedtomeTab'>" . html::a($this->inlink('cases', "taskID=$taskID&browseType=assignedtome&param=0"), $lang->testtask->assignedToMe) . "</li>";
echo "<li id='bysearchTab' onclick=\"browseBySearch('$browseType')\"><a href='#'><i class='icon-search icon'></i>&nbsp;{$lang->testcase->bySearch}</a></li> ";
?>
</nav>
<div class='actions'>
<?php
echo "<div class='btn-group'>";
common::printIcon('testtask', 'linkCase', "taskID=$task->id", '', 'button', 'link');
common::printIcon('testcase', 'export', "productID=$productID&orderBy=`case`_desc&taskID=$task->id");
echo '</div>';
echo "<div class='btn-group'>";
common::printRPN($this->session->testtaskList, '');
echo '</div>';
?>
</div>
<div class='text-right'>
<?php
common::printIcon('testtask', 'linkCase', "taskID=$task->id");
common::printIcon('testcase', 'export', "productID=$productID&orderBy=`case`_desc&taskID=$task->id");
common::printRPN($this->session->testtaskList, '');
?>
<div id='querybox' class='<?php if($browseType =='bysearch') echo 'show';?>'></div>
</div>
<div class='side' id='treebox'>
<button class='side-handle' data-id='storyTree'><i class='icon-caret-left'></i></button>
<header class='nobr'><?php echo html::icon($lang->icons['product']);?> <strong><?php echo $productName;?></strong></header>
<div class='side-body'>
<?php echo $moduleTree;?>
</div>
</div>
<div id='querybox' class='<?php if($browseType !='bysearch') echo 'hidden';?>'></div>
<form method='post' name='casesform'>
<table class='cont-lt1'>
<tr valign='top'>
<td class='side <?php echo $treeClass;?>'>
<div class='box-title'><?php echo $productName;?></div>
<div class='box-content'><?php echo $moduleTree;?></div>
</td>
<td class='divider <?php echo $treeClass;?>'></td>
<td>
<div class='main'>
<form method='post' name='casesform'>
<?php $vars = "taskID=$task->id&browseType=$browseType&param=$param&orderBy=%s&recToal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
<table class='table-1 colored tablesorter datatable mb-zero fixed' id='caseList'>
<thead>
<tr class='colhead'>
<th class='w-id'><nobr><?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></nobr></th>
<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-type'> <?php common::printOrderLink('type', $orderBy, $vars, $lang->testcase->type);?></th>
<th class='w-user'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->testtask->assignedTo);?></th>
<th class='w-user'> <?php common::printOrderLink('lastRunner', $orderBy, $vars, $lang->testtask->lastRunAccount);?></th>
<th class='w-100px'> <?php common::printOrderLink('lastRunDate', $orderBy, $vars, $lang->testtask->lastRunTime);?></th>
<th class='w-80px'> <?php common::printOrderLink('lastRunResult', $orderBy, $vars, $lang->testtask->lastRunResult);?></th>
<th class='w-status'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='w-100px {sorter: false}'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
<?php
$canBatchEdit = common::hasPriv('testcase', 'batchEdit');
$canBatchAssign = common::hasPriv('testtask', 'batchAssign');
$canBatchRun = common::hasPriv('testtask', 'batchRun');
?>
<?php foreach($runs as $run):?>
<tr class='text-center'>
<td class='text-left'>
<?php if($canBatchEdit or $canBatchAssign or $canBatchRun):?>
<input type='checkbox' name='caseIDList[]' value='<?php echo $run->case;?>'/>
<?php endif;?>
<?php printf('%03d', $run->case);?>
</td>
<td><span class='<?php echo 'pri' . $run->pri?>'><?php echo $run->pri?></span></td>
<td class='a-left nobr'><?php echo html::a($this->createLink('testcase', 'view', "caseID=$run->case&version=$run->version&from=testtask"), $run->title, '_blank');?>
</td>
<td><?php echo $lang->testcase->typeList[$run->type];?></td>
<td><?php $assignedTo = $users[$run->assignedTo]; echo substr($assignedTo, strpos($assignedTo, ':') + 1);?></td>
<td><?php $lastRunner = $users[$run->lastRunner]; echo substr($lastRunner, strpos($lastRunner, ':') + 1);?></td>
<td><?php if(!helper::isZeroDate($run->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($run->lastRunDate));?></td>
<td class='<?php echo $run->lastRunResult;?>'><?php if($run->lastRunResult) echo $lang->testcase->resultList[$run->lastRunResult];?></td>
<td class='<?php echo $run->status;?>'><?php echo ($run->version < $run->caseVersion) ? "<span class='warning'>{$lang->testcase->changed}</span>" : $lang->testtask->statusList[$run->status];?></td>
<td class='text-center'>
<?php
common::printIcon('testtask', 'runCase', "id=$run->id", '', 'list', '', '', 'runCase');
common::printIcon('testtask', 'results', "id=$run->id", '', 'list', '', '', 'iframe');
<table class='table table-condensed table-hover table-striped table-borderless tablesorter table-fixed' id='caseList'>
<thead>
<tr class='colhead'>
<th class='w-id'><nobr><?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></nobr></th>
<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-type'> <?php common::printOrderLink('type', $orderBy, $vars, $lang->testcase->type);?></th>
<th class='w-user'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->testtask->assignedTo);?></th>
<th class='w-user'> <?php common::printOrderLink('lastRunner', $orderBy, $vars, $lang->testtask->lastRunAccount);?></th>
<th class='w-100px'> <?php common::printOrderLink('lastRunDate', $orderBy, $vars, $lang->testtask->lastRunTime);?></th>
<th class='w-80px'> <?php common::printOrderLink('lastRunResult', $orderBy, $vars, $lang->testtask->lastRunResult);?></th>
<th class='w-status'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='w-100px {sorter: false}'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
<?php
$canBatchEdit = common::hasPriv('testcase', 'batchEdit');
$canBatchAssign = common::hasPriv('testtask', 'batchAssign');
$canBatchRun = common::hasPriv('testtask', 'batchRun');
?>
<?php foreach($runs as $run):?>
<tr class='text-center'>
<td class='text-left'>
<?php if($canBatchEdit or $canBatchAssign or $canBatchRun):?>
<input type='checkbox' name='caseIDList[]' value='<?php echo $run->case;?>'/>
<?php endif;?>
<?php printf('%03d', $run->case);?>
</td>
<td><span class='<?php echo 'pri' . $run->pri?>'><?php echo $run->pri?></span></td>
<td class='text-left nobr'><?php echo html::a($this->createLink('testcase', 'view', "caseID=$run->case&version=$run->version&from=testtask"), $run->title, '_blank');?>
</td>
<td><?php echo $lang->testcase->typeList[$run->type];?></td>
<td><?php $assignedTo = $users[$run->assignedTo]; echo substr($assignedTo, strpos($assignedTo, ':') + 1);?></td>
<td><?php $lastRunner = $users[$run->lastRunner]; echo substr($lastRunner, strpos($lastRunner, ':') + 1);?></td>
<td><?php if(!helper::isZeroDate($run->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($run->lastRunDate));?></td>
<td class='<?php echo $run->lastRunResult;?>'><?php if($run->lastRunResult) echo $lang->testcase->resultList[$run->lastRunResult];?></td>
<td class='<?php echo $run->status;?>'><?php echo ($run->version < $run->caseVersion) ? "<span class='warning'>{$lang->testcase->changed}</span>" : $lang->testtask->statusList[$run->status];?></td>
<td class='text-center'>
<?php
common::printIcon('testtask', 'runCase', "id=$run->id", '', 'list', '', '', 'runCase iframe');
common::printIcon('testtask', 'results', "id=$run->id", '', 'list', '', '', 'iframe');
if(common::hasPriv('testtask', 'unlinkCase'))
{
$unlinkURL = $this->createLink('testtask', 'unlinkCase', "caseID=$run->id&confirm=yes");
echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"caseList\",confirmUnlink)", '<i class="icon-green-testtask-unlinkCase"></i>', '', "title='{$lang->testtask->unlinkCase}'");
}
if(common::hasPriv('testtask', 'unlinkCase'))
{
$unlinkURL = $this->createLink('testtask', 'unlinkCase', "caseID=$run->id&confirm=yes");
echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"caseList\",confirmUnlink)", '<i class="icon-unlink"></i>', '', "title='{$lang->testtask->unlinkCase}' class='btn-icon'");
}
common::printIcon('testcase', 'createBug', "product=$productID&extra=projectID=$task->project,buildID=$task->build,caseID=$run->case,runID=$run->id", $run, 'list', 'createBug');
?>
</td>
</tr>
<?php endforeach;?>
</tbody>
<tfoot>
<tr>
<td colspan='10'>
<?php if($runs):?>
<div class='f-left'>
common::printIcon('testcase', 'createBug', "product=$productID&extra=projectID=$task->project,buildID=$task->build,caseID=$run->case,runID=$run->id", $run, 'list', 'bug');
?>
</td>
</tr>
<?php endforeach;?>
</tbody>
<tfoot>
<tr>
<td colspan='10'>
<?php if($runs):?>
<div class='table-actions clearfix'>
<?php
if($canBatchEdit or $canBatchAssign or $canBatchRun) echo html::selectAll() . html::selectReverse();
if($canBatchEdit)
{
$actionLink = $this->createLink('testcase', 'batchEdit', "productID=$productID");
echo html::commonButton($lang->edit, "onclick=\"setFormAction('$actionLink')\"");
}
if($canBatchAssign)
{
$actionLink = inLink('batchAssign', "taskID=$task->id");
echo html::select('assignedTo', $users);
echo html::commonButton($lang->testtask->assign, "onclick=\"setFormAction('$actionLink')\"");
}
if($canBatchRun)
{
$actionLink = inLink('batchRUN', "productID=$productID&orderBy=id_desc&from=testtask");
echo html::commonButton($lang->testtask->runCase, "onclick=\"setFormAction('$actionLink')\"");
}
?>
<?php
if($canBatchEdit or $canBatchAssign or $canBatchRun) echo "<div class='btn-group'>" . html::selectAll() . html::selectReverse() . '</div>';
if($canBatchEdit)
{
$actionLink = $this->createLink('testcase', 'batchEdit', "productID=$productID");
echo html::commonButton($lang->edit, "onclick=\"setFormAction('$actionLink')\"");
}
if($canBatchAssign)
{
$actionLink = inLink('batchAssign', "taskID=$task->id");
echo "<div class='input-group'>";
echo html::select('assignedTo', $users, '', 'class="form-control"');
echo "<span class='input-group-btn'>";
echo html::commonButton($lang->testtask->assign, "onclick=\"setFormAction('$actionLink')\"");
echo '</span></div>';
}
if($canBatchRun)
{
$actionLink = inLink('batchRUN', "productID=$productID&orderBy=id_desc&from=testtask");
echo html::commonButton($lang->testtask->runCase, "onclick=\"setFormAction('$actionLink')\"");
}
?>
</div>
<?php endif;?>
<?php echo $pager->show();?>
</td>
</tr>
<tfoot>
</table>
</td>
</tr>
</table>
</form>
</div>
<?php endif;?>
<?php echo $pager->show();?>
</td>
</tr>
</tfoot>
</table>
</form>
</div>
<?php include '../../common/view/footer.html.php';?>
+27 -17
View File
@@ -13,21 +13,31 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<form class='form-condensed' method='post' target='hiddenwin'>
<table class='table table-form'>
<caption><?php echo $testtask->name;?></caption>
<tr>
<th class='rowhead'><?php echo $lang->testtask->report;?></td>
<td><?php echo html::textarea('report', '', "rows='6' class='form-control'");?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->comment;?></td>
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
</tr>
<tr>
<td colspan='2' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
</tr>
</table>
<?php include '../../common/view/action.html.php';?>
</form>
<div class='container mw-800px'>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['testtask']) . ' #' . $testtask->id;;?></span>
<strong><?php echo html::a($this->createLink('testtask', 'view', 'taskID=' . $testtask->id), $testtask->name, '_blank');?></strong>
<small class='text-danger'> <?php echo $lang->testtask->close;?> <?php echo html::icon($lang->icons['close']);?></small>
</div>
</div>
<form class='form-condensed' method='post' target='hiddenwin'>
<table class='table table-form'>
<tr>
<th><?php echo $lang->testtask->report;?></th>
<td><?php echo html::textarea('report', '', "rows='6' class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->comment;?></th>
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
</tr>
<tr>
<td colspan='2' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
</tr>
</table>
</form>
<div class='main'>
<?php include '../../common/view/action.html.php';?>
</div>
</div>
<?php include '../../common/view/footer.html.php';?>
+62 -55
View File
@@ -13,59 +13,66 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<form class='form-condensed' method='post' target='hiddenwin' id='dataform'>
<table class='table table-form'>
<caption><?php echo $lang->testtask->create;?></caption>
<?php if(isset($projectID)):?>
<tr>
<th><?php echo $lang->testtask->product;?></th>
<td><?php echo html::select('product', $products, '', "class='form-control'");?></td>
</tr>
<?php else:?>
<tr class='hidden'>
<th><?php echo $lang->testtask->product;?></th>
<td><?php echo html::input('product', $productID, "class='form-control'");?></td>
</tr>
<?php endif;?>
<tr>
<th><?php echo $lang->testtask->project;?></th>
<td><?php echo html::select('project', $projects, '', 'class=form-control onchange=loadProjectRelated(this.value)');?></td>
</tr>
<tr>
<th><?php echo $lang->testtask->build;?></th>
<td><span id='buildBox'><?php echo html::select('build', $builds, '', "class='form-control'");?></span></td>
</tr>
<tr>
<th><?php echo $lang->testtask->owner;?></th>
<td><?php echo html::select('owner', $users, '', "class='form-control chosen'");?></td>
</tr>
<tr>
<th><?php echo $lang->testtask->pri;?></th>
<td><?php echo html::select('pri', $lang->testtask->priList, 0, "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->testtask->begin;?></th>
<td><?php echo html::input('begin', '', "class='form-control form-date'");?></td>
</tr>
<tr>
<th><?php echo $lang->testtask->end;?></th>
<td><?php echo html::input('end', '', "class='form-control form-date'");?></td>
</tr>
<tr>
<th><?php echo $lang->testtask->status;?></th>
<td><?php echo html::select('status', $lang->testtask->statusList, '', "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->testtask->name;?></th>
<td><?php echo html::input('name', '', "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->testtask->desc;?></th>
<td><?php echo html::textarea('desc', '', "rows=10 class='form-control'");?></td>
</tr>
<tr>
<td colspan='2' class='text-center'><?php echo html::submitButton() . html::backButton();?> </td>
</tr>
</table>
</form>
<div class='container mw-800px'>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['testtask']);?></span>
<strong><small class='text-muted'><?php echo html::icon($lang->icons['create']);?></small> <?php echo $lang->testtask->create;?></strong>
</div>
</div>
<form class='form-condensed' method='post' target='hiddenwin' id='dataform'>
<table class='table table-form'>
<?php if(isset($projectID)):?>
<tr>
<th class='w-80px'><?php echo $lang->testtask->product;?></th>
<td class='w-p45'><?php echo html::select('product', $products, '', "class='form-control'");?></td><td></td>
</tr>
<?php else:?>
<tr class='hidden'>
<th class='w-80px'><?php echo $lang->testtask->product;?></th>
<td class='w-p45'><?php echo html::input('product', $productID, "class='form-control'");?></td><td></td>
</tr>
<?php endif;?>
<tr>
<th class='w-80px'><?php echo $lang->testtask->project;?></th>
<td class='w-p45'><?php echo html::select('project', $projects, '', 'class=form-control onchange=loadProjectRelated(this.value)');?></td><td></td>
</tr>
<tr>
<th><?php echo $lang->testtask->build;?></th>
<td><span id='buildBox'><?php echo html::select('build', $builds, '', "class='form-control'");?></span></td>
</tr>
<tr>
<th><?php echo $lang->testtask->owner;?></th>
<td><?php echo html::select('owner', $users, '', "class='form-control chosen'");?></td>
</tr>
<tr>
<th><?php echo $lang->testtask->pri;?></th>
<td><?php echo html::select('pri', $lang->testtask->priList, 0, "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->testtask->begin;?></th>
<td><?php echo html::input('begin', '', "class='form-control form-date'");?></td>
</tr>
<tr>
<th><?php echo $lang->testtask->end;?></th>
<td><?php echo html::input('end', '', "class='form-control form-date'");?></td>
</tr>
<tr>
<th><?php echo $lang->testtask->status;?></th>
<td><?php echo html::select('status', $lang->testtask->statusList, '', "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->testtask->name;?></th>
<td colspan='2'><?php echo html::input('name', '', "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->testtask->desc;?></th>
<td colspan='2'><?php echo html::textarea('desc', '', "rows=10 class='form-control'");?></td>
</tr>
<tr>
<td></td><td colspan='2'><?php echo html::submitButton() . html::backButton();?> </td>
</tr>
</table>
</form>
</div>
<?php include '../../common/view/footer.html.php';?>
+35 -24
View File
@@ -12,31 +12,42 @@
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<div id='querybox'></div>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['testtask']) . ' #' . $task->id;;?></span>
<strong><?php echo html::a($this->createLink('testtask', 'view', 'taskID=' . $task->id), $task->name, '_blank');?></strong>
<small class='text-muted'> <?php echo $lang->testtask->linkCase;?> <?php echo html::icon($lang->icons['link']);?></small>
</div>
<div class='actions'>
<?php
echo "<div class='btn-group'>";
$lang->testtask->linkCase = $lang->testtask->linkByStory;
common::printIcon('testtask', 'linkCase', "taskID=$taskID&param=bystory", '', 'button', 'link');
$lang->testtask->linkCase = $lang->testtask->linkByBug;
common::printIcon('testtask', 'linkCase', "taskID=$taskID&param=bybug", '', 'button', 'link');
echo '</div>';
echo "<div class='btn-group'>";
common::printRPN($this->session->testtaskList);
echo '</div>';
?>
</div>
<div id='querybox' class='show'></div>
</div>
<form method='post'>
<table class='table-1 colored tablesorter fixed'>
<caption class='caption-tl'>
<div class='f-left'><?php echo $lang->testtask->unlinkedCases;?></div>
<div class='text-right'>
<?php
$lang->testtask->linkCase = $lang->testtask->linkByStory;
common::printIcon('testtask', 'linkCase', "taskID=$taskID&param=bystory");
$lang->testtask->linkCase = $lang->testtask->linkByBug;
common::printIcon('testtask', 'linkCase', "taskID=$taskID&param=bybug");
common::printRPN($this->session->testtaskList);
?>
</div>
<table class='table table-condensed table-hover table-striped table-borderless tablesorter table-fixed'>
<caption class='text-left text-special'>
<?php echo html::icon('unlink');?> &nbsp;<strong><?php echo $lang->testtask->unlinkedCases;?></strong> (<?php echo count($cases);?>)
</caption>
<thead>
<tr class='colhead'>
<th class='w-id'><?php echo $lang->idAB;?></th>
<th class='w-60px'><nobr><?php echo $lang->testtask->linkVersion;?></nobr></th>
<th class='w-pri'><?php echo $lang->priAB;?></th>
<th><?php echo $lang->testcase->title;?></th>
<th class='w-type'><?php echo $lang->testcase->type;?></th>
<th class='w-user'><?php echo $lang->openedByAB;?></th>
<th class='w-status'><?php echo $lang->statusAB;?></th>
</tr>
<tr>
<th class='w-id'><?php echo $lang->idAB;?></th>
<th class='w-60px'><nobr><?php echo $lang->testtask->linkVersion;?></nobr></th>
<th class='w-pri'><?php echo $lang->priAB;?></th>
<th><?php echo $lang->testcase->title;?></th>
<th class='w-type'><?php echo $lang->testcase->type;?></th>
<th class='w-user'><?php echo $lang->openedByAB;?></th>
<th class='w-status'><?php echo $lang->statusAB;?></th>
</tr>
</thead>
<tbody>
<?php foreach($cases as $case):?>
@@ -45,7 +56,7 @@
<input type='checkbox' name='cases[]' value='<?php echo $case->id;?>' />
<?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$case->id"), sprintf('%03d', $case->id));?>
</td>
<td class='text-center'><?php echo html::select("versions[$case->id]", array_combine(range($case->version, 1), range($case->version, 1)), '', 'class=form-control');?> </td>
<td class='text-center'><?php echo html::select("versions[$case->id]", array_combine(range($case->version, 1), range($case->version, 1)), '', 'class="form-control input-sm" style="padding: 0 5px; height: 20px"');?> </td>
<td><span class='<?php echo 'pri' . $case->pri?>'><?php echo $case->pri?></span></td>
<td class='text-left'>
<?php
@@ -67,7 +78,7 @@
<tr>
<td colspan='7'>
<?php if($cases):?>
<div class='f-left'><?php echo html::selectAll() . html::selectReverse() . html::submitButton();?></div>
<div class='table-actions clearfix'><?php echo "<div class='btn-group'>" . html::selectAll() . html::selectReverse() . '</div>' . html::submitButton();?></div>
<?php endif;?>
<div class='text-right'><?php $pager->show();?></div>
</td>
+26 -13
View File
@@ -13,17 +13,30 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<form class='form-condensed' method='post' target='hiddenwin'>
<table class='table table-form'>
<caption><?php echo $testtask->name;?></caption>
<tr>
<th class='rowhead'><?php echo $lang->comment;?></td>
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
</tr>
<tr>
<td colspan='2' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
</tr>
</table>
<?php include '../../common/view/action.html.php';?>
</form>
<div class='container mw-800px'>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['testtask']) . ' #' . $testtask->id;;?></span>
<strong><?php echo html::a($this->createLink('testtask', 'view', 'taskID=' . $testtask->id), $testtask->name, '_blank');?></strong>
<small class='text-success'> <?php echo $lang->testtask->start;?> <?php echo html::icon($lang->icons['start']);?></small>
</div>
</div>
<form class='form-condensed' method='post' target='hiddenwin'>
<table class='table table-form'>
<tr>
<th class='text-left'><?php echo $lang->comment;?></th>
</tr>
<tr>
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
</tr>
<tr>
<td class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
</tr>
</table>
</form>
<div class='main'>
<?php include '../../common/view/action.html.php';?>
</div>
</div>
<?php include '../../common/view/footer.html.php';?>
+4
View File
@@ -59,6 +59,9 @@ tr.text-center > td.text-right, tr.text-center > th.text-right {text-align: righ
.table tr.active td, .table-hover>tbody>tr.active:hover>td, .table-hover>tbody>tr.active:hover>th, .table-striped>tbody>tr.active:nth-child(odd).active>td, .table-striped>tbody>tr.active:nth-child(odd)>th {background-color: #FCE6A2}
.table caption {padding: 8px 20px; border-bottom: 1px solid #ddd; background: #fafafa;}
.table.table-condensed caption {padding: 6px 20px;}
/* Datepicker */
.datepicker-wrapper {position: relative;}
.datepicker-wrapper:before {font-family: ZenIcon; content: '\e617'; display: block; position: absolute; right: 6px; color: #808080; font-size: 14px; top: 4px}
@@ -433,6 +436,7 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;}
/* Querybox */
#querybox {margin: 35px -10px -7px; background-color: #fff; height: 0; transition: all 1s; border-top: 1px solid #ddd; position: relative; z-index: 199; overflow: hidden; display: none; padding: 10px}
#querybox.show {display: block; height: auto}
#titlebar #querybox {margin: 5px -20px -10px}
/* Container in outer */
.outer .container {padding: 20px;}