Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247

This commit is contained in:
tianshujie
2022-10-20 11:04:27 +08:00
11 changed files with 22 additions and 11 deletions
+6 -4
View File
@@ -19,8 +19,10 @@
#modalTeam .modal-content input[type="text"]::-webkit-input-placeholder{color: #c4c4c4;text-align: left;}
#modalTeam .modal-content input[type="text"]::-moz-placeholder{color: #c4c4c4;text-align: left;}
#modalTeam .modal-content input[type="text"]::-ms-input-placeholder{color: #c4c4c4;text-align: left;}
#modalTeam #team_chosen span {line-height: 24px;}
#modalTeam #team_chosen a.chosen-default > span {color: #c4c4c4;}
#modalTeam .input-control input[type="text"]::input-placeholder{text-align: right;}
#modalTeam .input-control input[type="text"]::-webkit-input-placeholder{text-align: right;}
#modalTeam .input-control input[type="text"]::-moz-placeholder{text-align: right;}
#modalTeam .input-control input[type="text"]::-ms-input-placeholder{text-align: right;}
#modalTeam .input-control input[type="text"]::input-placeholder{text-align: center;}
#modalTeam .input-control input[type="text"]::-webkit-input-placeholder{text-align: center;}
#modalTeam .input-control input[type="text"]::-moz-placeholder{text-align: center;}
#modalTeam .input-control input[type="text"]::-ms-input-placeholder{text-align: center;}
+2 -2
View File
@@ -31,7 +31,7 @@ if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = fal
<i class="icon icon-angle-down <?php echo $hiddenArrow;?>"></i>
</td>
<td class='w-250px'>
<?php echo html::select("team[]", $members, $member->account, "class='form-control chosen'" . ($memberDisabled ? ' disabled' : ''))?>
<?php echo html::select("team[]", $members, $member->account, "class='form-control chosen' data-placeholder='{$lang->task->assignedTo}'" . ($memberDisabled ? ' disabled' : ''))?>
<?php echo html::hidden("teamSource[]", $member->account);?>
<?php if($memberDisabled) echo html::hidden("team[]", $member->account);?>
</td>
@@ -68,7 +68,7 @@ if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = fal
<i class="icon icon-angle-down <?php echo $hiddenArrow;?>"></i>
</td>
<td class='w-240px'>
<?php echo html::select("team[]", $members, '', "class='form-control chosen'")?>
<?php echo html::select("team[]", $members, '', "class='form-control chosen' data-placeholder='{$lang->task->assignedTo}'")?>
<?php echo html::hidden("teamSource[]", '');?>
</td>
<td class='w-130px'>