From fbd3f09a3dceb2fa5086083d4b22e200d58a3781 Mon Sep 17 00:00:00 2001
From: liuyongkai <liuyongkai@easycorp.ltd>
Date: Thu, 1 Sep 2022 01:38:38 +0000
Subject: [PATCH] * Finish task 65047.

---
 module/task/css/recordestimate.css       | 8 ++++----
 module/task/view/recordestimate.html.php | 7 +++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/module/task/css/recordestimate.css b/module/task/css/recordestimate.css
index 87e012a563..7b81894893 100644
--- a/module/task/css/recordestimate.css
+++ b/module/task/css/recordestimate.css
@@ -1,5 +1,5 @@
 .form-condensed .table-form {margin-bottom: 20px;}
-.estimateTitle {font-weight: normal;}
-.consumedTitle {font-weight: normal;}
-.estimateShow {background: #FFEFEF; border-radius: 9px; color: #FF6262; padding: 3px 7px; margin: 0 5px 0 5px; font-weight: normal; min-width: 18px;}
-.consumedShow {background: #EAF3FF; border-radius: 9px; color: #2B80FF; padding: 3px 7px; margin: 0 5px 0 5px; font-weight: normal; min-width: 18px;}
+.hours {display: flex; float: left; transform: translate(0, 50%); margin: 0 0 0 10px;}
+.estimateTotally {background: #FFEFEF; border-radius: 9px; color: #FF6262; padding: 3px 7px; margin: 0 5px 0 5px; font-weight: normal; min-width: 18px;}
+.consumedTotally {background: #EAF3FF; border-radius: 9px; color: #2B80FF; padding: 3px 7px; margin: 0 5px 0 5px; font-weight: normal; min-width: 18px;}
+.nav > li.divider {margin: 0 10px 0 5px; background-color: #000; opacity: 0.06; width: 1px ; height: 15px; padding: 0 !important;}
diff --git a/module/task/view/recordestimate.html.php b/module/task/view/recordestimate.html.php
index 6218e51280..a368a8c8ba 100644
--- a/module/task/view/recordestimate.html.php
+++ b/module/task/view/recordestimate.html.php
@@ -25,8 +25,11 @@
       <h2>
         <span class='label label-id'><?php echo $task->id;?></span>
         <?php echo isonlybody() ? ("<span title='$task->name'>" . $task->name . '</span>') : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?>
-        <?php echo "<span class='estimateTitle'>{$lang->task->estimate}</span>" . "<span class='estimateShow'>{$task->estimate}h</span>";?>
-        <?php echo "<span class='consumedTitle'>{$lang->task->consumed}</span>" . "<span class='consumedShow'>{$task->consumed}h</span>";?>
+      </h2>
+        <?php echo "<ul class='nav nav-default hours'>"?>
+        <?php echo "<li><span>{$lang->task->estimate}</span></li>" . "<li><span class='estimateTotally'>{$task->estimate}h</span></li>";?>
+        <?php echo "<li class='divider'></li>";?>
+        <?php echo "<li><span>{$lang->task->consumed}</span></li>" . "<li><span class='consumedTotally'>{$task->consumed}h</span></li>";?>
         <?php if(!isonlybody()):?>
         <small><?php echo $lang->arrow . $lang->task->logEfforts;?></small>
         <?php endif;?>