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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
daitingting
2018-05-17 10:43:54 +08:00
parent d47879c736 17f9f2550c
commit e1b933e3f0
21 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/view/bugblock.html.php
+1 -1
View File
@@ -37,7 +37,7 @@
<td class='c-severity'><span class='label-severity' data-severity='<?php echo zget($lang->bug->severityList, $bug->severity);?>'></span></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="bug-status-<?php echo $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>
module/block/view/projectblock.html.php
+2 -2
View File
@@ -41,9 +41,9 @@
<?php if($longBlock):?>
<td class="c-status">
<?php if(isset($project->delay)):?>
<span class="project-status-delayed"><span class="label label-dot"></span> <?php echo $lang->project->delayed;?></span>
<span class="status-delayed"><span class="label label-dot"></span> <?php echo $lang->project->delayed;?></span>
<?php else:?>
<span class="project-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?>"><span class="label label-dot"></span> <?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/storyblock.html.php
+1 -1
View File
@@ -44,7 +44,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="story-status-<?php echo $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>
module/block/view/taskblock.html.php
+1 -1
View File
@@ -39,7 +39,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="task-status-<?php echo $task->status?>">
<span class="status-<?php echo $task->status?>">
<span class="label label-dot"></span>
<span class='status-text'><?php echo zget($lang->task->statusList, $task->status);?></span>
</span>
module/bug/model.php
+1 -1
View File
@@ -2472,7 +2472,7 @@ 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 "<span class='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;
module/build/view/linkbug.html.php
+1 -1
View File
@@ -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='bug-status-<?php echo $bug->status?>'>
<span class='status-<?php echo $bug->status?>'>
<span class='label label-dot'></span>
<?php echo $lang->bug->statusList[$bug->status];?>
</span>
module/build/view/linkstory.html.php
+1 -1
View File
@@ -51,7 +51,7 @@
<td><?php echo $users[$story->assignedTo];?></td>
<td><?php echo $story->estimate;?></td>
<td>
<span class='story-status-<?php echo $story->status?>'>
<span class='status-<?php echo $story->status?>'>
<span class='label label-dot'></span>
<?php echo $lang->story->statusList[$story->status];?>
</span>
module/build/view/view.html.php
+3 -3
View File
@@ -125,7 +125,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='story-status-<?php echo $story->status;?>'>
<span class='status-<?php echo $story->status;?>'>
<span class='label label-dot'></span>
<?php echo $lang->story->statusList[$story->status];?>
</span>
@@ -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='preview'");?></td>
<td>
<span class='bug-status-<?php echo $bug->status?>'>
<span class='status-<?php echo $bug->status?>'>
<span class='label label-dot'></span>
<?php echo $lang->bug->statusList[$bug->status];?>
</span>
@@ -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='preview'");?></td>
<td>
<span class='bug-status-<?php echo $bug->status?>'>
<span class='status-<?php echo $bug->status?>'>
<span class='label label-dot'></span>
<?php echo $lang->bug->statusList[$bug->status];?>
</span>
module/product/view/project.html.php
+2 -2
View File
@@ -41,14 +41,14 @@
<td><?php echo $project->end;?></td>
<?php if(isset($project->delay)):?>
<td class='c-status' title='<?php echo $lang->project->delayed;?>'>
<span class="project-status-delayed">
<span class="status-delayed">
<span class="label label-dot"></span>
<span class='status-text'><?php echo $lang->project->delayed;?></span>
</span>
</td>
<?php else:?>
<td class='c-status' title='<?php echo zget($lang->project->statusList, $project->status);?>'>
<span class="project-status-<?php echo $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>
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='bug-status-<?php echo $bug->status?>'>
<span class='status-<?php echo $bug->status?>'>
<span class='label label-dot'></span>
<?php echo $lang->bug->statusList[$bug->status];?>
</span>
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='story-status-<?php echo $story->status?>'>
<span class='status-<?php echo $story->status?>'>
<span class='label label-dot'></span>
<?php echo $lang->story->statusList[$story->status];?>
</span>
module/productplan/view/view.html.php
+2 -2
View File
@@ -139,7 +139,7 @@
<td><?php echo zget($users, $story->assignedTo);?></td>
<td><?php echo $story->estimate;?></td>
<td>
<span class='story-status-<?php echo $story->status?>'>
<span class='status-<?php echo $story->status?>'>
<span class='label label-dot'></span>
<?php echo $lang->story->statusList[$story->status];?><span>
</span>
@@ -375,7 +375,7 @@
<td><?php echo zget($users, $bug->openedBy);?></td>
<td><?php echo zget($users, $bug->assignedTo);?></td>
<td>
<span class='bug-status-<?php echo $bug->status?>'>
<span class='status-<?php echo $bug->status?>'>
<span class='label label-dot'></span>
<?php echo $lang->bug->statusList[$bug->status];?>
</span>
module/project/view/all.html.php
+2 -2
View File
@@ -76,14 +76,14 @@
<td><?php echo $project->end;?></td>
<?php if(isset($project->delay)):?>
<td class='c-status' title='<?php echo $lang->project->delayed;?>'>
<span class="project-status-delayed">
<span class="status-delayed">
<span class="label label-dot"></span>
<span class='status-text'><?php echo $lang->project->delayed;?></span>
</span>
</td>
<?php else:?>
<td class='c-status' title='<?php echo zget($lang->project->statusList, $project->status);?>'>
<span class="project-status-<?php echo $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>
module/project/view/story.html.php
+1 -1
View File
@@ -142,7 +142,7 @@
<td><?php echo $users[$story->assignedTo];?></td>
<td><?php echo $story->estimate;?></td>
<td title='<?php echo zget($lang->story->statusList, $story->status);?>'>
<span class='story-status-<?php echo $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>
module/release/view/linkbug.html.php
+1 -1
View File
@@ -55,7 +55,7 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
<td><?php echo $users[$bug->openedBy];?></td>
<td><?php echo $users[$bug->resolvedBy];?></td>
<td>
<span class='bug-status-<?php echo $bug->status?>'>
<span class='status-<?php echo $bug->status?>'>
<span class='label label-dot'></span>
<?php echo $lang->bug->statusList[$bug->status];?>
</span>
module/release/view/view.html.php
+1 -1
View File
@@ -247,7 +247,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='bug-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?>'><span class="label label-dot"></span> <?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
+2 -2
View File
@@ -27,7 +27,7 @@
<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='task-status-<?php echo $task->status?>'>
<span class='status-<?php echo $task->status?>'>
<span class='label label-dot'></span>
<?php echo $lang->task->statusList[$task->status];?>
</span>
@@ -60,7 +60,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='bug-status-<?php echo $bug->status?>'>
<span class='status-<?php echo $bug->status?>'>
<span class='label label-dot'></span>
<?php echo $lang->bug->statusList[$bug->status];?>
</span>
module/testreport/view/blockbugs.html.php
+1 -1
View File
@@ -22,7 +22,7 @@
<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="bug-status-<?php echo $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>
module/testreport/view/blocklegacybugs.html.php
+1 -1
View File
@@ -22,7 +22,7 @@
<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="bug-status-<?php echo $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>
module/testreport/view/blockstories.html.php
+1 -1
View File
@@ -23,7 +23,7 @@
<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="story-status-<?php echo $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>
www/theme/zui/css/min.css
+1 -1
View File
File diff suppressed because one or more lines are too long