From ff6c9221cb46746a9accbdc10432ce7aa188556f Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Mon, 10 Oct 2022 16:14:45 +0800
Subject: [PATCH] * Finish task #71904.

---
 module/execution/css/bug.css              |  1 +
 module/execution/view/grouptask.html.php  |  2 +-
 module/execution/view/importtask.html.php |  2 +-
 module/project/view/bug.html.php          |  1 +
 module/task/config.php                    |  2 +-
 module/user/css/task.css                  |  4 +++-
 module/user/view/task.html.php            | 22 +++++++++++-----------
 www/theme/default/style.css               |  2 +-
 8 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/module/execution/css/bug.css b/module/execution/css/bug.css
index e798bf6ccb..e48d410a58 100644
--- a/module/execution/css/bug.css
+++ b/module/execution/css/bug.css
@@ -9,3 +9,4 @@
 
 .c-severity {width: 80px;}
 .c-confirmed {overflow: hidden;}
+.c-deadline {text-align: center;}
diff --git a/module/execution/view/grouptask.html.php b/module/execution/view/grouptask.html.php
index 0dad281b94..87dc3aa96f 100644
--- a/module/execution/view/grouptask.html.php
+++ b/module/execution/view/grouptask.html.php
@@ -122,7 +122,7 @@
         <th class="c-hours"><?php echo $lang->task->leftAB;?></th>
         <th class="c-progress" title='<?php echo $lang->task->progress;?>'><?php echo $lang->task->progressAB;?></th>
         <th class="c-type"><?php echo $lang->typeAB;?></th>
-        <th class="c-date"><?php echo $lang->task->deadlineAB;?></th>
+        <th class="c-date text-center"><?php echo $lang->task->deadlineAB;?></th>
         <th class="c-actions-3"><?php echo $lang->actions;?></th>
       </tr>
     </thead>
diff --git a/module/execution/view/importtask.html.php b/module/execution/view/importtask.html.php
index 25e9f99197..6c46acd740 100644
--- a/module/execution/view/importtask.html.php
+++ b/module/execution/view/importtask.html.php
@@ -42,7 +42,7 @@
           <?php endif;?>
           <th class='c-user'><?php echo $lang->task->assignedTo;?></th>
           <th class='c-hour'><?php echo $lang->task->leftAB;?></th>
-          <th class='c-date'><?php echo $lang->task->deadlineAB;?></th>
+          <th class='c-date text-center'><?php echo $lang->task->deadlineAB;?></th>
           <th class='c-status'><?php echo $lang->statusAB;?></th>
           <th class='c-story'><?php echo $lang->task->story;?></th>
         </tr>
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index a87eb8463a..545084f854 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -16,6 +16,7 @@
 #subHeader #dropMenu .col-left .list-group {margin-bottom: 0px; padding-top: 10px;}
 #subHeader #dropMenu .col-left {padding-bottom: 0px;}
 #currentBranch + #dropMenu .col-left {padding-bottom: 30px;}
+.c-deadline {text-align: center;}
 </style>
 <div id="mainMenu" class="clearfix main-row fade in">
   <div id="sidebarHeader">
diff --git a/module/task/config.php b/module/task/config.php
index b458e3a55e..59c3749d7b 100644
--- a/module/task/config.php
+++ b/module/task/config.php
@@ -99,7 +99,7 @@ $config->task->datatable->fieldList['finishedBy']['required'] = 'no';
 
 $config->task->datatable->fieldList['deadline']['title']    = 'deadlineAB';
 $config->task->datatable->fieldList['deadline']['fixed']    = 'no';
-$config->task->datatable->fieldList['deadline']['width']    = '65';
+$config->task->datatable->fieldList['deadline']['width']    = '70';
 $config->task->datatable->fieldList['deadline']['required'] = 'no';
 $config->task->datatable->fieldList['deadline']['control'] = 'date';
 
diff --git a/module/user/css/task.css b/module/user/css/task.css
index fd9b0be634..d305d64b16 100644
--- a/module/user/css/task.css
+++ b/module/user/css/task.css
@@ -1,2 +1,4 @@
 .hours {white-space: nowrap; overflow: hidden; text-overflow: ellipsis; text-align: right;}
-td.deadline > span {padding-left: 4px;}
+.c-execution {width: 180px;}
+.c-hour, .c-status {width: 70px;}
+.c-deadline {width: 100px;}
diff --git a/module/user/view/task.html.php b/module/user/view/task.html.php
index 35415f54f6..8981fb14e0 100644
--- a/module/user/view/task.html.php
+++ b/module/user/view/task.html.php
@@ -41,15 +41,15 @@
       <?php $vars = "userID={$user->id}&type=$type&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"; ?>
       <thead>
         <tr class='colhead'>
