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

* change status label colors.

Browse Source
This commit is contained in:
Catouse
2018-10-08 10:14:56 +08:00
parent e427eb88d9
commit 55fecfe0be
48 changed files with 95 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/view/bugblock.html.php
+1 -3
View File
@@ -50,9 +50,7 @@
</td>
<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='status-text'><?php echo zget($lang->bug->statusList, $bug->status);?></span>
</span>
<span class="status-bug status-<?php echo $bug->status?>"><?php echo zget($lang->bug->statusList, $bug->status);?></span>
</td>
</tr>
<?php endforeach;?>
module/block/view/productoverviewblock.html.php
+3 -3
View File
@@ -5,7 +5,7 @@
* @copyright Copyright 2009-2018 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Gang Liu <liugang@cnezsoft.com>
* @package block
* @package block
* @version $Id$
* @link http://www.zentao.net
*/
@@ -30,8 +30,8 @@
</div>
<div class="col-6 text-middle">
<ul class="list-unstyled status-list">
<li><span class="status-unclosed"><span class="label label-dot label-primary"></span> <?php echo $lang->product->statusList['normal'];?></span> &nbsp; <strong><?php echo $normal;?></strong></li>
<li><span class="status-closed"><span class="label label-dot label-pale"></span> <?php echo $lang->product->statusList['closed'];?></span> &nbsp; <strong><?php echo $closed;?></strong></li>
<li><span class="status-product status-unclosed"><?php echo $lang->product->statusList['normal'];?></span> &nbsp; <strong><?php echo $normal;?></strong></li>
<li><span class="status-product status-closed"><?php echo $lang->product->statusList['closed'];?></span> &nbsp; <strong><?php echo $closed;?></strong></li>
</ul>
</div>
</div>
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"><?php echo $lang->project->delayed;?></span>
<span class="status-project status-delayed"><?php echo $lang->project->delayed;?></span>
<?php else:?>
<span class="status-<?php echo $project->status?>"><?php echo zget($lang->project->statusList, $project->status, '');?></span>
<span class="status-project 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 -3
View File
@@ -46,9 +46,7 @@
<?php endif;?>
<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='status-text'><?php echo zget($lang->release->statusList, $release->status);?></span>
</span>
<span class="status-release status-<?php echo $release->status?>"><?php echo zget($lang->release->statusList, $release->status);?></span>
</td>
</tr>
<?php endforeach;?>
module/block/view/storyblock.html.php
+1 -3
View File
@@ -57,9 +57,7 @@
<td class='c-estimate text-center'><?php echo $story->estimate?></td>
<?php endif;?>
<td class='c-status' title='<?php echo zget($lang->story->statusList, $story->status);?>'>
<span class="status-<?php echo $story->status?>">
<span class='status-text'><?php echo zget($lang->story->statusList, $story->status);?></span>
</span>
<span class="status-story status-<?php echo $story->status?>"><?php echo zget($lang->story->statusList, $story->status);?></span>
</td>
<?php if($longBlock):?>
<td class='c-stage'>
module/block/view/taskblock.html.php
+1 -3
View File
@@ -50,9 +50,7 @@
<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)?>'>
<span class="status-<?php echo $task->status?>">
<span class='status-text'><?php echo zget($lang->task->statusList, $task->status);?></span>
</span>
<span class="status-task status-<?php echo $task->status?>"><?php echo zget($lang->task->statusList, $task->status);?></span>
</td>
</tr>
<?php endforeach;?>
module/bug/model.php
+5 -5
View File
@@ -2523,9 +2523,9 @@ class bugModel extends model
echo zget($this->lang->bug->typeList, $bug->type);
break;
case 'status':
echo "<span class='status-{$bug->status}'><span class='status-text'>";
echo "<span class='status-bug status-{$bug->status}'>";
echo zget($this->lang->bug->statusList, $bug->status);
echo '</span></span>';
echo '</span>';
break;
case 'activatedCount':
echo $bug->activatedCount;
@@ -2627,9 +2627,9 @@ class bugModel extends model
/**
* Print assigned html.
*
* @param object $bug
* @param array $users
*
* @param object $bug
* @param array $users
* @access public
* @return void
*/
module/bug/view/view.html.php
+1 -1
View File
@@ -151,7 +151,7 @@
</tr>
<tr>
<th><?php echo $lang->bug->status;?></th>
<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-bug status-<?php echo $bug->status?>'><?php echo $lang->bug->statusList[$bug->status];?></span></td>
</tr>
<tr>
<th><?php echo $lang->bug->activatedCount;?></th>
module/build/view/linkbug.html.php
+2 -2
View File
@@ -16,7 +16,7 @@
<div class='table-header hl-primary text-primary strong'>
<?php echo html::icon('unlink');?> <?php echo $lang->productplan->unlinkedBugs;?>
</div>
<table class='table tablesorter'>
<table class='table tablesorter'>
<thead>
<tr class='text-center'>
<th class='c-id text-left'>
@@ -48,7 +48,7 @@
<td><?php echo $users[$bug->openedBy];?></td>
<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='status-bug status-<?php echo $bug->status?>'>
<?php echo $lang->bug->statusList[$bug->status];?>
</span>
</td>
module/build/view/linkstory.html.php
+2 -2
View File
@@ -16,7 +16,7 @@
<div class='table-header hl-primary text-primary strong'>
<?php echo html::icon('unlink');?> <?php echo $lang->productplan->unlinkedStories;?>
</div>
<table class='table tablesorter'>
<table class='table tablesorter'>
<thead>
<tr class='text-center'>
<th class='c-id text-left'>
@@ -51,7 +51,7 @@
<td><?php echo $users[$story->assignedTo];?></td>
<td><?php echo $story->estimate;?></td>
<td>
<span class='status-<?php echo $story->status?>'>
<span class='status-story status-<?php echo $story->status?>'>
<?php echo $lang->story->statusList[$story->status];?>
</span>
</td>
module/build/view/view.html.php
+3 -3
View File
@@ -126,7 +126,7 @@ tbody tr td:first-child input{display:none;}
<td><?php echo $users[$story->openedBy];?></td>
<td><?php echo $story->estimate;?></td>
<td>
<span class='status-<?php echo $story->status;?>'>
<span class='status-story status-<?php echo $story->status;?>'>
<?php echo $lang->story->statusList[$story->status];?>
</span>
</td>
@@ -197,7 +197,7 @@ tbody tr td:first-child input{display:none;}
<?php endif;?>
<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='status-bug status-<?php echo $bug->status?>'>
<?php echo $lang->bug->statusList[$bug->status];?>
</span>
</td>
@@ -257,7 +257,7 @@ tbody tr td:first-child input{display:none;}
</td>
<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='status-bug status-<?php echo $bug->status?>'>
<?php echo $lang->bug->statusList[$bug->status];?>
</span>
</td>
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"> <?php echo $lang->project->delayed;?></span>
<span class="status-project status-delayed"> <?php echo $lang->project->delayed;?></span>
<?php else:?>
<span class="status-<?php echo $project->status?>"> <?php echo zget($lang->project->statusList, $project->status, '');?></span>
<span class="status-project 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;?>'> <?php echo zget($lang->story->statusList, $story->status);?></span></td>
<td class='c-status'><span class='status-story 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 -1
View File
@@ -84,7 +84,7 @@
<td class='c-hours'><?php echo $task->consumed;?></td>
<td class='c-hours'><?php echo $task->left;?></td>
<td class='c-date <?php if(isset($task->delay)) echo 'text-red';?>'><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
<td class='c-status'><span class="status-<?php echo $task->status;?>"><?php echo $lang->task->statusList[$task->status];?></span></td>
<td class='c-status'><span class="status-task status-<?php echo $task->status;?>"><?php echo $lang->task->statusList[$task->status];?></span></td>
<td class='c-actions'>
<?php
if($task->needConfirm)
module/my/view/testtask.html.php
+1 -1
View File
@@ -52,7 +52,7 @@
<td class='nobr'><?php $task->build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?></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 class='status-testtask status-<?php echo $task->status?>'><?php echo $lang->testtask->statusList[$task->status];?></td>
<td class='c-actions'>
<?php
common::printIcon('testtask', 'cases', "taskID=$task->id", $task, 'list', 'sitemap');
module/my/view/todo.html.php
+1 -1
View File
@@ -94,7 +94,7 @@
<td class="c-name" title="<?php echo $todo->name;?>"><?php echo html::a($this->createLink('todo', 'view', "id=$todo->id&from=my", '', true), $todo->name, '', "data-toggle='modal' data-type='iframe' data-title='" . $lang->todo->view . "' data-icon='check'");?></td>
<td class="c-begin"><?php echo $todo->begin;?></td>
<td class="c-end"><?php echo $todo->end;?></td>
<td class="c-status"><span class="status-<?php echo $todo->status;?>"><?php echo $lang->todo->statusList[$todo->status];?></span></td>
<td class="c-status"><span class="status-todo status-<?php echo $todo->status;?>"><?php echo $lang->todo->statusList[$todo->status];?></span></td>
<td class="c-actions">
<?php
if($todo->status == 'done' or $todo->status == 'closed')
module/product/view/project.html.php
+2 -6
View File
@@ -51,15 +51,11 @@
<td><?php echo $project->end;?></td>
<?php if(isset($project->delay)):?>
<td class='c-status' title='<?php echo $lang->project->delayed;?>'>
<span class="status-delayed">
<span class='status-text'><?php echo $lang->project->delayed;?></span>
</span>
<span class="status-project status-delayed"><?php echo $lang->project->delayed;?></span>
</td>
<?php else:?>
<td class='c-status' title='<?php echo zget($lang->project->statusList, $project->status);?>'>
<span class="status-<?php echo $project->status?>">
<span class='status-text'><?php echo zget($lang->project->statusList, $project->status);?></span>
</span>
<span class="status-project status-<?php echo $project->status?>"><?php echo zget($lang->project->statusList, $project->status);?></span>
</td>
<?php endif;?>
<td><?php echo $project->hours->totalEstimate;?></td>
module/productplan/view/linkbug.html.php
+1 -1
View File
@@ -47,7 +47,7 @@
<td><?php echo $users[$bug->openedBy];?></td>
<td><?php echo $users[$bug->assignedTo];?></td>
<td>
<span class='status-<?php echo $bug->status?>'>
<span class='status-bug status-<?php echo $bug->status?>'>
<?php echo $lang->bug->statusList[$bug->status];?>
</span>
</td>
module/productplan/view/linkstory.html.php
+1 -1
View File
@@ -54,7 +54,7 @@
<td><?php echo zget($users, $story->assignedTo);?></td>
<td><?php echo $story->estimate;?></td>
<td>
<span class='status-<?php echo $story->status?>'>
<span class='status-story status-<?php echo $story->status?>'>
<?php echo $lang->story->statusList[$story->status];?>
</span>
</td>
module/productplan/view/view.html.php
+2 -2
View File
@@ -141,7 +141,7 @@
<td><?php echo zget($users, $story->assignedTo);?></td>
<td><?php echo $story->estimate;?></td>
<td>
<span class='status-<?php echo $story->status?>'>
<span class='status-story status-<?php echo $story->status?>'>
<?php echo $lang->story->statusList[$story->status];?>
</span>
</td>
@@ -376,7 +376,7 @@
<td><?php echo zget($users, $bug->openedBy);?></td>
<td><?php echo zget($users, $bug->assignedTo);?></td>
<td>
<span class='status-<?php echo $bug->status?>'>
<span class='status-bug status-<?php echo $bug->status?>'>
<?php echo $lang->bug->statusList[$bug->status];?>
</span>
</td>
module/project/view/all.html.php
+1 -3
View File
@@ -79,9 +79,7 @@
<td><?php echo $users[$project->PM];?></td>
<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='status-text'><?php echo zget($lang->project->statusList, $project->status);?></span>
</span>
<span class="status-project status-<?php echo $project->status?>"><?php echo zget($lang->project->statusList, $project->status);?></span>
</td>
<td><?php echo $project->hours->totalEstimate;?></td>
<td><?php echo $project->hours->totalConsumed;?></td>
module/project/view/grouptask.html.php
+1 -1
View File
@@ -193,7 +193,7 @@
if(!common::printLink('task', 'view', "task=$task->id", $task->name)) echo $task->name;
?>
</td>
<td class="c-status"><span class='status-<?php echo $task->status;?>'> <?php echo $lang->task->statusList[$task->status];?></span></td>
<td class="c-status"><span class='status-task status-<?php echo $task->status;?>'> <?php echo $lang->task->statusList[$task->status];?></span></td>
<td class="c-assign"><?php echo "<span class='$assignedToClass'>" . $task->assignedToRealName . "</span>";?></td>
<td class='c-user'><?php echo zget($users, $task->finishedBy);?></td>
<td class="c-hours em"><?php echo $task->estimate;?></td>
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?>'><?php echo $lang->bug->statusList[$bug->status];?></span></td>
<td><span class='status-bug 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
+2 -2
View File
@@ -60,12 +60,12 @@
<td><?php echo $task->left;?></td>
<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='status-task status-<?php echo $task->status;?>'>
<?php echo $lang->task->statusList[$task->status];?>
</span>
</td>
<td class='text-left nobr'>
<?php
<?php
if($task->storyID)
{
if(common::hasPriv('story', 'view'))
module/project/view/kanban.html.php
+7 -7
View File
@@ -3,7 +3,7 @@
* The kanban view file of project module of ZenTaoPMS.
*
* @copyright Copyright 2009-2012 青岛易软天创网络科技有限公司 (QingDao Nature Easy Soft Network Technology Co,LTD www.cnezsoft.com)
* @author Wang Yidong, Zhu Jinyong
* @author Wang Yidong, Zhu Jinyong
* @package project
* @version $Id: kanban.html.php $
*/
@@ -13,7 +13,7 @@
<div class='btn-toolbar pull-right'>
<?php echo html::a($this->createLink('project', 'ajaxKanbanSetting', "projectID=$projectID"), "<i class='icon-cog muted'></i> " . $lang->project->kanbanSetting, '', "class='iframe btn btn-link'");?>
<?php if(common::hasPriv('project', 'printKanban')) echo html::a($this->createLink('project', 'printKanban', "projectID=$projectID"), "<i class='icon-printer muted'></i> " . $lang->project->printKanban, '', "class='iframe btn btn-link' id='printKanban' title='{$lang->project->printKanban}' data-width='500'");?>
<?php
<?php
$link = $this->createLink('task', 'export', "project=$projectID&orderBy=$orderBy&type=$browseType");
if(common::hasPriv('task', 'export')) echo html::a($link, "<i class='icon-import muted'></i> " . $lang->task->export, '', "class='btn btn-link iframe' data-width='700'");
?>
@@ -23,7 +23,7 @@
<span class='caret'></span>
</button>
<ul class='dropdown-menu' id='importActionMenu'>
<?php
<?php
$misc = common::hasPriv('project', 'importTask') ? '' : "class=disabled";
$link = common::hasPriv('project', 'importTask') ? $this->createLink('project', 'importTask', "project=$project->id") : '#';
echo "<li>" . html::a($link, $lang->project->importTask, '', $misc) . "</li>";
@@ -34,7 +34,7 @@
?>
</ul>
</div>
<?php
<?php
$checkObject = new stdclass();
$checkObject->project = $projectID;
$misc = common::hasPriv('task', 'create', $checkObject) ? "class='btn btn-primary'" : "class='btn btn-primary disabled'";
@@ -115,7 +115,7 @@ $account = $this->app->user->account;
<div class='board-story' data-id='<?php echo $story->id;?>'>
<?php echo html::a($this->createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', 'class="kanbaniframe group-title" title="' . $story->title . '"');?>
<div class="small group-info">
<span class='story-id board-id' title='<?php echo $lang->story->id?>'><?php echo $story->id?></span>
<span class='story-id board-id' title='<?php echo $lang->story->id?>'><?php echo $story->id?></span>
<span class='label-pri label-pri-<?php echo $story->pri?>' title='<?php echo $lang->story->pri?>'><?php echo zget($lang->story->priList, $story->pri);?></span>
<span class='story-stage' title='<?php echo $lang->story->stage?>'><span class="label label-dot"></span> <?php echo $lang->story->stageList[$story->stage];?></span>
<div class='pull-right text-muted story-estimate' title='<?php echo $lang->story->estimate?>'><?php echo $story->estimate . 'h ';?></div>
@@ -145,7 +145,7 @@ $account = $this->app->user->account;
if(empty($task->assignedTo)) $assignedToRealName = "<span class='text-primary'>{$lang->task->noAssigned}</span>";
echo html::a($this->createLink('task', 'assignTo', "projectID={$task->project}&taskID={$task->id}", '', true), '<i class="icon icon-hand-right"></i> ' . $assignedToRealName, '', 'class="btn btn-icon-left kanbaniframe task-assignedTo"');?>
<?php if(isset($task->delay)):?>
<span class="status-delayed"> <?php echo $lang->task->delayed;?></span>
<span class="status-task status-delayed"> <?php echo $lang->task->delayed;?></span>
<?php endif;?>
<small class="task-left" title='<?php echo $lang->task->left?>'><?php echo $task->left;?>h</small>
</div>
@@ -161,7 +161,7 @@ $account = $this->app->user->account;
$assignedToRealName = "<span>" . zget($realnames, $bug->assignedTo) . "</span>";
if(empty($task->assignedTo)) $assignedToRealName = "<span class='text-primary text'>{$lang->task->noAssigned}</span>";
echo html::a($this->createLink('bug', 'assignTo', "bugID={$bug->id}", '', true), '<i class="icon icon-hand-right"></i> ' . $assignedToRealName, '', 'class="btn btn-icon-left kanbaniframe bug-assignedTo"');?>
<span class='status-<?php echo $bug->status;?>' title='<?php echo $lang->bug->status?>'><span class="label label-dot"></span> <?php echo zget($lang->bug->statusList, $bug->status);?></span>
<span class='status-bug status-<?php echo $bug->status;?>' title='<?php echo $lang->bug->status?>'><span class="label label-dot"></span> <?php echo zget($lang->bug->statusList, $bug->status);?></span>
</div>
</div>
<?php endforeach?>
module/project/view/story.html.php
+2 -2
View File
@@ -157,8 +157,8 @@
<td class='c-user'><?php echo $users[$story->assignedTo];?></td>
<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='status-text'><?php echo zget($lang->story->statusList, $story->status);?></span>
<span class='status-story status-<?php echo $story->status;?>'>
<?php echo zget($lang->story->statusList, $story->status);?>
</span>
</td>
<td class='c-stage'><?php echo $lang->story->stageList[$story->stage];?></td>
module/project/view/storykanban.html.php
+3 -3
View File
@@ -3,7 +3,7 @@
* The kanban view file of project module of ZenTaoPMS.
*
* @copyright Copyright 2009-2012 青岛易软天创网络科技有限公司 (QingDao Nature Easy Soft Network Technology Co,LTD www.cnezsoft.com)
* @author Wang Yidong, Zhu Jinyong
* @author Wang Yidong, Zhu Jinyong
* @package project
* @version $Id: kanban.html.php $
*/
@@ -22,7 +22,7 @@
</div>
<div class="btn-toolbar pull-right">
<div class='btn-group'>
<?php
<?php
common::printIcon('story', 'export', "productID=$productID&orderBy=id_desc", '', 'button', '', '', 'export');
if(commonModel::isTutorialMode())
@@ -76,7 +76,7 @@ $account = $this->app->user->account;
<?php echo html::a($this->createLink('story', 'view', "story=$story->id", '', true), "#{$story->id} {$story->title}", '', 'class="title kanbaniframe" title="' . $story->title . '"');?>
<div class='info'>
<span class='label-pri label-pri-<?php echo $story->pri?>' title='<?php echo $lang->story->pri?>'><?php echo zget($lang->story->priList, $story->pri);?></span>
<span class='status status-<?php echo $story->status;?>' title='<?php echo $lang->story->status?>'><span class="label label-dot"></span> <?php echo $lang->story->statusList[$story->status];?></span>
<span class='status status-story status-<?php echo $story->status;?>' title='<?php echo $lang->story->status?>'><span class="label label-dot"></span> <?php echo $lang->story->statusList[$story->status];?></span>
<?php if(common::hasPriv('project', 'unlinkStory')):?>
<div class='pull-right'><?php echo html::a($this->createLink('project', 'unlinkStory', "projectID=$projectID&story=$story->id"), "<i class='icon icon-unlink icon-sm'></i>", 'hiddenwin', "title='{$lang->project->unlinkStory}'");?></div>
<?php endif;?>
module/project/view/testtask.html.php
+2 -2
View File
@@ -92,8 +92,8 @@
<td><?php echo $task->begin?></td>
<td><?php echo $task->end?></td>
<td title='<?php echo $lang->testtask->statusList[$task->status];?>'>
<span class='status-<?php echo $task->status?>'>
<span class='status-text'><?php echo $lang->testtask->statusList[$task->status];?></span>
<span class='status-testtask status-<?php echo $task->status?>'>
<?php echo $lang->testtask->statusList[$task->status];?>
</span>
</td>
<td class='c-actions'>
module/project/view/treestory.html.php
+1 -1
View File
@@ -2,7 +2,7 @@
<h2 class="detail-title"><span class="label-id"><?php echo $story->id?></span> <span class="label label-story"><?php echo $lang->story->common?></span> <span class="title"><?php echo $story->title;?></span></h2>
<div class="detail-content article-content">
<div class="infos">
<span class="status-draft"><span class="label label-dot"></span> <?php echo $lang->story->statusList[$story->status];?></span>
<span class="status-story status-draft"><span class="label label-dot"></span> <?php echo $lang->story->statusList[$story->status];?></span>
<span><?php echo $lang->story->stage;?> <?php echo $lang->story->stageList[$story->stage];?></span>
<span><?php echo $lang->story->estimate;?> <?php echo $story->estimate;?></span>
</div>
module/project/view/treetask.html.php
+1 -1
View File
@@ -10,7 +10,7 @@
</h2>
<div class="detail-content article-content">
<div class="infos">
<span class="status-wait"><span class="label label-dot"></span> <?php echo zget($lang->task->statusList, $task->status);?></span>
<span class="status-task status-wait"><span class="label label-dot"></span> <?php echo zget($lang->task->statusList, $task->status);?></span>
<span><?php echo $lang->task->estimate;?> <?php echo $task->estimate . $lang->workingHour;?></span>
<span><?php echo $lang->task->consumed;?> <?php echo round($task->consumed, 2) . $lang->workingHour;?></span>
<span><?php echo $lang->task->left;?> <?php echo $task->left . $lang->workingHour;?></span>
module/release/view/browse.html.php
+2 -2
View File
@@ -60,8 +60,8 @@
<?php endif;?>
<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='status-text'><?php echo zget($lang->release->statusList, $release->status);?></span>
<span class="status-release status-<?php echo $release->status?>">
<?php echo zget($lang->release->statusList, $release->status);?>
</span>
</td>
<td class='c-actions'>
module/release/view/linkbug.html.php
+2 -2
View File
@@ -20,7 +20,7 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
<div class='table-header hl-primary text-primary strong'>
<?php echo html::icon('unlink');?> <?php echo $lang->productplan->unlinkedBugs;?>
</div>
<table class='table tablesorter'>
<table class='table tablesorter'>
<thead>
<tr class='text-center'>
<th class='c-id text-left'>
@@ -51,7 +51,7 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
<td><?php echo $users[$bug->openedBy];?></td>
<td><?php echo $users[$bug->resolvedBy];?></td>
<td>
<span class='status-<?php echo $bug->status?>'>
<span class='status-bug status-<?php echo $bug->status?>'>
<?php echo $lang->bug->statusList[$bug->status];?>
</span>
</td>
module/release/view/linkstory.html.php
+3 -3
View File
@@ -16,7 +16,7 @@
<div class='table-header hl-primary text-primary strong'>
<?php echo html::icon('unlink');?> <?php echo $lang->productplan->unlinkedStories;?>
</div>
<table class='table tablesorter'>
<table class='table tablesorter'>
<thead>
<tr class='text-center'>
<th class='c-id text-left'>
@@ -44,7 +44,7 @@
<tr>
<td class='c-id text-left'>
<div class="checkbox-primary">
<input type='checkbox' name='stories[]' value='<?php echo $story->id;?>' <?php if($story->stage == 'developed' or $story->status == 'closed') echo 'checked';?> />
<input type='checkbox' name='stories[]' value='<?php echo $story->id;?>' <?php if($story->stage == 'developed' or $story->status == 'closed') echo 'checked';?> />
<label></label>
</div>
<?php printf('%03d', $story->id);?>
@@ -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?>'><?php echo zget($lang->story->statusList, $story->status);?></span></td>
<td><span class='status-story 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
+5 -5
View File
@@ -97,7 +97,7 @@
<td class='c-id text-left'>
<?php if($canBatchUnlink):?>
<div class="checkbox-primary">
<input type='checkbox' name='unlinkStories[]' value='<?php echo $story->id;?>'/>
<input type='checkbox' name='unlinkStories[]' value='<?php echo $story->id;?>'/>
<label></label>
</div>
<?php endif;?>
@@ -108,7 +108,7 @@
<td><?php echo $users[$story->openedBy];?></td>
<td><?php echo $story->estimate;?></td>
<td>
<span class='status-<?php echo $story->status;?>'><?php echo $lang->story->statusList[$story->status];?></span>
<span class='status-story status-<?php echo $story->status;?>'><?php echo $lang->story->statusList[$story->status];?></span>
</td>
<td><?php echo $lang->story->stageList[$story->stage];?></td>
<td class='c-actions'>
@@ -170,7 +170,7 @@
<td class='c-id text-left'>
<?php if($canBatchUnlink):?>
<div class="checkbox-primary">
<input type='checkbox' name='unlinkBugs[]' value='<?php echo $bug->id;?>'/>
<input type='checkbox' name='unlinkBugs[]' value='<?php echo $bug->id;?>'/>
<label></label>
</div>
<?php endif;?>
@@ -178,7 +178,7 @@
</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?>'><?php echo zget($lang->bug->statusList, $bug->status);?></span>
<span class='status-bug status-<?php echo $bug->status?>'><?php echo zget($lang->bug->statusList, $bug->status);?></span>
</td>
<td><?php echo $users[$bug->openedBy];?></td>
<td><?php echo substr($bug->openedDate, 5, 11)?></td>
@@ -242,7 +242,7 @@
<td class='c-id text-left'>
<?php if($canBatchUnlink):?>
<div class="checkbox-primary">
<input type='checkbox' name='unlinkBugs[]' value='<?php echo $bug->id;?>'/>
<input type='checkbox' name='unlinkBugs[]' value='<?php echo $bug->id;?>'/>
<label></label>
</div>
<?php endif;?>
module/story/view/affected.html.php
+4 -4
View File
@@ -21,13 +21,13 @@
</thead>
<?php if(isset($story->tasks[$projectID])):?>
<tbody class='<?php if(count($story->tasks[$projectID]) > $config->story->affectedFixedNum) echo "linkbox";?>'>
<?php foreach($story->tasks[$projectID] as $task):?>
<?php foreach($story->tasks[$projectID] as $task):?>
<tr class='text-center'>
<td><?php echo $task->id;?></td>
<td class='text-left'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), $task->name, '_blank');?></td>
<td><?php echo $users[$task->assignedTo];?></td>
<td>
<span class='status-<?php echo $task->status?>'>
<span class='status-task status-<?php echo $task->status?>'>
<?php echo $lang->task->statusList[$task->status];?>
</span>
</td>
@@ -59,7 +59,7 @@
<td><?php echo $bug->id;?></td>
<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='status-bug status-<?php echo $bug->status?>'>
<?php echo $lang->bug->statusList[$bug->status];?>
</span>
</td>
@@ -89,7 +89,7 @@
<td><?php echo $case->id;?></td>
<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='status-case status-<?php echo $case->status?>'>
<?php echo $lang->testcase->statusList[$case->status];?>
</span>
</td>
module/story/view/view.html.php
+1 -1
View File
@@ -179,7 +179,7 @@
</tr>
<tr>
<th><?php echo $lang->story->status;?></th>
<td><span class='status-<?php echo $story->status?>'><span class="label label-dot"></span> <?php echo $lang->story->statusList[$story->status];?></span></td>
<td><span class='status-story status-<?php echo $story->status?>'><span class="label label-dot"></span> <?php echo $lang->story->statusList[$story->status];?></span></td>
</tr>
<tr>
<th><?php echo $lang->story->stage;?></th>
module/story/view/zerocase.html.php
+4 -4
View File
@@ -50,7 +50,7 @@
<tr>
<td class='c-id'>
<div class="checkbox-primary">
<input type='checkbox' name='storyIDList[<?php echo $story->id;?>]' value='<?php echo $story->id;?>' />
<input type='checkbox' name='storyIDList[<?php echo $story->id;?>]' value='<?php echo $story->id;?>' />
<label></label>
</div>
<?php printf('%03d', $story->id);?>
@@ -62,10 +62,10 @@
<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;?>'><?php echo zget($lang->story->statusList, $story->status);?></span></td>
<td><span class='status-story 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
<?php
$vars = "story={$story->id}";
common::printIcon('story', 'change', $vars, $story, 'list', 'fork');
common::printIcon('story', 'review', $vars, $story, 'list', 'glasses');
@@ -87,7 +87,7 @@
$actionLink = $this->createLink('story', 'batchEdit', "productID=$productID&projectID=0&branch=$branch");
?>
<?php echo html::commonButton($lang->edit, "data-form-action='$actionLink' $disabled");?>
<?php
<?php
if(common::hasPriv('story', 'batchReview'))
{
echo "<div class='btn-group dropup'>";
module/task/model.php
+1 -1
View File
@@ -2417,7 +2417,7 @@ class taskModel extends model
echo $this->lang->task->typeList[$task->type];
break;
case 'status':
$storyChanged ? print("<span class='status-changed'>{$this->lang->story->changed}</span>") : print("<span class='status-{$task->status}'> {$this->lang->task->statusList[$task->status]}</span>");
$storyChanged ? print("<span class='status-story status-changed'>{$this->lang->story->changed}</span>") : print("<span class='status-task status-{$task->status}'> {$this->lang->task->statusList[$task->status]}</span>");
break;
case 'estimate':
echo round($task->estimate, 1);
module/task/view/view.html.php
+1 -1
View File
@@ -245,7 +245,7 @@
</tr>
<tr>
<th><?php echo $lang->task->status;?></th>
<td><span class='status-<?php echo $task->status;?>'><span class="label label-dot"></span> <?php echo zget($lang->task->statusList, $task->status);?></td>
<td><span class='status-task status-<?php echo $task->status;?>'><span class="label label-dot"></span> <?php echo zget($lang->task->statusList, $task->status);?></td>
</tr>
<tr>
<th><?php echo $lang->task->pri;?></th>
module/testcase/model.php
+1 -1
View File
@@ -1377,7 +1377,7 @@ class testcaseModel extends model
echo "<span title='$stages'>$stages</span>";
break;
case 'status':
$case->needconfirm ? print("<span class='status-changed'>{$this->lang->story->changed}</span>") : print("<span class='status-{$case->status}'><span class='status-text'>{$this->lang->testcase->statusList[$case->status]}</span></span>");
$case->needconfirm ? print("<span class='status-story status-changed'>{$this->lang->story->changed}</span>") : print("<span class='status-testcase status-{$case->status}'>{$this->lang->testcase->statusList[$case->status]}</span>");
break;
case 'story':
static $stories = array();
module/testcase/view/groupcase.html.php
+2 -2
View File
@@ -82,9 +82,9 @@
}
else
{
echo "<span class='status-{$case->status}'><span class='status-text'>";
echo "<span class='status-case status-{$case->status}'>";
echo $lang->testcase->statusList[$case->status];
echo '</span></span>';
echo '</span>';
}
?>
</td>
module/testreport/view/blockbugs.html.php
+2 -2
View File
@@ -22,8 +22,8 @@
<td><?php echo zget($users, $bug->resolvedBy);?></td>
<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='status-text'><?php echo zget($lang->bug->statusList, $bug->status);?></span>
<span class="status-bug status-<?php echo $bug->status?>">
<?php echo zget($lang->bug->statusList, $bug->status);?>
</span>
</td>
</tr>
module/testreport/view/blockcases.html.php
+2 -2
View File
@@ -26,8 +26,8 @@
<td><?php echo substr($case->lastRunDate, 2);?></td>
<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='status-text'><?php echo zget($lang->testtask->statusList, $case->status);?></span>
<span class="status-case status-<?php echo $case->status?>">
<?php echo zget($lang->testtask->statusList, $case->status);?>
</span>
</td>
</tr>
module/testreport/view/blocklegacybugs.html.php
+2 -2
View File
@@ -22,8 +22,8 @@
<td><?php echo zget($users, $bug->resolvedBy);?></td>
<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='status-text'><?php echo zget($lang->bug->statusList, $bug->status);?></span>
<span class="status-bug status-<?php echo $bug->status?>">
<?php echo zget($lang->bug->statusList, $bug->status);?>
</span>
</td>
</tr>
module/testreport/view/blockstories.html.php
+2 -2
View File
@@ -23,8 +23,8 @@
<td><?php echo zget($users, $story->assignedTo);?></td>
<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='status-text'><?php echo zget($lang->story->statusList, $story->status);?></span>
<span class="status-story 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>
module/testtask/view/browse.html.php
+2 -2
View File
@@ -92,8 +92,8 @@ $status = $this->session->testTaskVersionStatus;
<td><?php echo $task->begin?></td>
<td><?php echo $task->end?></td>
<td title='<?php echo $lang->testtask->statusList[$task->status];?>'>
<span class='status-<?php echo $task->status?>'>
<span class='status-text'><?php echo $lang->testtask->statusList[$task->status];?></span>
<span class='status-task status-<?php echo $task->status?>'>
<?php echo $lang->testtask->statusList[$task->status];?>
</span>
</td>
<td class='c-actions'>
module/todo/view/view.html.php
+1 -1
View File
@@ -99,7 +99,7 @@
</tr>
<tr>
<th><?php echo $lang->todo->status;?></th>
<td><span class="status-<?php echo $todo->status;?>"><span class="label label-dot"></span> <?php echo $lang->todo->statusList[$todo->status];?></span></td>
<td><span class="status-todo status-<?php echo $todo->status;?>"><span class="label label-dot"></span> <?php echo $lang->todo->statusList[$todo->status];?></span></td>
</tr>
<tr>
<th><?php echo $lang->todo->type;?></th>
www/theme/zui/css/min.css
+3 -3
View File
File diff suppressed because one or more lines are too long