Merge branch 'sprint/192_leiyong_task_54469' into 'master'
Sprint/192 leiyong task 54469 See merge request easycorp/zentaopms!3517
This commit is contained in:
@@ -7,3 +7,9 @@ tbody.sortable > tr > td.sort-handler .table-nest-toggle:before {cursor: pointer
|
||||
label[for^="projectIdList"]:before {top: 1px; width:14px; height:14px;}
|
||||
label[for^="projectIdList"]:after {width: 14px; height:14px;}
|
||||
tbody.sortable > tr > td.sort-handler {color: #3c4353 !important;}
|
||||
|
||||
.has-prefix {position: relative; display: flex; align-items: center;}
|
||||
.has-prefix > span {flex: none;}
|
||||
.has-prefix > a {padding-left: 5px;}
|
||||
|
||||
.has-suffix > a {max-width: calc(100% - 100px); padding-right: 5px; color: #0c60e1; display: inline-block; max-width: calc(100% - 50px);}
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
?>
|
||||
|
||||
<tr <?php echo $trAttrs;?>>
|
||||
<td class='c-name text-left <?php if($canOrder) echo 'sort-handler';?>' title='<?php echo $program->name?>'>
|
||||
<td class='c-name text-left <?php if($canOrder) echo 'sort-handler';?> has-prefix has-suffix' title='<?php echo $program->name?>'>
|
||||
<?php
|
||||
$icon = '';
|
||||
if($program->type == 'program') $icon = ' icon-program';
|
||||
@@ -60,7 +60,14 @@
|
||||
<?php if($program->type == 'program'):?>
|
||||
<?php echo strpos(",{$app->user->view->programs},", ",$program->id,") !== false ? html::a($this->createLink('program', 'product', "programID=$program->id"), $program->name) : $program->name;?>
|
||||
<?php else:?>
|
||||
<?php echo html::a($this->createLink('project', 'index', "projectID=$program->id", '', '', $program->id), $program->name);?>
|
||||
<?php echo html::a($this->createLink('project', 'index', "projectID=$program->id", '', '', $program->id), $program->name, '', 'class="text-ellipsis text-primary"');?>
|
||||
<?php
|
||||
if($program->status != 'done' and $program->status != 'closed' and $program->status != 'suspended')
|
||||
{
|
||||
$delay = helper::diffDate(helper::today(), $program->end);
|
||||
if($delay > 0) echo "<span class='label label-danger label-badge'>{$lang->project->statusList['delay']}</span>";
|
||||
}
|
||||
?>
|
||||
<?php endif;?>
|
||||
</td>
|
||||
<td class='c-status'><span class="status-program status-<?php echo $program->status?>"><?php echo zget($lang->project->statusList, $program->status, '');?></span></td>
|
||||
|
||||
Reference in New Issue
Block a user