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-10 16:14:32 +08:00
parent ca5cf5f905 4ecd2b4373
commit 31f6ccb02c
5 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/group/css/manageview.css
+1 -1
View File
@@ -1,4 +1,4 @@
.group-item {display:block; width:95px; float:left; margin-top:5px;}
.group-item {display:block; width:93px; float:left; margin-top:5px;}
.action-item {display:block; width:200px; float:left; margin-top:5px;}
.checkbox-primary>label{padding-left:20px;}
module/project/css/view.css
+1
View File
@@ -1,4 +1,5 @@
.block-burn .panel-body{margin-top: 20px;}
.data-stats .widthTr td{padding:0px;}
#burnWrapper {max-width: 400px; margin: 0 auto; padding: 8px; position: relative;}
#burnYUnit {position: absolute; color: #CBD0DB; top: -10px; left: 10px;}
module/project/view/burn.html.php
+1 -1
View File
@@ -23,7 +23,7 @@
common::printLink('project', 'computeBurn', 'reload=yes', '<i class="icon icon-refresh"></i> ' . $lang->project->computeBurn, 'hiddenwin', "title='{$lang->project->computeBurn}{$lang->project->burn}' class='btn btn-primary' id='computeBurn'");
echo '<div class="space"></div>';
echo html::a($this->createLink('project', 'burn', "projectID=$projectID&type=$weekend&interval=$interval"), $lang->project->$weekend, '', "class='btn btn-link'");
common::printLink('project', 'fixFirst', "project=$project->id", $lang->project->fixFirst, '', "class='btn btn-link iframe' data-width='600'");
common::printLink('project', 'fixFirst', "project=$project->id", $lang->project->fixFirst, '', "class='btn btn-link iframe' data-width='700'");
echo $lang->project->howToUpdateBurn;
?>
<?php if($interval):?>
module/project/view/view.html.php
+2 -1
View File
@@ -225,8 +225,9 @@
<div class="detail-content">
<table class='table table-data data-stats'>
<tbody>
<tr class='widthTr'><td class='w-100px'></td><td></td><td></td><td></td></tr>
<tr>
<td colspan="2">
<td colspan="4">
<?php $progress = ($project->totalConsumed + $project->totalLeft) ? round($project->totalConsumed / ($project->totalConsumed + $project->totalLeft), 3) * 100 : 0;?>
<?php echo $lang->projectCommon . $lang->project->progress;?> <em><?php echo $progress . $lang->percent;?></em> &nbsp;
<div class="progress inline-block">
module/task/view/finish.html.php
+1 -1
View File
@@ -35,7 +35,7 @@
<form method='post' enctype='multipart/form-data' target='hiddenwin'>
<table class='table table-form'>
<tr>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-110px' : 'w-80px';?>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-120px' : 'w-80px';?>
<th class='<?php echo $colWidth;?>'><?php echo !empty($task->team) ? $lang->task->common . $lang->task->consumed : $lang->task->hasConsumed;?></th>
<td class='w-p25-f'><?php echo $task->consumed;?> <?php echo $lang->workingHour;?></td>
<td></td>