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

* Optimize pages.

Browse Source
This commit is contained in:
liugang
2018-05-15 16:02:31 +08:00
parent 9a5e6404c2
commit 05b7ecb71e
23 changed files with 167 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/view/buildblock.html.php
+4 -4
View File
@@ -14,10 +14,10 @@
<table class='table table-borderless table-hover table-fixed-head block-builds'>
<thead>
<tr>
<th width='50'><?php echo $lang->idAB?></th>
<th> <?php echo $lang->build->product;?></th>
<th> <?php echo $lang->build->name;?></th>
<th width='80'><?php echo $lang->build->date;?></th>
<th class='w-id text-center'><?php echo $lang->idAB?></th>
<th><?php echo $lang->build->product;?></th>
<th><?php echo $lang->build->name;?></th>
<th class='w-date'><?php echo $lang->build->date;?></th>
</tr>
</thead>
<tbody>
module/block/view/caseblock.html.php
+14 -14
View File
@@ -23,17 +23,17 @@
</style>
<table class='table table-borderless table-hover table-fixed-head block-cases <?php if(!$longBlock) echo 'block-sm';?>'>
<thead>
<tr>
<tr class='text-center'>
<?php if($longBlock):?>
<th class='c-id' width='50'><?php echo $lang->idAB?></th>
<th class='c-id'><?php echo $lang->idAB?></th>
<?php endif;?>
<th class='c-pri' width='50'><?php echo $lang->priAB?></th>
<th class='c-title'><?php echo $lang->case->title;?></th>
<th class='c-pri'><?php echo $lang->priAB?></th>
<th class='c-title text-left'><?php echo $lang->case->title;?></th>
<?php if($longBlock):?>
<th class='c-runtime' width='120'> <?php echo $lang->testtask->lastRunTime;?></th>
<th class='c-result' width='60'> <?php echo $lang->testtask->lastRunResult;?></th>
<th class='c-runtime'><?php echo $lang->testtask->lastRunTime;?></th>
<th class='c-result'><?php echo $lang->testtask->lastRunResult;?></th>
<?php endif;?>
<th class='c-status' width='70'><?php echo $lang->statusAB;?></th>
<th class='c-status'><?php echo $lang->statusAB;?></th>
</tr>
</thead>
<tbody>
@@ -42,17 +42,17 @@
$appid = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : '';
$viewLink = $this->createLink('testcase', 'view', "caseID={$case->id}");
?>
<tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
<tr class='text-center' data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
<?php if($longBlock):?>
<td class='text-center c-id'><?php echo $case->id;?></td>
<td class='c-id'><?php echo $case->id;?></td>
<?php endif;?>
<td class='text-center c-pri'><span class='label-pri label-pri-<?php echo $case->pri?>'><?php echo zget($lang->case->priList, $case->pri, $case->pri)?></span></td>
<td class='c-title' style='color: <?php echo $case->color?>' title='<?php echo $case->title?>'><?php echo $case->title?></td>
<td class='c-pri'><span class='label-pri label-pri-<?php echo $case->pri?>'><?php echo zget($lang->case->priList, $case->pri, $case->pri)?></span></td>
<td class='c-title text-left' style='color: <?php echo $case->color?>' title='<?php echo $case->title?>'><?php echo $case->title?></td>
<?php if($longBlock):?>
<td class='text-center c-runtime'><?php if(!helper::isZeroDate($case->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?></td>
<td class='text-center c-result'><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
<td class='c-runtime'><?php if(!helper::isZeroDate($case->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?></td>
<td class='c-result'><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
<?php endif;?>
<td class='text-left c-status' title='<?php echo zget($lang->testcase->statusList, $case->status)?>'>
<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>
module/block/view/productblock.html.php
+7 -7
View File
@@ -15,11 +15,11 @@
<thead>
<tr>
<th class='c-name'><?php echo $lang->product->name;?></th>
<th class='c-num'><?php echo $lang->product->plans;?></th>
<th class='c-num'><?php echo $lang->product->releases;?></th>
<?php if($longBlock):?>
<th class='c-name'><?php echo $lang->product->currentProject;?></th>
<?php endif;?>
<th class='c-num'><?php echo $lang->product->plans;?></th>
<th class='c-num'><?php echo $lang->product->releases;?></th>
<th class='c-num'><?php echo $lang->story->statusList['active'] . $lang->story->common;?></th>
<th class='c-num'><?php echo $lang->bug->unResolved . $lang->bug->common;?></th>
</tr>
@@ -30,13 +30,13 @@
$appid = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : "";
$viewLink = $this->createLink('product', 'browse', 'productID=' . $product->id);
?>
<tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
<td class='c-name' title='<?php echo $product->name?>'><?php echo $product->name?></td>
<tr class='text-center' data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
<td class='c-name text-left' title='<?php echo $product->name?>'><?php echo $product->name?></td>
<?php if($longBlock):?>
<td class='c-name text-left'><?php echo zget($projects, $product->id, '');?></td>
<?php endif;?>
<td class="c-num"><?php echo $product->plans?></td>
<td class="c-num"><?php echo $product->releases?></td>
<?php if($longBlock):?>
<td class='c-name'><?php echo zget($projects, $product->id, '');?></td>
<?php endif;?>
<td class="c-num"><?php echo $product->stories['active']?></td>
<td class="c-num"><?php echo $product->unResolved?></td>
</tr>
module/block/view/releaseblock.html.php
+17 -4
View File
@@ -14,12 +14,16 @@
<table class='table table-borderless table-hover table-fixed block-release'>
<thead>
<tr>
<th class='text-center w-50px'><?php echo $lang->idAB?></th>
<?php if($longBlock):?>
<th class='c-id text-center'><?php echo $lang->idAB?></th>
<th><?php echo $lang->release->product;?></th>
<?php endif;?>
<th><?php echo $lang->release->name;?></th>
<?php if($longBlock):?>
<th><?php echo $lang->release->build;?></th>
<th class='text-center w-80px'><?php echo $lang->release->date;?></th>
<th class='text-center w-70px'><?php echo $lang->release->status;?></th>
<?php endif;?>
<th class='c-date text-center'><?php echo $lang->release->date;?></th>
<th class='text-center w-90px'><?php echo $lang->release->status;?></th>
</tr>
</thead>
<tbody>
@@ -29,12 +33,21 @@
$viewLink = $this->createLink('release', 'view', "releaseID={$release->id}");
?>
<tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
<?php if($longBlock):?>
<td class='text-center'><?php echo $release->id;?></td>
<td title='<?php echo $release->productName?>'><?php echo $release->productName?></td>
<?php endif;?>
<td title='<?php echo $release->name?>'><?php echo $release->name?></td>
<?php if($longBlock):?>
<td title='<?php echo $release->buildName?>'><?php echo $release->buildName?></td>
<?php endif;?>
<td class='text-center'><?php echo $release->date?></td>
<td class='text-center'><?php echo $lang->release->statusList[$release->status]?></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>
</tr>
<?php endforeach;?>
</tbody>
module/block/view/storyblock.html.php
+11 -2
View File
@@ -14,7 +14,9 @@
<table class='table table-borderless table-hover table-fixed-head block-stories <?php if(!$longBlock) echo 'block-sm'?>'>
<thead>
<tr>
<?php if($longBlock):?>
<th class="c-id"><?php echo $lang->idAB?></th>
<?php endif;?>
<th class="c-pri"><?php echo $lang->priAB?></th>
<th class="c-name"><?php echo $lang->story->title;?></th>
<?php if($longBlock):?>
@@ -33,14 +35,21 @@
$viewLink = $this->createLink('story', 'view', "storyID={$story->id}");
?>
<tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
<?php if($longBlock):?>
<td class="c-id"><?php echo $story->id;?></td>
<?php endif;?>
<?php $pri = zget($lang->story->priList, $story->pri, $story->pri);?>
<td class="c-pri"><span class="label-pri label-pri-<?php echo $pri?>"><?php echo $pri?></span></td>
<td class="c-name" style='color: <?php echo $story->color?>' title='<?php echo $story->title?>'><?php echo $story->title?></td>
<?php if($longBlock):?>
<td class='c-estimate'><?php echo $story->estimate?></td>
<td class='c-estimate text-center'><?php echo $story->estimate?></td>
<?php endif;?>
<td class='c-status'><?php echo zget($lang->story->statusList, $story->status);?></td>
<td class='c-status' title='<?php echo zget($lang->story->statusList, $story->status);?>'>
<span class="story-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>
<?php if($longBlock):?>
<td class='c-stage'>
<span class='story-stage-<?php echo $story->stage?>'>
module/block/view/taskblock.html.php
+2 -2
View File
@@ -21,7 +21,7 @@
<th class='c-estimate'><?php echo $lang->task->estimateAB;?></th>
<th class='c-deadline'><?php echo $lang->task->deadline;?></th>
<?php endif;?>
<th class='c-status'><?php echo $lang->statusAB;?></th>
<th class='c-status text-center'><?php echo $lang->statusAB;?></th>
</tr>
</thead>
<tbody>
@@ -35,7 +35,7 @@
<td class='c-pri'><span class='label-pri label-pri-<?php echo $task->pri;?>'><?php echo zget($lang->task->priList, $task->pri, $task->pri)?></span></td>
<td class='c-name' style='color: <?php echo $task->color?>' title='<?php echo $task->name?>'><?php echo $task->name?></td>
<?php if($longBlock):?>
<td class='c-estimate'><?php echo $task->estimate?></td>
<td class='c-estimate text-center'><?php echo $task->estimate?></td>
<td class='c-deadline'><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
<?php endif;?>
<td class='c-status' title='<?php echo zget($lang->task->statusList, $task->status)?>'>
module/block/view/testtaskblock.html.php
+20 -12
View File
@@ -13,13 +13,17 @@
<div class='panel-body has-table'>
<table class='table table-borderless table-hover table-fixed-head block-testtask'>
<thead>
<tr>
<th width='30'><?php echo $lang->idAB?></th>
<th width='80'><?php echo $lang->testtask->product;?></th>
<th width='80'> <?php echo $lang->testtask->name;?></th>
<th width='80'><?php echo $lang->testtask->project . '/' . $lang->testtask->build;?></th>
<th width='50'><?php echo $lang->testtask->begin;?></th>
<th width='50'><?php echo $lang->testtask->end;?></th>
<tr class='text-center'>
<?php if($longBlock):?>
<th class='w-id'><?php echo $lang->idAB?></th>
<th class='text-left'><?php echo $lang->testtask->product;?></th>
<?php endif;?>
<th class='text-left'><?php echo $lang->testtask->name;?></th>
<?php if($longBlock):?>
<th class='text-left'><?php echo $lang->testtask->project . '/' . $lang->testtask->build;?></th>
<?php endif;?>
<th class='w-date'><?php echo $lang->testtask->begin;?></th>
<th class='w-date'><?php echo $lang->testtask->end;?></th>
</tr>
</thead>
<tbody>
@@ -28,11 +32,15 @@
$appid = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : '';
$viewLink = $this->createLink('testtask', 'view', "testtaskID={$testtask->id}");
?>
<tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
<td class='text-center'><?php echo $testtask->id;?></td>
<td title='<?php echo $testtask->productName?>'><?php echo $testtask->productName?></td>
<td title='<?php echo $testtask->name?>'><?php echo $testtask->name?></td>
<td class='text-center' title='<?php echo $testtask->projectName . '/' . $testtask->buildName?>'><?php echo $testtask->projectName . '/' . $testtask->buildName?></td>
<tr class='text-center' data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
<?php if($longBlock):?>
<td><?php echo $testtask->id;?></td>
<td class='text-left' title='<?php echo $testtask->productName?>'><?php echo $testtask->productName?></td>
<?php endif;?>
<td class='text-left' title='<?php echo $testtask->name?>'><?php echo $testtask->name?></td>
<?php if($longBlock):?>
<td class='text-left' title='<?php echo $testtask->projectName . '/' . $testtask->buildName?>'><?php echo $testtask->projectName . '/' . $testtask->buildName?></td>
<?php endif;?>
<td><?php echo $testtask->begin?></td>
<td><?php echo $testtask->end?></td>
</tr>
module/bug/model.php
+14 -3
View File
@@ -2398,9 +2398,18 @@ class bugModel extends model
if($col->show)
{
$class = "c-$id";
if($id == 'status') $class .= ' bug-' . $bug->status;
if($id == 'title') $class .= ' text-left';
$title = '';
if($id == 'id') $class .= ' cell-id';
if($id == 'status')
{
$class .= ' bug-' . $bug->status;
$title = "title='" . zget($this->lang->bug->statusList, $bug->status) . "'";
}
if($id == 'title')
{
$class .= ' text-left';
$title = "title='{$bug->title}";
}
if($id == 'assignedTo')
{
$class .= ' has-btn text-left';
@@ -2408,7 +2417,7 @@ class bugModel extends model
}
if($id == 'deadline' && isset($bug->delay)) $class .= ' delayed';
echo "<td class='" . $class . "'" . ($id=='title' ? " title='{$bug->title}'" : '') . ">";
echo "<td class='" . $class . "' $title>";
switch($id)
{
case 'id':
@@ -2463,7 +2472,9 @@ class bugModel extends model
echo zget($this->lang->bug->typeList, $bug->type);
break;
case 'status':
echo "<span class='bug-status-{$bug->status}'><span class='label label-dot'></span><span class='status-text'>";
echo zget($this->lang->bug->statusList, $bug->status);
echo '</span></span>';
break;
case 'activatedCount':
echo $bug->activatedCount;
module/common/lang/en.php
-3
View File
@@ -657,9 +657,6 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTask')
unset($lang->product->menu);
unset($lang->product->menuOrder);
$lang->project->menu->task['subModule'] = 'task';
$lang->project->menu->task['alias'] = 'grouptask,importtask';
unset($lang->searchObjects['bug']);
unset($lang->searchObjects['story']);
unset($lang->searchObjects['product']);
module/common/lang/zh-cn.php
-3
View File
@@ -657,9 +657,6 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTask')
unset($lang->product->menu);
unset($lang->product->menuOrder);
$lang->project->menu->task['subModule'] = 'task';
$lang->project->menu->task['alias'] = 'grouptask,importtask';
unset($lang->searchObjects['bug']);
unset($lang->searchObjects['story']);
unset($lang->searchObjects['product']);
module/common/lang/zh-tw.php
-3
View File
@@ -657,9 +657,6 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTask')
unset($lang->product->menu);
unset($lang->product->menuOrder);
$lang->project->menu->task['subModule'] = 'task';
$lang->project->menu->task['alias'] = 'grouptask,importtask';
unset($lang->searchObjects['bug']);
unset($lang->searchObjects['story']);
unset($lang->searchObjects['product']);
module/product/lang/zh-tw.php
+1
View File
@@ -73,6 +73,7 @@ $lang->product->branch = '所屬%s';
$lang->product->qa = '測試';
$lang->product->release = '發佈';
$lang->product->latestDynamic = '最新動態';
$lang->product->plan = '計劃';
$lang->product->iteration = '版本迭代';
$lang->product->iterationInfo = '迭代 %s 次';
$lang->product->iterationView = '查看詳情';
module/product/view/project.html.php
+12 -2
View File
@@ -40,9 +40,19 @@
<td><?php echo $project->code;?></td>
<td><?php echo $project->end;?></td>
<?php if(isset($project->delay)):?>
<td class='status-delay'><?php echo $lang->project->delayed;?></td>
<td class='c-status' title='<?php echo $lang->project->delayed;?>'>
<span class="project-status-delayed">
<span class="label label-dot"></span>
<span class='status-text'><?php echo $lang->project->delayed;?></span>
</span>
</td>
<?php else:?>
<td class='status-<?php echo $project->status?>'><?php echo $lang->project->statusList[$project->status];?></td>
<td class='c-status' title='<?php echo zget($lang->project->statusList, $project->status);?>'>
<span class="project-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>
<?php endif;?>
<td><?php echo $project->hours->totalEstimate;?></td>
<td><?php echo $project->hours->totalConsumed;?></td>
module/project/view/all.html.php
+12 -2
View File
@@ -75,9 +75,19 @@
<td><?php echo $users[$project->PM];?></td>
<td><?php echo $project->end;?></td>
<?php if(isset($project->delay)):?>
<td><span class='status-delay'><span class="label label-dot"></span> <?php echo $lang->project->delayed;?></span></td>
<td class='c-status' title='<?php echo $lang->project->delayed;?>'>
<span class="project-status-delayed">
<span class="label label-dot"></span>
<span class='status-text'><?php echo $lang->project->delayed;?></span>
</span>
</td>
<?php else:?>
<td><span class='status-<?php echo $project->status?>'><span class="label label-dot"></span> <?php echo $lang->project->statusList[$project->status];?></span></td>
<td class='c-status' title='<?php echo zget($lang->project->statusList, $project->status);?>'>
<span class="project-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>
<?php endif;?>
<td><?php echo $project->hours->totalEstimate;?></td>
<td><?php echo $project->hours->totalConsumed;?></td>
module/project/view/story.html.php
+6 -1
View File
@@ -141,7 +141,12 @@
<td><?php echo $users[$story->openedBy];?></td>
<td><?php echo $users[$story->assignedTo];?></td>
<td><?php echo $story->estimate;?></td>
<td class='story-<?php echo $story->status;?>'><?php echo zget($lang->story->statusList, $story->status);?></td>
<td title='<?php echo zget($lang->story->statusList, $story->status);?>'>
<span class='story-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>
<td><?php echo $lang->story->stageList[$story->stage];?></td>
<td class='linkbox'>
<?php
module/project/view/testtask.html.php
+6 -1
View File
@@ -78,7 +78,12 @@
<td><?php echo $users[$task->owner];?></td>
<td><?php echo $task->begin?></td>
<td><?php echo $task->end?></td>
<td class='status-<?php echo $task->status?>'><?php echo $lang->testtask->statusList[$task->status];?></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>
<td class='c-actions'>
<div class='more'>
<?php
module/release/view/browse.html.php
+14 -13
View File
@@ -33,9 +33,9 @@
<?php if($product->type != 'normal'):?>
<th class='text-center w-100px'><?php echo $lang->product->branch;?></th>
<?php endif;?>
<th class='text-center w-100px'><?php echo $lang->release->date;?></th>
<th class='text-center w-100px'><?php echo $lang->release->status;?></th>
<th class='c-actions-3'><?php echo $lang->actions;?></th>
<th class='c-date text-center'><?php echo $lang->release->date;?></th>
<th class='text-center w-90px'><?php echo $lang->release->status;?></th>
<th class='c-actions-4 text-center'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
@@ -48,17 +48,13 @@
<td class='text-center'><?php echo $branches[$release->branch];?></td>
<?php endif;?>
<td class='text-center'><?php echo $release->date;?></td>
<td class='text-center'><?php echo $lang->release->statusList[$release->status];?></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>
<td class='c-actions'>
<div class='more'>
<?php
if(common::hasPriv('release', 'delete', $release))
{
$deleteURL = $this->createLink('release', 'delete', "releaseID=$release->id&confirm=yes");
echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"releaseList\",confirmDelete)", '<i class="icon-trash"></i>', '', "class='btn' title='{$lang->release->delete}'");
}
?>
</div>
<?php
if(common::hasPriv('release', 'linkStory')) echo html::a(inlink('view', "releaseID=$release->id&type=story&link=true"), '<i class="icon-link"></i> ', '', "class='btn' title='{$lang->release->linkStory}'");
if(common::hasPriv('release', 'linkBug') and $this->config->global->flow != 'onlyStory') echo html::a(inlink('view', "releaseID=$release->id&type=bug&link=true"), '<i class="icon-bug"></i> ', '', "class='btn' title='{$lang->release->linkBug}'");
@@ -68,6 +64,11 @@
echo html::a(inlink('changeStatus', "releaseID=$release->id&status=$changedStatus"), '<i class="icon-' . ($release->status == 'normal' ? 'pause' : 'play') . '"></i> ', 'hiddenwin', "class='btn' title='{$lang->release->changeStatusList[$changedStatus]}'");
}
common::printIcon('release', 'edit', "release=$release->id", $release, 'list');
if(common::hasPriv('release', 'delete', $release))
{
$deleteURL = $this->createLink('release', 'delete', "releaseID=$release->id&confirm=yes");
echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"releaseList\",confirmDelete)", '<i class="icon-trash"></i>', '', "class='btn' title='{$lang->release->delete}'");
}
?>
</td>
</tr>
module/story/lang/zh-cn.php
+1 -1
View File
@@ -181,7 +181,7 @@ $lang->story->lblReview = '评审需求';
$lang->story->lblActivate = '激活需求';
$lang->story->lblClose = '关闭需求';
$lang->story->checkAffection = '检查影响';
$lang->story->checkAffection = '影响范围';
$lang->story->affectedProjects = '影响的' . $lang->projectCommon;
$lang->story->affectedBugs = '影响的Bug';
$lang->story->affectedCases = '影响的用例';
module/story/lang/zh-tw.php
+1 -1
View File
@@ -181,7 +181,7 @@ $lang->story->lblReview = '評審需求';
$lang->story->lblActivate = '激活需求';
$lang->story->lblClose = '關閉需求';
$lang->story->checkAffection = '檢查影響';
$lang->story->checkAffection = '影響範圍';
$lang->story->affectedProjects = '影響的' . $lang->projectCommon;
$lang->story->affectedBugs = '影響的Bug';
$lang->story->affectedCases = '影響的用例';
module/testcase/model.php
+16 -5
View File
@@ -1289,19 +1289,28 @@ class testcaseModel extends model
if($col->show)
{
$class = '';
if($id == 'status') $class .= $case->status;
if($id == 'title') $class .= ' text-left';
if($id == 'actions')$class .= ' c-actions';
$title = '';
if($id == 'title')
{
$class .= ' text-left';
$title = "title='{$case->title}'";
}
if($id == 'status')
{
$class .= $case->status;
$title = "title='" . zget($this->lang->testcase->statusList, $case->status) . "'";
}
if($id == 'actions') $class .= ' c-actions';
if($id == 'lastRunResult') $class .= $case->lastRunResult;
echo "<td class='" . $class . "'" . ($id=='title' ? " title='{$case->title}'":'') . ">";
echo "<td class='{$class}' {$title}>";
switch($id)
{
case 'id':
echo $mode == 'table' ? html::checkbox('caseIDList', array($case->id => sprintf('%03d', $case->id))) : sprintf('%03d', $case->id);
break;
case 'pri':
echo "<span class='pri" . zget($this->lang->testcase->priList, $case->pri, $case->pri) . "'>";
echo "<span class='label-pri label-pri-" . $case->pri . "'>";
echo zget($this->lang->testcase->priList, $case->pri, $case->pri);
echo "</span>";
break;
@@ -1331,7 +1340,9 @@ class testcaseModel extends model
}
else
{
echo "<span class='status-{$case->status}'><span class='label label-dot'></span><span class='status-text'>";
echo $this->lang->testcase->statusList[$case->status];
echo '</span></span>';
}
break;
case 'story':
module/testcase/view/groupcase.html.php
+2
View File
@@ -71,7 +71,9 @@
}
else
{
echo "<span class='status-{$case->status}'><span class='label label-dot'></span><span class='status-text'>";
echo $lang->testcase->statusList[$case->status];
echo '</span></span>';
}
?>
</td>
module/testcase/view/view.html.php
+1 -1
View File
@@ -286,6 +286,7 @@
<?php
if(!$isLibCase)
{
echo "<div class='divider'></div>";
common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$case->id&version=$case->currentVersion", $case, 'button', '', '', 'runCase', false, "data-width='95%'");
common::printIcon('testtask', 'results', "runID=$runID&caseID=$case->id&version=$case->version", $case, 'button', '', '', 'results', false, "data-width='95%'");
@@ -293,7 +294,6 @@
}
if($config->testcase->needReview or !empty($config->testcase->forceReview)) common::printIcon('testcase', 'review', "caseID=$case->id", $case, 'button', 'review', '', 'iframe');
?>
<div class='divider'></div>
<?php
common::printIcon('testcase', 'edit',"caseID=$case->id", $case);
if(!$isLibCase) common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase&param=$case->id", $case, 'button', 'copy');
module/testtask/view/browse.html.php
+6 -1
View File
@@ -80,7 +80,12 @@ $status = $this->session->testTaskVersionStatus;
<td><?php echo zget($users, $task->owner);?></td>
<td><?php echo $task->begin?></td>
<td><?php echo $task->end?></td>
<td class='status-<?php echo $task->status?>'><?php echo $lang->testtask->statusList[$task->status];?></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>
<td class='c-actions'>
<?php
if(common::hasPriv('testtask', 'delete', $task))