From 9044c9569e13e1a3dd8498cd9f43ce184ee2a6ec Mon Sep 17 00:00:00 2001
From: Yagami <sgm0422@qq.com>
Date: Wed, 19 Sep 2018 13:29:21 +0800
Subject: [PATCH] * Finish task #4856.

---
 .../block/view/productstatisticblock.html.php | 21 +++++++++++--------
 .../block/view/projectstatisticblock.html.php | 21 +++++++++++--------
 www/theme/default/style.css                   |  1 +
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/module/block/view/productstatisticblock.html.php b/module/block/view/productstatisticblock.html.php
index ad15045d2c..98f913479b 100644
--- a/module/block/view/productstatisticblock.html.php
+++ b/module/block/view/productstatisticblock.html.php
@@ -60,6 +60,9 @@ html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; po
 .block-statistic.block-sm .nav-secondary > li > a:before {display: none;}
 .block-statistic.block-sm .nav-secondary > li.switch-icon {width: 40px;}
 .block-statistic.block-sm .types-line > li > div {padding: 18px 2px 5px;}
+
+#unexpired-plan, #doing-project{margin-left:-12px}
+#unexpired-plan + span, #doing-project + span, #total-release + span{color:#000;font-weight:bold}
 </style>
 <script>
 <?php $blockNavId = 'nav-' . uniqid(); ?>
@@ -128,10 +131,10 @@ $(function()
               <?php endif;?>
               <div class="type-info">
                 <div class="type-label">
-                  <span><?php echo $lang->story->planAB;?></span> / <span><?php echo $lang->productplan->featureBar['browse']['unexpired'];?></span>
+                  <span id='unexpired-plan'><?php echo $lang->productplan->featureBar['browse']['unexpired'];?></span> : <span><?php echo $unexpiredPlan;?></span>
                 </div>
-                <div class="type-value">
-                  <small><?php echo $totalPlan;?></small> / <strong><?php echo $unexpiredPlan;?></strong>
+                <div class="type-label">
+                  <span><?php echo $lang->story->planAB;?></span> : <span><?php echo $totalPlan;?></span>
                 </div>
               </div>
             </div>
@@ -156,10 +159,10 @@ $(function()
               <?php endif;?>
               <div class="type-info">
                 <div class="type-label">
-                  <span><?php echo $lang->projectCommon;?></span> / <span><?php echo $lang->project->statusList['doing'];?></span>
+                  <span id='doing-project'><?php echo $lang->project->statusList['doing'];?></span> : <span><?php echo $doingProject;?></span>
                 </div>
-                <div class="type-value">
-                  <small><?php echo $totalProject;?></small> / <strong><?php echo $doingProject;?></strong>
+                <div class="type-label">
+                  <span><?php echo $lang->projectCommon;?></span> : <span><?php echo $totalProject;?></span>
                 </div>
               </div>
             </div>
@@ -183,10 +186,10 @@ $(function()
               <?php endif;?>
               <div class="type-info">
                 <div class="type-label">
-                  <span><?php echo $lang->release->common;?></span> / <span><?php echo $lang->release->statusList['normal'];?></span>
+                  <span id='total-release'><?php echo $lang->release->common;?></span> : <span><?php echo $totalRelease;?></span>
                 </div>
-                <div class="type-value">
-                  <small><?php echo $totalRelease;?></small> / <strong><?php echo $normalRelease;?></strong>
+                <div class="type-label">
+                  <span><?php echo $lang->release->statusList['normal'];?></span> : <span><?php echo $normalRelease;?></span>
                 </div>
               </div>
             </div>
diff --git a/module/block/view/projectstatisticblock.html.php b/module/block/view/projectstatisticblock.html.php
index fe3ec15f76..1be9be768b 100644
--- a/module/block/view/projectstatisticblock.html.php
+++ b/module/block/view/projectstatisticblock.html.php
@@ -46,6 +46,9 @@ html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; po
 .block-statistic.block-sm .nav-secondary > li > a {padding: 5px 10px; border-radius: 4px;}
 .block-statistic.block-sm .nav-secondary > li > a:before {display: none;}
 .block-statistic.block-sm .nav-secondary > li.switch-icon {width: 40px;}
+
+#all-bug{margin-left:11px}
+#undone-task, #unclosed-story, #active-bug{color:#000;font-weight:bold}
 </style>
 <script>
 <?php $blockNavId = 'nav-' . uniqid(); ?>
@@ -108,10 +111,10 @@ $(function()
               </div>
               <div class="type-info">
                 <div class="type-label">
-                  <span><?php echo $lang->task->allTasks;?></span> <?php echo DS;?> <span><?php echo $lang->task->noFinished;?></span>
+                  <span><?php echo $lang->task->noFinished;?></span> : <span id='undone-task'><?php echo $project->undoneTasks;?></span>
                 </div>
-                <div class="type-value">
-                  <small><?php echo $project->totalTasks;?></small> <?php echo DS;?> <strong><?php echo $project->undoneTasks;?></strong>
+                <div class="type-label">
+                  <span><?php echo $lang->task->allTasks;?></span> : <span><?php echo $project->totalTasks;?></span>
                 </div>
               </div>
             </div>
@@ -122,10 +125,10 @@ $(function()
               </div>
               <div class="type-info">
                 <div class="type-label">
-                  <span><?php echo $lang->story->total;?></span> <?php echo DS;?> <span><?php echo $lang->story->unclosed;?></span>
+                  <span><?php echo $lang->story->unclosed;?></span> : <span id='unclosed-story'><?php echo $project->unclosedStories;?></span>
                 </div>
-                <div class="type-value">
-                  <small><?php echo $project->totalStories;?></small> <?php echo DS;?> <strong><?php echo $project->unclosedStories;?></strong>
+                <div class="type-label">
+                  <span><?php echo $lang->story->total;?></span> : <span><?php echo $project->totalStories;?></span>
                 </div>
               </div>
             </div>
@@ -137,10 +140,10 @@ $(function()
               </div>
               <div class="type-info">
                 <div class="type-label">
-                  <span><?php echo $lang->bug->allBugs;?></span> <?php echo DS;?> <span><?php echo $lang->bug->unResolved;?></span>
+                  <span><?php echo $lang->bug->unResolved;?></span> : <span id='active-bug'><?php echo $project->activeBugs;?></span>
                 </div>
-                <div class="type-value">
-                  <small><?php echo $project->totalBugs;?></small> <?php echo DS;?> <strong><?php echo $project->activeBugs;?></strong>
+                <div class="type-label">
+                  <span id='all-bug'><?php echo $lang->bug->allBugs;?></span> : <span><?php echo $project->totalBugs;?></span>
                 </div>
               </div>
             </div>
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 96a019f21d..2ba4143ae5 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -11,3 +11,4 @@
 
 /* Finish task #4751. */
 .hide-sidebar #sidebar .cell{display:none;}
+.main-content{padding:30px};