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

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

Browse Source
This commit is contained in:
wangyidong
2019-02-21 10:07:33 +08:00
parent 4d03b12428 2a1f8df6cb
commit 399a57078e
8 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/build/lang/en.php
+1 -1
View File
@@ -37,7 +37,7 @@ $lang->build->builder = 'Builder';
$lang->build->scmPath = 'SCM Path';
$lang->build->filePath = 'File Path';
$lang->build->desc = 'Description';
$lang->build->files = 'Upload Files';
$lang->build->files = 'Files';
$lang->build->last = 'Last Build';
$lang->build->packageType = 'Package Type';
$lang->build->unlinkStory = 'Unlink Story';
module/project/lang/en.php
+1 -1
View File
@@ -49,7 +49,7 @@ $lang->project->createStory = "Create Story";
$lang->project->all = 'All';
$lang->project->undone = 'Unfinished';
$lang->project->unclosed = 'Unclosed';
$lang->project->typeDesc = 'No story, bug, build, test task or burndown is allowed in OPS';
$lang->project->typeDesc = 'No story, bug, build, test or burndown is allowed in OPS';
$lang->project->mine = 'Mine: ';
$lang->project->other = 'Other:';
$lang->project->deleted = 'Deleted';
module/release/view/browse.html.php
+2 -2
View File
@@ -55,8 +55,8 @@
<td><?php echo html::a(helper::createLink('release', 'view', "releaseID=$release->id"), sprintf('%03d', $release->id));?></td>
<td>
<?php
$flagIcon = $release->marker ? "<icon class='icon icon-flag-alt'></icon> " : '';
echo $flagIcon . html::a(inlink('view', "release=$release->id"), $release->name);
$flagIcon = $release->marker ? "<icon class='icon icon-flag-alt' title='{$lang->release->marker}'></icon> " : '';
echo html::a(inlink('view', "release=$release->id"), $release->name) . $flagIcon;
?>
</td>
<td title='<?php echo $release->buildName?>'><?php echo html::a($this->createLink('build', 'view', "buildID=$release->buildID"), $release->buildName);?></td>
module/release/view/view.html.php
+3 -2
View File
@@ -21,8 +21,9 @@
<div class='divider'></div>
<div class='page-title'>
<span class='label label-id'><?php echo $release->id;?></span>
<?php $flagIcon = $release->marker ? "<icon class='icon icon-flag-alt'></icon> " : '';?>
<span class='text' title='<?php echo $release->name;?>'><?php echo $flagIcon . $release->name;?></span>
<span class='text' title='<?php echo $release->name;?>'><?php echo $release->name;?></span>
<?php $flagIcon = $release->marker ? "<icon class='icon icon-flag-alt' title='{$lang->release->marker}'></icon> " : '';?>
<?php echo $flagIcon;?>
<?php if($release->deleted):?>
<span class='label label-danger'><?php echo $lang->release->deleted;?></span>
<?php endif; ?>
module/story/css/view.css
+1
View File
@@ -1,2 +1,3 @@
.side-col .cell{padding:0px;}
.side-col #legendProjectAndTask .list-unstyled{padding:10px; border-top:0px; margin:0px;}
.col-4 .cell .tab-content .text-top{padding-top: 1px}
module/task/view/recordestimate.html.php
+1 -1
View File
@@ -55,7 +55,7 @@
<td><?php echo $estimate->date;?></td>
<td><?php echo $estimate->consumed;?></td>
<td><?php echo $estimate->left;?></td>
<td class="text-left"><?php echo $estimate->work;?></td>
<td class="text-left" title="<?php echo $estimate->work;?>"><?php echo $estimate->work;?></td>
<?php if(empty($task->team) or $task->assignedTo == $this->app->user->account):?>
<td align='center' class='c-actions'>
<?php
module/testtask/lang/en.php
+1 -1
View File
@@ -143,7 +143,7 @@ $lang->testtask->report->create = 'Generate';
$lang->testtask->report->charts['testTaskPerRunResult'] = 'Result Report';
$lang->testtask->report->charts['testTaskPerType'] = 'Type Report';
$lang->testtask->report->charts['testTaskPerModule'] = 'Module Report';
$lang->testtask->report->charts['testTaskPerRunner'] = 'Run By Report';
$lang->testtask->report->charts['testTaskPerRunner'] = 'RunBy Report';
$lang->testtask->report->charts['bugSeverityGroups'] = 'Bug Severity Distribution';
$lang->testtask->report->charts['bugStatusGroups'] = 'Bug Status Distribution';
$lang->testtask->report->charts['bugOpenedByGroups'] = 'Bug CreateBy Distribution';
module/user/css/task.css
+1
View File
@@ -0,0 +1 @@
td.delayed{color:#fff; background: #e84e0f!important;}