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

Merge branch 'master_liuhong_63787'

Browse Source
This commit is contained in:
wangyidong
2022-08-11 09:23:14 +08:00
parent 289ee7b1b1 7c2d2b54eb
commit 124b8fdc01
5 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/css/task.css
+15 -6
View File
@@ -21,9 +21,18 @@ td.delayed {background: #e84e0f !important; color: white;}
html[lang="en"] .c-date {width: 80px;}
html[lang="en"] .c-user-short {width: 88px;}
[lang^=en] #taskTable .assigned-title{width: 115px !important;}
[lang^=de] #taskTable .assigned-title{width: 145px !important;}
[lang^=de] #taskTable .c-date {width: 80px;}
[lang^=de] #taskTable .c-user {width: 120px;}
[lang^=de] #taskTable .c-hours {width: 88px;}
[lang^=fr] #taskTable .assigned-title{width: 130px !important;}
[lang^=en] #taskTable .c-project {width: 100px}
[lang^=en] #taskTable .assigned-title {width: 120px !important;}
[lang^=de] #taskTable .c-name {width: 100px;}
[lang^=de] #taskTable .c-project {width: 80px;}
[lang^=de] #taskTable .c-date {width: 78px;}
[lang^=de] #taskTable .assigned-title {width: 123px !important;}
[lang^=de] #taskTable .c-user {width: 118px;}
[lang^=de] #taskTable .c-hours {width: 86px;}
[lang^=de] #taskTable .c-user-short {width: 75px;}
[lang^=fr] #taskTable .c-name {width: 120px;}
[lang^=fr] #taskTable .c-project {width: 100px;}
[lang^=fr] #taskTable .c-date {width: 91px;}
[lang^=fr] #taskTable .assigned-title {width: 130px !important;}
[lang^=fr] #taskTable .c-user-short {width: 75px;}
[lang^=fr] #taskTable .c-status {width: 71px;}
module/my/view/task.html.php
+2 -2
View File
@@ -126,7 +126,7 @@
<?php endif;?>
<td class="text-center <?php echo isset($task->delay) ? 'delayed' : '';?>"><?php if(substr($task->deadline, 0, 4) > 0) echo substr($task->deadline, 5, 6);?></td>
<?php if($type != 'assignedTo'): ?>
<td class="c-assignedTo has-btn"> <?php $this->task->printAssignedHtml($task, $users);?></td>
<td class="c-assignedTo has-btn" title="<?php echo zget($users, $task->assignedTo);?>"> <?php $this->task->printAssignedHtml($task, $users);?></td>
<?php endif;?>
<?php if($type != 'finishedBy'): ?>
<td class='c-user'><?php echo zget($users, $task->finishedBy);?></td>
@@ -196,7 +196,7 @@
<?php endif;?>
<td class="text-center <?php echo isset($child->delay) ? 'delayed' : '';?>"><?php if(substr($child->deadline, 0, 4) > 0) echo substr($child->deadline, 5, 6);?></td>
<?php if($type != 'assignedTo'): ?>
<td class="c-assignedTo has-btn"> <?php $this->task->printAssignedHtml($child, $users);?></td>
<td class="c-assignedTo has-btn" title="<?php echo zget($users, $child->assignedTo);?>"> <?php $this->task->printAssignedHtml($child, $users);?></td>
<?php endif;?>
<?php if($type != 'finishedBy'): ?>
<td class='c-user'><?php echo zget($users, $child->finishedBy);?></td>
module/program/css/browse.css
+2 -2
View File
@@ -16,5 +16,5 @@ tbody.sortable > tr > td.sort-handler {color: #3c4353 !important;}
div.checkbox-primary + span.table-nest-icon {margin-left: 0px !important;}
#checkAll + label.hover:after {border-width: 0px;}
.c-budget {padding-right: 16px !important; width: 100px !important;}
.c-status {width: 65px !important;}
.c-budget {width:100px; text-align: right; padding-right:16px !important;}
.c-status {width: 65px !important;}
module/program/css/project.css
+1
View File
@@ -7,3 +7,4 @@
.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);}
.c-budget {width:100px; text-align: right; padding-right:16px !important;}
module/project/css/browse.css
+1 -1
View File
@@ -3,7 +3,7 @@ body {margin-bottom: 25px;}
.side-col {padding-right: 20px; width: 18%;}
#sidebar>.cell {width: 100%;}
.c-budget {padding-right:16px !important;}
.c-budget {text-align: right; padding-right:16px !important;}
td.c-actions {overflow: visible;}
td.c-PM {white-space: nowrap; overflow: hidden;}
.c-actions .btn {overflow: visible;}