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

* Remove label-dot which in list page.

Browse Source
This commit is contained in:
chenfeiCF
2018-09-19 14:58:48 +08:00
parent 41c563bf32
commit 9e19e3fc85
38 changed files with 35 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/view/bugblock.html.php
-1
View File
@@ -51,7 +51,6 @@
<td class='c-name' style='color: <?php echo $bug->color?>' title='<?php echo $bug->title?>'><?php echo $bug->title?></td>
<td class='c-status' title='<?php echo zget($lang->bug->statusList, $bug->status)?>'>
<span class="status-<?php echo $bug->status?>">
<span class="label label-dot hide-in-sm"></span>
<span class='status-text'><?php echo zget($lang->bug->statusList, $bug->status);?></span>
</span>
</td>
module/block/view/caseblock.html.php
-4
View File
@@ -19,11 +19,8 @@
.block-cases.block-sm .c-status{text-align:center}
.block-cases.block-sm .c-status .status-text{display:none;}
.case-status-normal {color: #a6aab8;}
.case-status-normal > .label-dot {background-color: #006af1;}
.case-status-blocked { color: #a6aab8; }
.case-status-blocked > .label-dot { background-color: #00da88; }
.case-status-investigate {color: #a6aab8;}
.case-status-investigate > .label-dot {background-color: #006af1;}
</style>
<table class='table table-borderless table-hover table-fixed-head tablesorter block-cases <?php if(!$longBlock) echo 'block-sm';?>'>
<thead>
@@ -58,7 +55,6 @@
<?php endif;?>
<td class='c-status' title='<?php echo zget($lang->testcase->statusList, $case->status)?>'>
<span class="case-status-<?php echo $case->status?>">
<span class="label label-dot"></span>
<span class='status-text'><?php echo zget($lang->testcase->statusList, $case->status);?></span>
</span>
</td>
module/block/view/projectblock.html.php
+2 -2
View File
@@ -44,9 +44,9 @@
<?php if($longBlock):?>
<td class="c-status">
<?php if(isset($project->delay)):?>
<span class="status-delayed"><span class="label label-dot"></span> <?php echo $lang->project->delayed;?></span>
<span class="status-delayed"><?php echo $lang->project->delayed;?></span>
<?php else:?>
<span class="status-<?php echo $project->status?>"><span class="label label-dot"></span> <?php echo zget($lang->project->statusList, $project->status, '');?></span>
<span class="status-<?php echo $project->status?>"><?php echo zget($lang->project->statusList, $project->status, '');?></span>
<?php endif;?>
</td>
<td class="c-hours"><?php echo $project->hours->totalEstimate;?></td>
module/block/view/releaseblock.html.php
-1
View File
@@ -47,7 +47,6 @@
<td class='text-center'><?php echo $release->date?></td>
<td class='c-status' title='<?php echo zget($lang->release->statusList, $release->status);?>'>
<span class="status-<?php echo $release->status?>">
<span class="label label-dot"></span>
<span class='status-text'><?php echo zget($lang->release->statusList, $release->status);?></span>
</span>
</td>
module/block/view/storyblock.html.php
-2
View File
@@ -21,7 +21,6 @@
.block-stories .c-stage {width: 80px;}
.block-stories.block-sm .estimate,
.block-stories.block-sm .c-stage,
.block-stories.block-sm .c-status .label-dot {display: none;}
.block-stories.block-sm .c-status {text-align: center;}
</style>
<div class='panel-body has-table scrollbar-hover'>
@@ -59,7 +58,6 @@
<?php endif;?>
<td class='c-status' title='<?php echo zget($lang->story->statusList, $story->status);?>'>
<span class="status-<?php echo $story->status?>">
<span class="label label-dot"></span>
<span class='status-text'><?php echo zget($lang->story->statusList, $story->status);?></span>
</span>
</td>
module/block/view/taskblock.html.php
-1
View File
@@ -51,7 +51,6 @@
<?php endif;?>
<td class='c-status' title='<?php echo zget($lang->task->statusList, $task->status)?>'>
<span class="status-<?php echo $task->status?>">
<span class="label label-dot hide-in-sm"></span>
<span class='status-text'><?php echo zget($lang->task->statusList, $task->status);?></span>
</span>
</td>
module/bug/model.php
+3 -6
View File
@@ -2527,7 +2527,7 @@ class bugModel extends model
echo zget($this->lang->bug->typeList, $bug->type);
break;
case 'status':
echo "<span class='status-{$bug->status}'><span class='label label-dot'></span><span class='status-text'>";
echo "<span class='status-{$bug->status}'><span class='status-text'>";
echo zget($this->lang->bug->statusList, $bug->status);
echo '</span></span>';
break;
@@ -2584,13 +2584,9 @@ class bugModel extends model
}
break;
case 'assignedTo':
$btnTextClass = '';
$assignedToText = !empty($bug->assignedTo) ? zget($users, $bug->assignedTo) : $this->lang->bug->noAssigned;
$btnTextClass = 'text-primary';
if($bug->assignedTo == $account) $btnTextClass = 'text-red';
$btnClass = $assignedToText == 'closed' ? ' disabled' : '';
echo html::a(helper::createLink('bug', 'assignTo', "bugID=$bug->id", '', true), "<i class='icon icon-hand-right'></i> <span class='{$btnTextClass}'>{$assignedToText}</span>", '', "class='iframe btn btn-sm btn-icon-left{$btnClass}'");
echo "<span class='{$btnTextClass}'>" . zget($users, $bug->assignedTo) . "</span>";
break;
case 'assignedDate':
echo substr($bug->assignedDate, 5, 11);
@@ -2624,6 +2620,7 @@ class bugModel extends model
break;
case 'actions':
$params = "bugID=$bug->id";
common::printIcon('bug', 'assignTo', $params, $bug, 'list', '', '', 'iframe', true);
common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'confirm', '', 'iframe', true);
common::printIcon('bug', 'resolve', $params, $bug, 'list', 'checked', '', 'iframe', true);
common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe', true);
module/build/view/linkbug.html.php
-1
View File
@@ -49,7 +49,6 @@
<td style='overflow:visible;padding-top:1px;padding-bottom:1px;'><?php echo ($bug->status == 'resolved' or $bug->status == 'closed') ? $users[$bug->resolvedBy] : html::select("resolvedBy[{$bug->id}]", $users, $this->app->user->account, "class='form-control chosen'");?></td>
<td>
<span class='status-<?php echo $bug->status?>'>
<span class='label label-dot'></span>
<?php echo $lang->bug->statusList[$bug->status];?>
</span>
</td>
module/build/view/linkstory.html.php
-1
View File
@@ -52,7 +52,6 @@
<td><?php echo $story->estimate;?></td>
<td>
<span class='status-<?php echo $story->status?>'>
<span class='label label-dot'></span>
<?php echo $lang->story->statusList[$story->status];?>
</span>
</td>
module/build/view/view.html.php
-3
View File
@@ -127,7 +127,6 @@ tbody tr td:first-child input{display:none;}
<td><?php echo $story->estimate;?></td>
<td>
<span class='status-<?php echo $story->status;?>'>
<span class='label label-dot'></span>
<?php echo $lang->story->statusList[$story->status];?>
</span>
</td>
@@ -199,7 +198,6 @@ tbody tr td:first-child input{display:none;}
<td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($bugLink, $bug->title, '', "class='iframe' data-width='1000'");?></td>
<td>
<span class='status-<?php echo $bug->status?>'>
<span class='label label-dot'></span>
<?php echo $lang->bug->statusList[$bug->status];?>
</span>
</td>
@@ -260,7 +258,6 @@ tbody tr td:first-child input{display:none;}
<td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($bugLink, $bug->title, '', "class='iframe' data-width='1000'");?></td>
<td>
<span class='status-<?php echo $bug->status?>'>
<span class='label label-dot'></span>
<?php echo $lang->bug->statusList[$bug->status];?>
</span>
</td>
module/my/view/bug.html.php
+3 -8
View File
@@ -50,7 +50,7 @@
<th class='w-user'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->bug->assignedTo);?></th>
<th class='w-user'> <?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedByAB);?></th>
<th class='w-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
<th class='c-actions-5'> <?php echo $lang->actions;?></th>
<th class='c-actions-6'> <?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
@@ -70,19 +70,14 @@
<td><?php echo zget($lang->bug->typeList, $bug->type, '');?></td>
<td class='text-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, null, "style='color: $bug->color'");?></td>
<td><?php echo zget($users, $bug->openedBy);?></td>
<td>
<?php
$assignedToText = !empty($bug->assignedTo) ? zget($users, $bug->assignedTo) : $this->lang->bug->noAssigned;
$btnTextClass = 'text-red';
$btnClass = $assignedToText == 'closed' ? ' disabled' : '';
echo html::a(helper::createLink('bug', 'assignTo', "bugID=$bug->id", '', true), "<i class='icon icon-hand-right'></i> <span class='{$btnTextClass}'>{$assignedToText}</span>", '', "class='iframe btn btn-sm btn-icon-left{$btnClass}'");
?>
<td><?php echo "<span class='text-red'>" . zget($users, $bug->assignedTo) . "</span>";?>
</td>
<td><?php echo zget($users, $bug->resolvedBy);?></td>
<td><?php echo zget($lang->bug->resolutionList, $bug->resolution);?></td>
<td class='c-actions'>
<?php
$params = "bugID=$bug->id";
common::printIcon('bug', 'assignTo', $params, $bug, 'list', '', '', 'iframe', true);
common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'confirm', '', 'iframe', true);
common::printIcon('bug', 'resolve', $params, $bug, 'list', 'checked', '', 'iframe', true);
common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe', true);
module/my/view/project.html.php
+2 -2
View File
@@ -56,9 +56,9 @@
<td><?php echo $project->end;?></td>
<td class="c-status">
<?php if(isset($project->delay)):?>
<span class="status-delayed"><span class="label label-dot"></span> <?php echo $lang->project->delayed;?></span>
<span class="status-delayed"> <?php echo $lang->project->delayed;?></span>
<?php else:?>
<span class="status-<?php echo $project->status?>"><span class="label label-dot"></span> <?php echo zget($lang->project->statusList, $project->status, '');?></span>
<span class="status-<?php echo $project->status?>"> <?php echo zget($lang->project->statusList, $project->status, '');?></span>
<?php endif;?>
</td>
<td><?php echo $project->role;?></td>
module/my/view/story.html.php
+1 -1
View File
@@ -75,7 +75,7 @@
<td class='c-plan'><?php echo $story->planTitle;?></td>
<td class='c-user'><?php echo $users[$story->openedBy];?></td>
<td class='c-hours'><?php echo $story->estimate;?></td>
<td class='c-status'><span class='status-<?php echo $story->status;?>'><span class="label label-dot"></span> <?php echo zget($lang->story->statusList, $story->status);?></span></td>
<td class='c-status'><span class='status-<?php echo $story->status;?>'> <?php echo zget($lang->story->statusList, $story->status);?></span></td>
<td class='c-stage'><?php echo zget($lang->story->stageList, $story->stage);?></td>
<td class='c-actions'>
<?php
module/my/view/task.html.php
+1 -6
View File
@@ -78,12 +78,7 @@
<?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), $task->name, null, "style='color: $task->color'");?>
</td>
<td class='c-user'><?php echo zget($users, $task->openedBy);?></td>
<td class="c-assign">
<?php
$btnTextClass = 'text-red';
echo "<span class='$btnTextClass'>" . zget($users, $task->assignedTo) . "</span>";
?>
</td>
<td class="c-assign"><?php echo "<span class='text-red'>" . zget($users, $task->assignedTo) . "</span>";?></td>
<td class='c-user'><?php echo zget($users, $task->finishedBy);?></td>
<td class='c-hours'><?php echo $task->estimate;?></td>
<td class='c-hours'><?php echo $task->consumed;?></td>
module/productplan/view/linkbug.html.php
-1
View File
@@ -48,7 +48,6 @@
<td><?php echo $users[$bug->assignedTo];?></td>
<td>
<span class='status-<?php echo $bug->status?>'>
<span class='label label-dot'></span>
<?php echo $lang->bug->statusList[$bug->status];?>
</span>
</td>
module/productplan/view/linkstory.html.php
-1
View File
@@ -55,7 +55,6 @@
<td><?php echo $story->estimate;?></td>
<td>
<span class='status-<?php echo $story->status?>'>
<span class='label label-dot'></span>
<?php echo $lang->story->statusList[$story->status];?>
</span>
</td>
module/project/view/all.html.php
-1
View File
@@ -80,7 +80,6 @@
<td><?php echo $project->end;?></td>
<td class='c-status' title='<?php echo zget($lang->project->statusList, $project->status);?>'>
<span class="status-<?php echo $project->status?>">
<span class="label label-dot"></span>
<span class='status-text'><?php echo zget($lang->project->statusList, $project->status);?></span>
</span>
</td>
module/project/view/bug.html.php
+4 -8
View File
@@ -59,7 +59,7 @@
<th class='w-110px'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
<th class='w-user'> <?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedBy);?></th>
<th class='w-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
<th class='c-actions text-center'><?php echo $lang->actions;?></th>
<th class='c-actions-5 text-center'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
@@ -77,19 +77,15 @@
<td class='text-left' title="<?php echo $bug->title?>"><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, null, "style='color: $bug->color'");?></td>
<td><?php echo zget($users, $bug->openedBy, $bug->openedBy);?></td>
<td class='c-assignedTo has-btn text-left'>
<?php $assignedTo = zget($users, $bug->assignedTo, $bug->assignedTo);?>
<?php $params = "bugID=$bug->id";?>
<?php $class = $bug->assignedTo == $this->app->user->account ? 'text-red' : 'text-primary';?>
<?php if(common::hasPriv('bug', 'assignTo')):?>
<?php echo html::a($this->createLink('bug', 'assignTo', $params, '', 'true'), "<i class='icon icon-hand-right'></i> <span class='$class'>$assignedTo</span>", '', "class='iframe btn btn-icon-left btn-sm'");?>
<?php else:?>
<?php echo $assignedTo;?>
<?php endif;?>
<?php echo "<span class='$class'>" . zget($users, $bug->assignedTo, $bug->assignedTo) . "</span>";?>
</td>
<td><?php echo zget($users, $bug->resolvedBy, $bug->resolvedBy);?></td>
<td><?php echo $lang->bug->resolutionList[$bug->resolution];?></td>
<td class='c-actions'>
<?php
$params = "bugID=$bug->id";
common::printIcon('bug', 'assignTo', $params, $bug, 'list', '', '', 'iframe', true);
if($bug->status == 'active') common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'confirm', '', 'iframe', true);
if($bug->status == 'active') common::printIcon('bug', 'resolve', $params, $bug, 'list', 'check', '', 'iframe', true);
if($bug->status != 'active') common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe', true);
module/project/view/importbug.html.php
+1 -1
View File
@@ -59,7 +59,7 @@ var browseType = '<?php echo $browseType;?>';
<td><span class='<?php echo 'severity' . zget($lang->bug->severityList, $bug->severity, $bug->severity)?>'><?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity)?></span></td>
<td><span class='label-pri <?php echo 'label-pri-' . $bug->pri;?>' title='<?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
<td class='nobr'><?php common::printLink('bug', 'view', "bugID=$bug->id", $bug->title, '', "class='preview'", true, true);?></td>
<td><span class='status-<?php echo $bug->status?>'><span class='label label-dot'></span> <?php echo $lang->bug->statusList[$bug->status];?></span></td>
<td><span class='status-<?php echo $bug->status?>'><?php echo $lang->bug->statusList[$bug->status];?></span></td>
<td style='overflow:visible'><?php echo html::select("pri[$bug->id]", $lang->task->priList, 3, "class='form-control chosen'");?></td>
<td style='overflow:visible'><?php echo html::select("assignedTo[$bug->id]", $users, zget($users, $bug->assignedTo, '', $bug->assignedTo), "class='form-control chosen'");?></td>
<td><?php echo html::input("estimate[$bug->id]", '', 'size=4 class="form-control" autocomplete="off"');?></td>
module/project/view/importtask.html.php
-1
View File
@@ -61,7 +61,6 @@
<td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
<td>
<span class='status-<?php echo $task->status;?>'>
<span class='label label-dot'></span>
<?php echo $lang->task->statusList[$task->status];?>
</span>
</td>
module/project/view/story.html.php
-1
View File
@@ -158,7 +158,6 @@
<td class='c-estimate'><?php echo $story->estimate;?></td>
<td class='c-status' title='<?php echo zget($lang->story->statusList, $story->status);?>'>
<span class='status-<?php echo $story->status;?>'>
<span class='label label-dot'></span>
<span class='status-text'><?php echo zget($lang->story->statusList, $story->status);?></span>
</span>
</td>
module/project/view/testtask.html.php
-1
View File
@@ -93,7 +93,6 @@
<td><?php echo $task->end?></td>
<td title='<?php echo $lang->testtask->statusList[$task->status];?>'>
<span class='status-<?php echo $task->status?>'>
<span class='label label-dot'></span>
<span class='status-text'><?php echo $lang->testtask->statusList[$task->status];?></span>
</span>
</td>
module/release/view/linkbug.html.php
-1
View File
@@ -52,7 +52,6 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
<td><?php echo $users[$bug->resolvedBy];?></td>
<td>
<span class='status-<?php echo $bug->status?>'>
<span class='label label-dot'></span>
<?php echo $lang->bug->statusList[$bug->status];?>
</span>
</td>
module/release/view/linkstory.html.php
+1 -1
View File
@@ -54,7 +54,7 @@
<td><?php echo zget($users, $story->openedBy);?></td>
<td><?php echo zget($users, $story->assignedTo);?></td>
<td><?php echo $story->estimate;?></td>
<td><span class='status-<?php echo $story->status?>'><span class="label label-dot"></span> <?php echo zget($lang->story->statusList, $story->status);?></span></td>
<td><span class='status-<?php echo $story->status?>'><?php echo zget($lang->story->statusList, $story->status);?></span></td>
<td><?php echo zget($lang->story->stageList, $story->stage);?></td>
</tr>
<?php $unlinkedCount++;?>
module/release/view/view.html.php
+1 -1
View File
@@ -252,7 +252,7 @@
<span class='label-severity' data-severity='<?php echo $bug->severity;?>' title='<?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity);?>'></span>
</td>
<td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
<td><span class='status-<?php echo $bug->status?>'><span class="label label-dot"></span> <?php echo zget($lang->bug->statusList, $bug->status);?></span></td>
<td><span class='status-<?php echo $bug->status?>'> <?php echo zget($lang->bug->statusList, $bug->status);?></span></td>
<td><?php echo zget($users, $bug->openedBy);?></td>
<td><?php echo $bug->openedDate?></td>
<td class='c-actions'>
module/story/view/affected.html.php
-3
View File
@@ -28,7 +28,6 @@
<td><?php echo $users[$task->assignedTo];?></td>
<td>
<span class='status-<?php echo $task->status?>'>
<span class='label label-dot'></span>
<?php echo $lang->task->statusList[$task->status];?>
</span>
</td>
@@ -61,7 +60,6 @@
<td class='text-left'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, '_blank');?></td>
<td>
<span class='status-<?php echo $bug->status?>'>
<span class='label label-dot'></span>
<?php echo $lang->bug->statusList[$bug->status];?>
</span>
</td>
@@ -92,7 +90,6 @@
<td class='text-left'><?php echo html::a($this->createLink('testcase', 'view', "caseID=$case->id"), $case->title, '_blank');?></td>
<td>
<span class='status-<?php echo $case->status?>'>
<span class='label label-dot'></span>
<?php echo $lang->testcase->statusList[$case->status];?>
</span>
</td>
module/story/view/zerocase.html.php
+1 -1
View File
@@ -62,7 +62,7 @@
<td><?php echo $users[$story->openedBy];?></td>
<td><?php echo $users[$story->assignedTo];?></td>
<td><?php echo $story->estimate;?></td>
<td><span class='status-<?php echo $story->status;?>'><span class="label label-dot"></span> <?php echo zget($lang->story->statusList, $story->status);?></span></td>
<td><span class='status-<?php echo $story->status;?>'><?php echo zget($lang->story->statusList, $story->status);?></span></td>
<td><?php echo zget($lang->story->stageList, $story->stage);?></td>
<td class='c-actions'>
<?php
module/testcase/css/browse.css
+3 -2
View File
@@ -13,8 +13,9 @@
.dropdown-list > li > a:focus {color: #1a4f85;text-decoration: none;background-color: #ddd;}
.pl-5px{padding-left:5px;}
.fail a, .fail a .icon{color:#f00 !important}
.blocked a, .blocked a .icon{color:#f00 !important}
.fail .result-fail, .blocked .result-blocked{color:#f00;}
.pass .result-pass{color:green;}
tbody > tr > td > .btn-icon {margin-right: 3px;}
tbody > tr > td .icon-bug {margin-left: -8px;}
module/testcase/model.php
+4 -1
View File
@@ -1419,8 +1419,10 @@ class testcaseModel extends model
if(!helper::isZeroDate($case->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));
break;
case 'lastRunResult':
$class = 'result-' . $case->lastRunResult;
$lastRunResultText = $case->lastRunResult ? zget($this->lang->testcase->resultList, $case->lastRunResult, $case->lastRunResult) : $this->lang->testcase->unexecuted;
echo html::a(helper::createLink('testtask', 'results', "runID=0&caseID=$case->id", '', true), "<i class='icon icon-list-alt'></i> <span>{$lastRunResultText}</span>", '', "class='iframe btn btn-icon-left btn-sm'");
echo "<span class='$class'>" . $lastRunResultText . "</span>";
//html::a(helper::createLink('testtask', 'results', "runID=0&caseID=$case->id", '', true), "<i class='icon icon-list-alt'></i> <span>{$lastRunResultText}</span>", '', "class='iframe btn btn-icon-left btn-sm'");
break;
case 'bugs':
echo (common::hasPriv('testcase', 'bugs') and $case->bugs) ? html::a(helper::createLink('testcase', 'bugs', "runID=0&caseID={$case->id}"), $case->bugs, '', "class='iframe'") : $case->bugs;
@@ -1438,6 +1440,7 @@ class testcaseModel extends model
break;
}
common::printIcon('testtask', 'results', "runID=0&caseID=$case->id", $case, 'list', '', '', 'iframe', true);
common::printIcon('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->version", $case, 'list', 'play', '', 'runCase iframe', false, "data-width='95%'");
common::printIcon('testcase', 'edit', "caseID=$case->id", $case, 'list');
if($this->config->testcase->needReview or !empty($this->config->testcase->forceReview)) common::printIcon('testcase', 'review', "caseID=$case->id", $case, 'list', 'glasses', '', 'iframe');
module/testcase/view/groupcase.html.php
+1 -1
View File
@@ -82,7 +82,7 @@
}
else
{
echo "<span class='status-{$case->status}'><span class='label label-dot'></span><span class='status-text'>";
echo "<span class='status-{$case->status}'><span class='status-text'>";
echo $lang->testcase->statusList[$case->status];
echo '</span></span>';
}
module/testreport/view/blockbugs.html.php
-1
View File
@@ -23,7 +23,6 @@
<td><?php if($bug->resolvedDate != '0000-00-00 00:00:00') echo substr($bug->resolvedDate, 2);?></td>
<td title='<?php echo zget($lang->bug->statusList, $bug->status);?>'>
<span class="status-<?php echo $bug->status?>">
<span class="label label-dot"></span>
<span class='status-text'><?php echo zget($lang->bug->statusList, $bug->status);?></span>
</span>
</td>
module/testreport/view/blockcases.html.php
-1
View File
@@ -27,7 +27,6 @@
<td><?php echo zget($lang->testcase->resultList, $case->lastRunResult);?></td>
<td title='<?php echo zget($lang->testtask->statusList, $case->status);?>'>
<span class="status-<?php echo $case->status?>">
<span class="label label-dot"></span>
<span class='status-text'><?php echo zget($lang->testtask->statusList, $case->status);?></span>
</span>
</td>
module/testreport/view/blocklegacybugs.html.php
-1
View File
@@ -23,7 +23,6 @@
<td><?php if($bug->resolvedDate != '0000-00-00 00:00:00') echo substr($bug->resolvedDate, 2);?></td>
<td title='<?php echo zget($lang->bug->statusList, $bug->status);?>'>
<span class="status-<?php echo $bug->status?>">
<span class="label label-dot"></span>
<span class='status-text'><?php echo zget($lang->bug->statusList, $bug->status);?></span>
</span>
</td>
module/testreport/view/blockstories.html.php
-1
View File
@@ -24,7 +24,6 @@
<td><?php echo $story->estimate?></td>
<td title='<?php echo zget($lang->story->statusList, $story->status);?>'>
<span class="status-<?php echo $story->status?>">
<span class="label label-dot"></span>
<span class='status-text'><?php echo zget($lang->story->statusList, $story->status);?></span>
</span>
</td>
module/testtask/css/cases.css
+3
View File
@@ -9,3 +9,6 @@ tbody > tr > td .icon-bug {margin-left: -8px;}
.table-footer .table-actions .input-group #assignedTo_chosen .chosen-single{height:28px;padding:3px 6px}
.table-footer .table-actions .input-group #assignedTo_chosen .chosen-single span{font-size:12px;}
.table-footer .table-actions .input-group #assignedTo_chosen .chosen-single div{line-height:10px;}
.fail .result-fail, .blocked .result-blocked{color:#f00;}
.pass .result-pass{color:green;}
module/testtask/model.php
+3 -1
View File
@@ -1249,7 +1249,8 @@ class testtaskModel extends model
break;
case 'lastRunResult':
$lastRunResultText = $run->lastRunResult ? zget($this->lang->testcase->resultList, $run->lastRunResult, $run->lastRunResult) : $this->lang->testcase->unexecuted;
echo html::a(helper::createLink('testtask', 'results', "id={$run->id}", '', true), "<i class='icon icon-list-alt'></i> <span>{$lastRunResultText}</span>", '', "class='iframe btn btn-icon-left'");
$class = 'result-' . $run->lastRunResult;
echo "<span class='$class'>" . $lastRunResultText . "</span>";
break;
case 'story':
if($run->story and $run->storyTitle) echo html::a(helper::createLink('story', 'view', "storyID=$run->story"), $run->storyTitle);
@@ -1272,6 +1273,7 @@ class testtaskModel extends model
common::printIcon('testcase', 'createBug', "product=$run->product&branch=$run->branch&extra=projectID=$task->project,buildID=$task->build,caseID=$run->case,version=$run->version,runID=$run->id,testtask=$task->id", $run, 'list', 'bug', '', 'iframe', '', "data-width='90%'");
echo "</div>";
common::printIcon('testtask', 'results', "id=$run->id", $run, 'list', '', '', 'iframe', '', "data-width='90%'");
common::printIcon('testtask', 'runCase', "id=$run->id", $run, 'list', '', '', 'runCase iframe', false, "data-width='95%'");
if(common::hasPriv('testtask', 'unlinkCase', $run))
module/testtask/view/browse.html.php
-1
View File
@@ -93,7 +93,6 @@ $status = $this->session->testTaskVersionStatus;
<td><?php echo $task->end?></td>
<td title='<?php echo $lang->testtask->statusList[$task->status];?>'>
<span class='status-<?php echo $task->status?>'>
<span class='label label-dot'></span>
<span class='status-text'><?php echo $lang->testtask->statusList[$task->status];?></span>
</span>
</td>
module/testtask/view/cases.html.php
+1 -1
View File
@@ -45,7 +45,7 @@
if(!$useDatatable) include '../../common/view/tablesorter.html.php';
$config->testcase->datatable->defaultField = $config->testtask->datatable->defaultField;
$config->testcase->datatable->fieldList['actions']['width'] = '90';
$config->testcase->datatable->fieldList['actions']['width'] = '120';
$setting = $this->datatable->getSetting('testtask');
$widths = $this->datatable->setFixedFieldWidth($setting);