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

Conflicts:
	module/block/view/projectblock.html.php
This commit is contained in:
wangyidong
2016-05-24 14:24:10 +08:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -46,7 +46,7 @@
<td><?php echo $project->hours->totalConsumed;?></td>
<td><?php echo $project->hours->totalLeft;?></td>
<td class='text-left'>
<img class='progressbar' src='<?php echo $this->app->getWebRoot();?>theme/default/images/main/green.png' alt='' height='16' width='<?php echo $project->hours->progress == 0 ? 1 : round($project->hours->progress);?>'>
<img class='progressbar' src='<?php echo $this->app->getWebRoot();?>theme/default/images/main/green.png' alt='' height='16' width='<?php echo $project->hours->progress == 0 ? 1 : round($project->hours->progress * 0.7);?>'>
<small><?php echo $project->hours->progress;?>%</small>
</td>
<td id='spark-<?php echo $id++?>' class='spark text-left pd-0' values='<?php echo join(',', $project->burns);?>'></td>