Merge branch 'master' into zentaopms_workflow

This commit is contained in:
wyd621
2019-07-24 09:14:23 +08:00
committed by GitHub
383 changed files with 12033 additions and 2094 deletions
+2 -2
View File
@@ -289,7 +289,7 @@
</table>
</div>
<div class='tab-pane' id='legendLife'>
<?php $widthClass = $app->getClientLang() == 'en' ? 'w-100px' : 'w-70px';?>
<?php $widthClass = common::checkEnLang() ? 'w-100px' : 'w-70px';?>
<table class='table table-data'>
<tr>
<th class='<?php echo $widthClass;?>'><?php echo $lang->task->openedBy;?></th>
@@ -345,7 +345,7 @@
<summary class="detail-title"><?php echo $lang->task->legendEffort;?></summary>
<div class="detail-content">
<table class='table table-data'>
<?php $widthClass = $app->getClientLang() == 'en' ? 'w-90px' : 'w-70px';?>
<?php $widthClass = common::checkEnLang() ? 'w-90px' : 'w-70px';?>
<tr>
<th class='<?php echo $widthClass;?>'><?php echo $lang->task->estimate;?></th>
<td><?php echo $task->estimate . $lang->workingHour;?></td>