Merge branch 'sprint/209_hufangzhou_58569' into 'master'
* Finish task #58569. See merge request easycorp/zentaopms!4181
This commit is contained in:
@@ -27,7 +27,9 @@
|
||||
#cards .project-infos > span > .icon {font-size: 12px; display: inline-block; position: relative; top: -1px}
|
||||
#cards .project-infos > span + span {margin-left: 15px;}
|
||||
#cards .project-infos > .budget {max-width: 75px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
|
||||
#cards .project-infos > .budget, #cards .project-infos > .date {background: #F8F8F8; border: unset;}
|
||||
#cards .project-detail {position: absolute; top: 75px; left: 16px; right: 16px; font-size: 12px;}
|
||||
#cards .project-detail .statistics-title {color: #5B606E;}
|
||||
#cards .project-footer {position: absolute; bottom: 10px; right: 10px; left: 15px;}
|
||||
#cardsFooter .pager {margin: 0; float: right;}
|
||||
#cardsFooter .pager .btn {border: none; padding-top: 4px;}
|
||||
@@ -37,7 +39,7 @@
|
||||
#cards .panel .label-closed {background: #D4F7F9 !important; color: #00A78E;}
|
||||
#cards .panel .label-delay {background: #F85A40 !important; color: #FFF;}
|
||||
#cards .project-infos .text-red {color: #F85A40 !important;}
|
||||
#cards .project-detail .leftTasks, .totalLeft {display:block; margin-top: 8px;}
|
||||
#cards .project-detail .leftTasks, .totalLeft {display:block; font-size: 18px; font-weight: bold; color: #3C4353;}
|
||||
#cards .project-members {float: left; height: 24px; line-height: 24px;}
|
||||
#cards .project-members > a {display: inline-block; height: 24px;}
|
||||
#cards .project-members > a + a {margin-left: -5px;}
|
||||
@@ -120,20 +122,20 @@
|
||||
$canActions = (common::hasPriv('project','edit') or common::hasPriv('project','start') or common::hasPriv('project','activate') or common::hasPriv('project','suspend') or common::hasPriv('project','close'));
|
||||
?>
|
||||
<span title="<?php echo $budgetTitle;?>" class='label label-outline budget'><?php echo $budgetTitle;?></span>
|
||||
<span title="<?php echo $project->date;?>" class="label label-outline <?php echo $status == 'delay' ? 'text-red' : '';?>"><?php echo $project->date;?></span>
|
||||
<span title="<?php echo $project->date;?>" class="label label-outline date <?php echo $status == 'delay' ? 'text-red' : '';?>"><?php echo $project->date;?></span>
|
||||
</div>
|
||||
<div class='project-detail'>
|
||||
<div class='row'>
|
||||
<div class='col-xs-4'>
|
||||
<div><?php echo $lang->project->progress;?></div>
|
||||
<div><span class='statistics-title'><?php echo $lang->project->progress;?></span></div>
|
||||
<?php echo html::ring($project->hours->progress); ?>
|
||||
</div>
|
||||
<div class='col-xs-4'>
|
||||
<span><?php echo $lang->project->leftTasks;?></span>
|
||||
<span class='statistics-title'><?php echo $lang->project->leftTasks;?></span>
|
||||
<span class='leftTasks' title="<?php echo $project->leftTasks;?>"><?php echo $project->leftTasks;?></span>
|
||||
</div>
|
||||
<div class='col-xs-4'>
|
||||
<span><?php echo $lang->project->leftHours;?></span>
|
||||
<span class='statistics-title'><?php echo $lang->project->leftHours;?></span>
|
||||
<span class='totalLeft' title="<?php echo empty($project->hours->totalLeft) ? '—' : $project->hours->totalLeft . $lang->execution->workHour;?>"><?php echo empty($project->hours->totalLeft) ? '—' : $project->hours->totalLeft . $lang->execution->workHourUnit;?></span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user