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:
reneeteng
2019-06-04 11:26:40 +08:00
parent ecb028a4c3 3a6ae1c09f
commit 3217808ff5
6 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/js/grouptask.js
+4
View File
@@ -0,0 +1,4 @@
$(function()
{
$('.table-grouped .c-side').removeAttr('title');
});
module/project/view/grouptask.html.php
+2 -2
View File
@@ -114,8 +114,8 @@
<th class="c-name"><?php echo $lang->task->name;?></th>
<th class="c-status"><?php echo $lang->task->status;?></th>
<th class="c-assign text-left"><?php echo $lang->task->assignedTo;?></th>
<th class="c-user"><?php echo $lang->task->finishedBy;?></th>
<th class="w-50px"><?php echo $lang->task->estimateAB;?></th>
<th class="w-90px"><?php echo $lang->task->finishedBy;?></th>
<th class="w-60px"><?php echo $lang->task->estimateAB;?></th>
<th class="w-50px"><?php echo $lang->task->consumedAB;?></th>
<th class="w-50px"><?php echo $lang->task->leftAB;?></th>
<th class="w-50px"><?php echo $lang->task->progress;?></th>
module/project/view/treetask.html.php
+2 -2
View File
@@ -12,8 +12,8 @@
<div class="detail-content article-content">
<div class="infos">
<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>
<span><?php echo $lang->task->consumedAB;?> <?php echo round($task->consumed, 2) . ' ' . $lang->workingHour;?></span>
<span><?php echo $lang->task->leftAB;?> <?php echo $task->left . ' ' . $lang->workingHour;?></span>
</div>
<div class="infos">
<span><?php echo $lang->task->type;?> <?php echo $lang->task->typeList[$task->type];?></span>
module/report/css/bugcreate.css
+3 -3
View File
@@ -1,5 +1,5 @@
#begin{min-width: 85px}
#end{min-width: 85px}
table th{font-size: 12px}
table th:nth-child(7){width: 87px}
table th:nth-child(10){width: 100px}
#bug th{font-size: 12px}
#bug th:nth-child(7){width: 87px}
#bug th:nth-child(10){width: 100px}
module/story/view/edit.html.php
+2 -1
View File
@@ -66,7 +66,8 @@
<div class='detail-title'><?php echo $lang->story->legendBasicInfo;?></div>
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->story->product;?></th>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-100px' : 'w-80px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->story->product;?></th>
<td>
<div class='input-group'>
<?php echo html::select('product', $products, $story->product, "onchange='loadProduct(this.value);' class='form-control chosen control-product'");?>
module/story/view/zerocase.html.php
+9 -9
View File
@@ -29,15 +29,15 @@
</div>
<?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
</th>
<th class='w-pri'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th class='w-p30'> <?php common::printOrderLink('title', $orderBy, $vars, $lang->story->title);?></th>
<th> <?php common::printOrderLink('plan', $orderBy, $vars, $lang->story->planAB);?></th>
<th> <?php common::printOrderLink('source', $orderBy, $vars, $lang->story->source);?></th>
<th> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<th> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
<th class='w-hour'><?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
<th> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th> <?php common::printOrderLink('stage', $orderBy, $vars, $lang->story->stageAB);?></th>
<th class='w-pri'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th class='w-p30'> <?php common::printOrderLink('title', $orderBy, $vars, $lang->story->title);?></th>
<th> <?php common::printOrderLink('plan', $orderBy, $vars, $lang->story->planAB);?></th>
<th class='w-100px'><?php common::printOrderLink('source', $orderBy, $vars, $lang->story->source);?></th>
<th class='w-100px'><?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<th class='w-100px'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
<th class='w-70px'> <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
<th class='w-80px'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='w-80px'> <?php common::printOrderLink('stage', $orderBy, $vars, $lang->story->stageAB);?></th>
<th class='c-actions-5'><?php echo $lang->actions;?></th>
</tr>
</thead>