From 77b78b57ebc5908fa1ccff24de291a6799a9f51f Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Thu, 17 May 2018 09:48:51 +0800
Subject: [PATCH]  * fix block styles.

---
 module/block/lang/en.php                |  2 +-
 module/block/lang/zh-cn.php             |  2 +-
 module/block/lang/zh-tw.php             |  2 +-
 module/block/view/projectblock.html.php | 26 ++++++++++++-------------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index 681b52982c..7eee7ef6ee 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -54,7 +54,7 @@ $lang->block->confirmClose       = 'Do you want to permanently close this block?
 $lang->block->remove             = 'Remove';
 $lang->block->refresh            = 'Refresh';
 $lang->block->hidden             = 'Hide';
-$lang->block->dynamicInfo        = "<span class='timeline-tag'>%s</span>, <span class='timeline-text'>%s <em>%s</em> %s <a href='%s'>%s</a></span>";
+$lang->block->dynamicInfo        = "<span class='timeline-tag'>%s</span> <span class='timeline-text'>%s <em>%s</em> %s <a href='%s'>%s</a></span>";
 
 $lang->block->default['product']['1']['title'] = $lang->productCommon . ' Report';
 $lang->block->default['product']['1']['block'] = 'statistic';
diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index f5a2038d68..e7557161a7 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -54,7 +54,7 @@ $lang->block->confirmClose       = '确定永久关闭该区块吗？闭后所
 $lang->block->remove             = '移除';
 $lang->block->refresh            = '刷新';
 $lang->block->hidden             = '隐藏';
-$lang->block->dynamicInfo        = "<span class='timeline-tag'>%s</span>, <span class='timeline-text'>%s <em>%s</em> %s <a href='%s'>%s</a></span>";
+$lang->block->dynamicInfo        = "<span class='timeline-tag'>%s</span> <span class='timeline-text'>%s <em>%s</em> %s <a href='%s'>%s</a></span>";
 
 $lang->block->default['product']['1']['title'] = $lang->productCommon . '统计';
 $lang->block->default['product']['1']['block'] = 'statistic';
diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php
index 57581cdb91..214f0f6796 100644
--- a/module/block/lang/zh-tw.php
+++ b/module/block/lang/zh-tw.php
@@ -54,7 +54,7 @@ $lang->block->confirmClose       = '確定永久關閉該區塊嗎？閉後所
 $lang->block->remove             = '移除';
 $lang->block->refresh            = '刷新';
 $lang->block->hidden             = '隱藏';
-$lang->block->dynamicInfo        = "<span class='timeline-tag'>%s</span>, <span class='timeline-text'>%s <em>%s</em> %s <a href='%s'>%s</a></span>";
+$lang->block->dynamicInfo        = "<span class='timeline-tag'>%s</span> <span class='timeline-text'>%s <em>%s</em> %s <a href='%s'>%s</a></span>";
 
 $lang->block->default['product']['1']['title'] = $lang->productCommon . '統計';
 $lang->block->default['product']['1']['block'] = 'statistic';
diff --git a/module/block/view/projectblock.html.php b/module/block/view/projectblock.html.php
index 0b29104e4a..3990f72f63 100644
--- a/module/block/view/projectblock.html.php
+++ b/module/block/view/projectblock.html.php
@@ -14,21 +14,21 @@
   <table class='table table-borderless table-hover table-fixed-head block-projects'>
     <thead>
       <tr class='text-center'>
-        <th class='text-left c-name'><?php echo $lang->project->name;?></th>
-        <th class="c-deadline"><?php echo $lang->project->end;?></th>
+        <th class='c-name text-left'><?php echo $lang->project->name;?></th>
+        <th class="c-date"><?php echo $lang->project->end;?></th>
         <?php if($longBlock):?>
         <th class="c-status"><?php echo $lang->statusAB;?></th>
-        <th class="c-estimate"><?php echo $lang->project->totalEstimate;?></th>
-        <th class="c-consumed"><?php echo $lang->project->totalConsumed;?></th>
-        <th class="c-left"><?php echo $lang->project->totalLeft;?></th>
+        <th class="c-hours"><?php echo $lang->project->totalEstimate;?></th>
+        <th class="c-hours"><?php echo $lang->project->totalConsumed;?></th>
+        <th class="c-hours"><?php echo $lang->project->totalLeft;?></th>
         <?php endif;?>
         <th class="c-progress"><?php echo $lang->project->progress;?></th>
         <?php if($longBlock):?>
-        <th class="c-spark"><?php echo $lang->project->burn;?></th>
+        <th><?php echo $lang->project->burn;?></th>
         <?php endif;?>
       </tr>
     </thead>
-    <tbody>
+    <tbody class="text-center">
      <?php $id = 0; ?>
      <?php foreach($projectStats as $project):?>
       <?php
@@ -36,8 +36,8 @@
       $viewLink = $this->createLink('project', 'task', 'project=' . $project->id);
       ?>
       <tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
-        <td class='text-left c-name' title='<?php echo $project->name;?>'><nobr><?php echo html::a($this->createLink('project', 'task', 'project=' . $project->id), $project->name, '', "title='$project->name'");?></nobr></td>
-        <td class="c-deadline"><?php echo $project->end;?></td>
+        <td class='c-name text-left' title='<?php echo $project->name;?>'><nobr><?php echo html::a($this->createLink('project', 'task', 'project=' . $project->id), $project->name, '', "title='$project->name'");?></nobr></td>
+        <td class="c-date"><?php echo $project->end;?></td>
         <?php if($longBlock):?>
         <td class="c-status">
           <?php if(isset($project->delay)):?>
@@ -46,9 +46,9 @@
           <span class="project-status-<?php echo $project->status?>"><span class="label label-dot"></span> <?php echo zget($lang->project->statusList, $project->status, '');?></span>
           <?php endif;?>
         </td>
-        <td class="c-estimate"><?php echo $project->hours->totalEstimate;?></td>
-        <td class="c-consumed"><?php echo $project->hours->totalConsumed;?></td>
-        <td class="c-left"><?php echo $project->hours->totalLeft;?></td>
+        <td class="c-hours"><?php echo $project->hours->totalEstimate;?></td>
+        <td class="c-hours"><?php echo $project->hours->totalConsumed;?></td>
+        <td class="c-hours"><?php echo $project->hours->totalLeft;?></td>
         <?php endif;?>
         <td class="c-progress">
           <div class="progress progress-text-left">
@@ -58,7 +58,7 @@
           </div>
         </td>
         <?php if($longBlock):?>
-        <td id='spark-<?php echo $id++?>' class='c-spark sparkline' values='<?php echo join(',', $project->burns);?>'></td>
+        <td id='spark-<?php echo $id++?>' class='no-padding sparkline' values='<?php echo join(',', $project->burns);?>'></td>
         <?php endif;?>
      </tr>
      <?php endforeach;?>