Merge branch 'master_xieqiyu_25038' into 'master'

* Fix bug#25038.

See merge request easycorp/zentaopms!4580
This commit is contained in:
王怡栋
2022-07-15 07:10:20 +00:00
2 changed files with 3 additions and 2 deletions

View File

@@ -1,5 +1,4 @@
.popover-sm .popover-content {padding: 8px 10px; max-width: 228px;}
.c-future {width: 56px;}
#dateRange {vertical-align: top; padding-top: 13px;}
#endList {vertical-align: top; padding-top: 13px;}

View File

@@ -166,8 +166,10 @@
<?php endif;?>
<div class='main-actions'>
<div class="btn-toolbar">
<?php if(!isonlybody()):?>
<?php echo html::a($browseLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn btn-secondary'");?>
<?php if(!isonlybody()) echo "<div class='divider'></div>";?>
<?php echo "<div class='divider'></div>";?>
<?php endif;?>
<?php $task->executionList = $execution;?>
<?php echo $this->task->buildOperateMenu($task, 'view');?>
</div>