Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* adjust for testcase-edit page.

Browse Source
This commit is contained in:
wangyidong
2018-05-15 15:20:55 +08:00
parent f8d523d5d7
commit 7613bee09f
4 changed files with 100 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/css/common.css
+3 -3
View File
@@ -4,14 +4,14 @@
#steps .step-item-id {background-color: transparent; border: none; display: none; width: 30px; padding-left: 0; padding-right: 0; text-align: right; padding-right: 8px}
#steps .checkbox-inline input[type="checkbox"] {top: -2px}
#steps .btn-group .btn {padding-left: 0; padding-right: 0; min-width: 30px;}
.step-actions {width: 100px;}
.step-actions {width: 105px;}
#steps .active td {transition: background-color .5s;}
#steps .step-group .step-steps {resize: none; max-height: 30px;}
#steps .step-group .step-expects {display: none;}
#steps .step-item .step-item-id {display: table-cell; min-width: 40px;}
#steps .step-item .step-id {color: transparent}
#steps .step-group .step-id {font-weight: bold}
#steps .step-actions {width: 90px; text-align: center;}
#steps .step-actions {width: 105px; text-align: center;}
#steps .btn-step-move {cursor: move}
#steps.sortable > tr.drag-shadow {display: none}
@@ -23,7 +23,7 @@
#steps.sortable > tr.drop-success > td {background-color: #cfe0ff; transition: background-color 2s;}
#steps .step-type-toggle {padding: 5px 11px 5px 7px;}
.table-bordered .step-actions {width: 98px;}
.table-bordered .step-actions {width: 105px;}
.table-bordered > #steps > tr > td {padding: 0; background-color: #fafafa; border: 1px solid #ddd!important; border-left-style: dotted!important; border-right-style: dotted!important;}
.table-bordered > #steps > tr > td.step-id { padding-right: 8px;}
.table-bordered > #steps > tr > td .btn {border-color: transparent; background-color: transparent}
module/testcase/view/createbug.html.php
+5 -2
View File
@@ -11,9 +11,12 @@
*/
?>
<?php include '../../common/view/header.lite.html.php';?>
<div class='main' id='resultsContainer'>
<div id='mainContent' class='main-content'>
<div class='main-header'>
<h2><?php echo $lang->testcase->createBug;?></h2>
</div>
<div class='main' id='resultsContainer'></div>
</div>
</form>
<script>
$(function()
{
module/testcase/view/edit.html.php
+51 -45
View File
@@ -15,32 +15,29 @@
<?php js::set('lblDelete', $lang->testcase->deleteStep);?>
<?php js::set('lblBefore', $lang->testcase->insertBefore);?>
<?php js::set('lblAfter', $lang->testcase->insertAfter);?>
<form method='post' class='form-condensed' enctype='multipart/form-data' target='hiddenwin' id='dataform'>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['testcase']);?> <strong><?php echo $case->id;?></strong></span>
<strong><?php echo html::a($this->createLink('testcase', 'view', "caseID=$case->id"), $case->title, '', 'class="case-title"');?></strong>
<small><?php echo $lang->case->edit;?></small>
</div>
<div class='actions'>
<?php echo html::submitButton($lang->save)?>
</div>
<div id='mainContent' class='main-content'>
<div class='main-header'>
<h2>
<span class='label label-id'><?php echo $case->id;?></span>
<?php echo html::a($this->createLink('testcase', 'view', "caseID=$case->id"), $case->title, '', 'class="case-title"');?>
</h2>
</div>
<div class='row-table'>
<div class='col-main'>
<div class='main'>
<div class='form-group'>
<form method='post' enctype='multipart/form-data' target='hiddenwin' id='dataform'>
<div class='main-row'>
<div class='main-col col-8'>
<div class='cell'>
<div class='detail form-group'>
<div class='input-group'>
<input type='hidden' id='color' name='color' data-provide='colorpicker' data-wrapper='input-group-btn fix-border-right' data-pull-menu-right='false' data-btn-tip='<?php echo $lang->case->colorTag ?>' value='<?php echo $case->color ?>' data-update-text='#title, .case-title'>
<?php echo html::input('title', $case->title, 'class="form-control" autocomplete="off" placeholder="' . $lang->case->title . '"');?>
</div>
</div>
<fieldset class='fieldset-pure'>
<legend><?php echo $lang->testcase->precondition;?></legend>
<div class='form-group'><?php echo html::textarea('precondition', $case->precondition, "rows='4' class='form-control'");?></div>
</fieldset>
<fieldset class='fieldset-pure'>
<legend><?php echo $lang->testcase->steps;?></legend>
<div class='detail'>
<div class='detail-title'><?php echo $lang->testcase->precondition;?></div>
<div class='detail-content'><?php echo html::textarea('precondition', $case->precondition, "rows='4' class='form-control'");?></div>
</div>
<div class='detail'>
<div class='detail-title'><?php echo $lang->testcase->steps;?></div>
<div class='form-group'>
<table class='table table-form table-bordered'>
<thead>
@@ -60,7 +57,10 @@
<textarea rows='1' class='form-control autosize step-steps' name='steps[]'></textarea>
<span class="input-group-addon step-type-toggle">
<input type='hidden' name='stepType[]' value='item' class='step-type'>
<label class="checkbox-inline"><input tabindex='-1' type="checkbox" class='step-group-toggle'> <?php echo $lang->testcase->group ?></label>
<div class='checkbox-primary'>
<input tabindex='-1' type="checkbox" class='step-group-toggle'>
<label><?php echo $lang->testcase->group ?></label>
</div>
</span>
</div>
</td>
@@ -69,7 +69,7 @@
<div class='btn-group'>
<button type='button' class='btn btn-step-add' tabindex='-1'><i class='icon icon-plus'></i></button>
<button type='button' class='btn btn-step-move' tabindex='-1'><i class='icon icon-move'></i></button>
<button type='button' class='btn btn-step-delete' tabindex='-1'><i class='icon icon-remove'></i></button>
<button type='button' class='btn btn-step-delete' tabindex='-1'><i class='icon icon-trash'></i></button>
</div>
</td>
</tr>
@@ -83,7 +83,10 @@
<span class='input-group-addon step-type-toggle'>
<?php if(!isset($step->type)) $step->type = 'step';?>
<input type='hidden' name='stepType[]' value='<?php echo $step->type;?>' class='step-type'>
<label class="checkbox-inline"><input tabindex='-1' tabindex='-1' type="checkbox" class='step-group-toggle'<?php if($step->type === 'group') echo ' checked' ?>> <?php echo $lang->testcase->group ?></label>
<div class='checkbox-primary'>
<input tabindex='-1' tabindex='-1' type="checkbox" class='step-group-toggle'<?php if($step->type === 'group') echo ' checked' ?> />
<label><?php echo $lang->testcase->group ?></label>
</div>
</span>
</div>
</td>
@@ -92,7 +95,7 @@
<div class='btn-group'>
<button type='button' class='btn btn-step-add' tabindex='-1'><i class='icon icon-plus'></i></button>
<button type='button' class='btn btn-step-move' tabindex='-1'><i class='icon icon-move'></i></button>
<button type='button' class='btn btn-step-delete' tabindex='-1'><i class='icon icon-remove'></i></button>
<button type='button' class='btn btn-step-delete' tabindex='-1'><i class='icon icon-trash'></i></button>
</div>
</td>
</tr>
@@ -100,16 +103,15 @@
</tbody>
</table>
</div>
</fieldset>
<fieldset class='fieldset-pure'>
<legend><?php echo $lang->testcase->legendComment;?></legend>
<div class='form-group'><?php echo html::textarea('comment', '', "rows='5' class='form-control'");?></div>
</fieldset>
<fieldset class='fieldset-pure'>
<legend><?php echo $lang->testcase->legendAttatch;?></legend>
<div class='form-group'><?php echo $this->fetch('file', 'buildform');?></div>
</fieldset>
<div class='text-center mgb-20'>
</div>
<div class='detail'>
<div class='detail-title'><?php echo $lang->testcase->legendComment;?></div>
<div class='detail-content'><?php echo html::textarea('comment', '', "rows='5' class='form-control'");?></div>
</div>
<div class='detail'>
<?php echo $this->fetch('file', 'buildform');?>
</div>
<div class='text-center detail'>
<?php echo html::hidden('lastEditedDate', $case->lastEditedDate);?>
<?php echo html::submitButton();?>
<input type='button' value='<?php echo $lang->testcase->buttonToList;?>' class='btn' onclick='location.href="<?php echo $isLibCase ? $this->createLink('testsuite', 'library', "libID=$libID") : $this->createLink('testcase', 'browse', "productID=$productID");?>"' />
@@ -117,10 +119,10 @@
<?php include '../../common/view/action.html.php';?>
</div>
</div>
<div class='col-side'>
<div class='main main-side'>
<fieldset>
<legend><?php echo $lang->testcase->legendBasicInfo;?></legend>
<div class='side-col col-4'>
<div class='cell'>
<div class='detail'>
<div class='detail-title'><?php echo $lang->testcase->legendBasicInfo;?></div>
<table class='table table-form' cellpadding='0' cellspacing='0'>
<?php if($isLibCase):?>
<tr>
@@ -206,10 +208,13 @@
<td><?php echo html::input('keywords', $case->keywords, "class='form-control' autocomplete='off'");?></td>
</tr>
<?php if(!$isLibCase):?>
<tr class='text-top'>
<tr>
<th><?php echo $lang->testcase->linkCase;?></th>
<td><?php echo html::a($this->createLink('testcase', 'linkCases', "caseID=$case->id", '', true), $lang->testcase->linkCases, '', "data-type='iframe' data-toggle='modal' data-width='95%'");?></td>
</tr>
<tr>
<th></th>
<td>
<?php echo html::a($this->createLink('testcase', 'linkCases', "caseID=$case->id", '', true), $lang->testcase->linkCases, '', "data-type='iframe' data-toggle='modal' data-width='95%'");?>
<ul class='list-unstyled' id='linkCaseBox'>
<?php
if(isset($case->linkCaseTitles))
@@ -218,7 +223,7 @@
{
echo '<li>';
echo html::a(inlink('view', "caseID=$linkCaseID"), "#$linkCaseID " . $linkCaseTitle, '_blank');
echo html::a("javascript:unlinkCase($case->id, $linkCaseID)", '<i class="icon-remove"></i>', '', "title='{$lang->unlink}' style='float:right'");
echo html::a("javascript:unlinkCase($case->id, $linkCaseID)", '<i class="icon-trash"></i>', '', "title='{$lang->unlink}' style='float:right'");
echo '</li>';
}
}
@@ -228,9 +233,9 @@
</tr>
<?php endif;?>
</table>
</fieldset>
<fieldset>
<legend><?php echo $lang->testcase->legendOpenAndEdit;?></legend>
</div>
<div class='detail'>
<div class='detail-title'><?php echo $lang->testcase->legendOpenAndEdit;?></div>
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->testcase->openedBy;?></th>
@@ -241,9 +246,10 @@
<td><?php if($case->lastEditedBy) echo $users[$case->lastEditedBy] . $lang->at . $case->lastEditedDate;?></td>
</tr>
</table>
</fieldset>
</div>
</div>
</div>
</div>
</form>
</div>
<?php include '../../common/view/footer.html.php';?>
module/testcase/view/linkcases.html.php
+41 -42
View File
@@ -11,22 +11,25 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<div class='container'>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['testcase']);?> <strong><?php echo $case->id;?></strong></span>
<strong><?php echo html::a($this->createLink('case', 'view', 'caseID=' . $case->id), $case->title, '_blank');?></strong>
<small class='text-muted'> <?php echo $lang->testcase->linkCases;?> <?php echo html::icon($lang->icons['link']);?></small>
</div>
<div id='querybox' class='show'></div>
<div id='mainContent' class='main-content'>
<div class='main-header'>
<h2>
<span class='label label-id'><?php echo $case->id;?></span>
<?php echo html::a($this->createLink('case', 'view', 'caseID=' . $case->id), $case->title, '_blank');?>
</h2>
</div>
<form method='post' class='form-condensed' target='hiddenwin' id='linkCasesForm'>
<table class='table table-condensed table-hover table-striped tablesorter table-selectable' id='caseList'>
<?php if($cases2Link):?>
<div id='queryBox' class='show'></div>
<?php if($cases2Link):?>
<form class='main-table' method='post' target='hiddenwin' id='linkCasesForm' data-ride='table'>
<table class='table' id='caseList'>
<thead>
<tr>
<th class='w-id'><?php echo $lang->idAB;?></th>
<th class='c-id'>
<div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
<label></label>
</div>
<?php echo $lang->idAB;?>
</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>
@@ -35,39 +38,35 @@
</tr>
</thead>
<tbody>
<?php $caseCount = 0;?>
<?php foreach($cases2Link as $case2Link):?>
<tr class='text-center'>
<td class='cell-id'>
<input type='checkbox' name='cases[]' value='<?php echo $case2Link->id;?>' />
<?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$case2Link->id"), sprintf('%03d', $case2Link->id));?>
</td>
<td><span class='<?php echo 'pri' . zget($lang->testcase->priList, $case2Link->pri, $case2Link->pri)?>'><?php echo zget($lang->testcase->priList, $case2Link->pri, $case2Link->pri)?></span></td>
<td class='text-left'><?php echo html::a($this->createLink('testcase', 'view', "caseID=$case2Link->id"), $case2Link->title, '_blank');?></td>
<td><?php echo $lang->testcase->typeList[$case2Link->type];?></td>
<td><?php echo $users[$case2Link->openedBy];?></td>
<td class='case-<?php echo $case2Link->status?>'><?php echo $lang->testcase->statusList[$case2Link->status];?></td>
</tr>
<?php $caseCount ++;?>
<?php endforeach;?>
<?php $caseCount = 0;?>
<?php foreach($cases2Link as $case2Link):?>
<tr>
<td class='c-id'>
<div class="checkbox-primary">
<input type='checkbox' name='cases[]' value='<?php echo $case2Link->id;?>' />
<label></label>
</div>
<?php printf('%03d', $case2Link->id);?>
</td>
<td><span class='<?php echo 'pri' . zget($lang->testcase->priList, $case2Link->pri, $case2Link->pri)?>'><?php echo zget($lang->testcase->priList, $case2Link->pri, $case2Link->pri)?></span></td>
<td class='text-left'><?php echo html::a($this->createLink('testcase', 'view', "caseID=$case2Link->id"), $case2Link->title, '_blank');?></td>
<td><?php echo $lang->testcase->typeList[$case2Link->type];?></td>
<td><?php echo $users[$case2Link->openedBy];?></td>
<td class='case-<?php echo $case2Link->status?>'><?php echo $lang->testcase->statusList[$case2Link->status];?></td>
</tr>
<?php $caseCount ++;?>
<?php endforeach;?>
</tbody>
<tfoot>
<tr>
<td colspan='6'>
<div class='table-actions clearfix'>
<?php if($caseCount) echo html::selectButton() . html::submitButton();?>
</div>
</td>
</tr>
<tr>
<td class='hidden'><?php echo html::input('case', $case->id);?></td>
</tr>
</tfoot>
<?php endif;?>
</table>
<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();?></div>
<?php echo html::hidden('case', $case->id);?>
</div>
</form>
<?php endif;?>
</div>
<script type='text/javascript'>
<script>
$(function(){ajaxGetSearchForm();});
</script>
<?php include '../../common/view/footer.html.php';?>