-          <th class='w-id'><?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
-          <th class='w-pri' title='<?php echo $lang->pri;?>'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
-          <th><?php common::printOrderLink('execution', $orderBy, $vars, $lang->task->execution);?></th>
+          <th class='c-id'><?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
+          <th class='c-pri' title='<?php echo $lang->pri;?>'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
+          <th class='c-execution'><?php common::printOrderLink('execution', $orderBy, $vars, $lang->task->execution);?></th>
           <th><?php common::printOrderLink('name', $orderBy, $vars, $lang->task->name);?></th>
-          <th class='w-70px hours'><?php common::printOrderLink('estimate', $orderBy, $vars, $lang->task->estimateAB);?></th>
-          <th class='w-70px hours'><?php common::printOrderLink('consumed', $orderBy, $vars, $lang->task->consumedAB);?></th>
-          <th class='w-hour hours'><?php common::printOrderLink('left', $orderBy, $vars, $lang->task->leftAB);?></th>
-          <th class='w-date'><?php common::printOrderLink('deadline', $orderBy, $vars, $lang->task->deadlineAB);?></th>
-          <th class='w-70px'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
+          <th class='c-hour hours'><?php common::printOrderLink('estimate', $orderBy, $vars, $lang->task->estimateAB);?></th>
+          <th class='c-hour hours'><?php common::printOrderLink('consumed', $orderBy, $vars, $lang->task->consumedAB);?></th>
+          <th class='c-hour hours'><?php common::printOrderLink('left', $orderBy, $vars, $lang->task->leftAB);?></th>
+          <th class='c-deadline text-center'><?php common::printOrderLink('deadline', $orderBy, $vars, $lang->task->deadlineAB);?></th>
+          <th class='c-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
         </tr>
       </thead>
       <tbody>
@@ -57,7 +57,7 @@
         <tr class='text-left'>
           <td><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?></td>
           <td><span class='label-pri label-pri-<?php echo $task->pri;?>'><?php echo zget($lang->task->priList, $task->pri, $task->pri);?></span></td>
-          <td class='text-left nobr'><?php echo html::a($this->createLink('execution', 'browse', "executionID=$task->executionID"), $task->executionName);?></td>
+          <td class='text-left nobr' title="<?php echo $task->executionName?>"><?php echo html::a($this->createLink('execution', 'browse', "executionID=$task->executionID"), $task->executionName);?></td>
           <td class='text-left nobr'>
             <?php if(!empty($task->team))   echo '<span class="label label-badge label-light">' . $this->lang->task->multipleAB . '</span> ';?>
             <?php if($task->parent > 0) echo '<span class="label label-badge label-light">' . $this->lang->task->childrenAB . '</span> ';?>
@@ -65,12 +65,12 @@
             $onlybody = $task->executionType == 'kanban' ? true : '';
             $class    = $task->executionType == 'kanban' ? 'iframe' : '';
             ?>
-            <?php echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', $onlybody, $task->project), $task->name, null, "class='$class' data-width='80%' style='color: $task->color'");?>
+            <?php echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', $onlybody, $task->project), $task->name, null, "class='$class' data-width='80%' style='color: $task->color' title='$task->name'");?>
           </td>
           <td class='hours' title="<?php echo $task->estimate . ' ' . $lang->execution->workHour;?>"><?php echo $task->estimate . $lang->execution->workHourUnit;?></td>
           <td class='hours' title="<?php echo $task->consumed . ' ' . $lang->execution->workHour;?>"><?php echo $task->consumed . $lang->execution->workHourUnit;?></td>
           <td class='hours' title="<?php echo $task->left     . ' ' . $lang->execution->workHour;?>"><?php echo $task->left     . $lang->execution->workHourUnit;?></td>
-          <td class="deadline <?php if(isset($task->delay)) echo 'delayed';?>"><?php if(substr($task->deadline, 0, 4) > 0) echo '<span>' . $task->deadline . '</span>';?></td>
+          <td class="deadline text-center <?php if(isset($task->delay)) echo 'delayed';?>"><?php if(substr($task->deadline, 0, 4) > 0) echo '<span>' . $task->deadline . '</span>';?></td>
           <td class='<?php echo $task->status;?>'><?php echo $this->processStatus('task', $task);?></td>
         </tr>
         <?php endforeach;?>
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 782a5db3f2..6fba6a44b2 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -139,4 +139,4 @@ body.xxc-embed.m-productplan-view,body.xxc-embed.m-bug-browse,body.xxc-embed.m-p
 #projectForm .c-name,
 #executionTableList .c-name,
 #programTableList .c-name {padding-right: 64px;}
-td.delayed > span {display: block; height: 20px; line-height: 20px; background: #FFEBEB; color: #FB2B2B; border-radius: 20px;}
+td.delayed > span {display: inline-block; height: 20px; line-height: 18px; background: #FFEBEB; color: #FB2B2B; border-radius: 20px; padding: 2px 8px;}