Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

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

Browse Source
This commit is contained in:
reneeteng
2019-06-06 11:19:22 +08:00
parent 176f776614 02b6bfc8b6
commit bfbeb04e98
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/css/index.css
+2
View File
@@ -1 +1,3 @@
#pageActions ul.dropdown-menu{left: 67px}
#mainRow .main-col .row .col-sm-7{width:55% !important;}
#mainRow .main-col .row .col-sm-5{width:45% !important;}
module/story/view/view.html.php
+1 -1
View File
@@ -311,7 +311,7 @@
</div>
<?php endif;?>
<div class="tab-pane <?php if($config->global->flow == 'onlyStory') echo 'active';?>" id='legendRelated'>
<?php $widthClass = $app->getClientLang() == 'en' ? 'w-120px' : 'w-70px';?>
<?php $widthClass = $app->getClientLang() == 'en' ? 'w-130px' : 'w-70px';?>
<table class="table table-data">
<tbody>
<?php if($config->global->flow != 'onlyStory'):?>
module/task/view/activate.html.php
+2 -1
View File
@@ -27,7 +27,8 @@
<form method='post' target='hiddenwin'>
<table class='table table-form'>
<tr>
<th class='w-70px'><?php echo $lang->task->assignedTo;?></th>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-90px' : 'w-70px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->task->assignedTo;?></th>
<td class='w-p25-f'><?php echo html::select('assignedTo', $members, $task->finishedBy, "class='form-control chosen'");?></td>
<td></td>
</tr>
module/task/view/finish.html.php
+3 -2
View File
@@ -35,13 +35,14 @@
<form method='post' enctype='multipart/form-data' target='hiddenwin'>
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo !empty($task->team) ? $lang->task->common . $lang->task->consumed : $lang->task->hasConsumed;?></th>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-110px' : 'w-80px';?>
<th class='<?php echo $colWidth;?>'><?php echo !empty($task->team) ? $lang->task->common . $lang->task->consumed : $lang->task->hasConsumed;?></th>
<td class='w-p25-f'><?php echo $task->consumed;?> <?php echo $lang->workingHour;?></td>
<td></td>
</tr>
<?php if(!empty($task->team)):?>
<tr>
<th class='w-80px'><?php echo $lang->task->hasConsumed;?></th>
<th class='<?php echo $colWidth;?>'><?php echo $lang->task->hasConsumed;?></th>
<td class='w-p25-f'><?php echo $task->myConsumed;?> <?php echo $lang->workingHour;?></td><td></td>
</tr>
<?php endif;?>