From f6be2bb180fdf7f26522936bb42811ffffccabf4 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 24 Jan 2018 16:11:11 +0800
Subject: [PATCH]  * finish task #3608.

---
 module/block/lang/en.php           | 26 ++++++++++++--------------
 module/block/lang/zh-cn.php        | 24 +++++++++++-------------
 module/block/view/dynamic.html.php | 11 +++++++----
 3 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index 9dd3332839..c875e1fa03 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -52,7 +52,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        = "%s, %s <em>%s</em> %s <a href='%s'>%s</a>.";
+$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'] = 'Open ' . $lang->productCommon . 's';
 $lang->block->default['product']['1']['block'] = 'list';
@@ -109,31 +109,29 @@ $lang->block->default['qa']['3']['params']['num']     = 15;
 $lang->block->default['qa']['3']['params']['orderBy'] = 'id_desc';
 $lang->block->default['qa']['3']['params']['type']    = 'wait';
 
-$lang->block->default['full']['my']['1']['title']  = 'Flowchart';
-$lang->block->default['full']['my']['1']['block']  = 'flowchart';
+$lang->block->default['full']['my']['1']['title']  = 'Welcome';
+$lang->block->default['full']['my']['1']['block']  = 'welcome';
 $lang->block->default['full']['my']['1']['grid']   = 8;
 $lang->block->default['full']['my']['1']['source'] = '';
 $lang->block->default['full']['my']['2']['title']  = 'Dynamic';
 $lang->block->default['full']['my']['2']['block']  = 'dynamic';
 $lang->block->default['full']['my']['2']['grid']   = 4;
 $lang->block->default['full']['my']['2']['source'] = '';
-$lang->block->default['full']['my']['3'] = $lang->block->default['project']['1'];
-$lang->block->default['full']['my']['3']['source'] = 'project';
-$lang->block->default['full']['my']['4']['title']  = '指派给我';
-$lang->block->default['full']['my']['4']['block']  = 'assigntome';
-$lang->block->default['full']['my']['4']['grid']   = 8;
-$lang->block->default['full']['my']['4']['source'] = '';
-$lang->block->default['full']['my']['5']['title']  = 'My Todo';
+$lang->block->default['full']['my']['3']['title']  = 'Flowchart';
+$lang->block->default['full']['my']['3']['block']  = 'flowchart';
+$lang->block->default['full']['my']['3']['grid']   = 8;
+$lang->block->default['full']['my']['3']['source'] = '';
+$lang->block->default['full']['my']['5']['title']  = 'My Todos';
 $lang->block->default['full']['my']['5']['block']  = 'list';
 $lang->block->default['full']['my']['5']['grid']   = 4;
 $lang->block->default['full']['my']['5']['source'] = 'todo';
 $lang->block->default['full']['my']['5']['params']['num'] = '20';
-$lang->block->default['full']['my']['6'] = $lang->block->default['product']['1'];
-$lang->block->default['full']['my']['6']['source'] = 'product';
+$lang->block->default['full']['my']['6'] = $lang->block->default['project']['1'];
+$lang->block->default['full']['my']['6']['source'] = 'project';
 $lang->block->default['full']['my']['7'] = $lang->block->default['project']['2'];
 $lang->block->default['full']['my']['7']['source'] = 'project';
-$lang->block->default['full']['my']['8'] = $lang->block->default['qa']['1'];
-$lang->block->default['full']['my']['8']['source'] = 'qa';
+$lang->block->default['full']['my']['8'] = $lang->block->default['product']['1'];
+$lang->block->default['full']['my']['8']['source'] = 'product';
 $lang->block->default['full']['my']['9'] = $lang->block->default['product']['2'];
 $lang->block->default['full']['my']['9']['source'] = 'product';
 $lang->block->default['full']['my']['10'] = $lang->block->default['qa']['2'];
diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index 6ab6b0914e..50cb2916ac 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        = "%s, %s <em>%s</em> %s <a href='%s'>%s</a>。";
+$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'] = 'list';
@@ -111,31 +111,29 @@ $lang->block->default['qa']['3']['params']['num']     = 15;
 $lang->block->default['qa']['3']['params']['orderBy'] = 'id_desc';
 $lang->block->default['qa']['3']['params']['type']    = 'wait';
 
-$lang->block->default['full']['my']['1']['title']  = '流程图';
-$lang->block->default['full']['my']['1']['block']  = 'flowchart';
+$lang->block->default['full']['my']['1']['title']  = '欢迎';
+$lang->block->default['full']['my']['1']['block']  = 'welcome';
 $lang->block->default['full']['my']['1']['grid']   = 8;
 $lang->block->default['full']['my']['1']['source'] = '';
 $lang->block->default['full']['my']['2']['title']  = '最新动态';
 $lang->block->default['full']['my']['2']['block']  = 'dynamic';
 $lang->block->default['full']['my']['2']['grid']   = 4;
 $lang->block->default['full']['my']['2']['source'] = '';
-$lang->block->default['full']['my']['3'] = $lang->block->default['project']['1'];
-$lang->block->default['full']['my']['3']['source'] = 'project';
-$lang->block->default['full']['my']['4']['title']  = '指派给我';
-$lang->block->default['full']['my']['4']['block']  = 'assigntome';
-$lang->block->default['full']['my']['4']['grid']   = 8;
-$lang->block->default['full']['my']['4']['source'] = '';
+$lang->block->default['full']['my']['3']['title']  = '流程图';
+$lang->block->default['full']['my']['3']['block']  = 'flowchart';
+$lang->block->default['full']['my']['3']['grid']   = 8;
+$lang->block->default['full']['my']['3']['source'] = '';
 $lang->block->default['full']['my']['5']['title']  = '我的待办';
 $lang->block->default['full']['my']['5']['block']  = 'list';
 $lang->block->default['full']['my']['5']['grid']   = 4;
 $lang->block->default['full']['my']['5']['source'] = 'todo';
 $lang->block->default['full']['my']['5']['params']['num'] = '20';
-$lang->block->default['full']['my']['6'] = $lang->block->default['product']['1'];
-$lang->block->default['full']['my']['6']['source'] = 'product';
+$lang->block->default['full']['my']['6'] = $lang->block->default['project']['1'];
+$lang->block->default['full']['my']['6']['source'] = 'project';
 $lang->block->default['full']['my']['7'] = $lang->block->default['project']['2'];
 $lang->block->default['full']['my']['7']['source'] = 'project';
-$lang->block->default['full']['my']['8'] = $lang->block->default['qa']['1'];
-$lang->block->default['full']['my']['8']['source'] = 'qa';
+$lang->block->default['full']['my']['8'] = $lang->block->default['product']['1'];
+$lang->block->default['full']['my']['8']['source'] = 'product';
 $lang->block->default['full']['my']['9'] = $lang->block->default['product']['2'];
 $lang->block->default['full']['my']['9']['source'] = 'product';
 $lang->block->default['full']['my']['10'] = $lang->block->default['qa']['2'];
diff --git a/module/block/view/dynamic.html.php b/module/block/view/dynamic.html.php
index 6e85881708..70b05fc399 100644
--- a/module/block/view/dynamic.html.php
+++ b/module/block/view/dynamic.html.php
@@ -1,12 +1,15 @@
-<table class='table table-condensed table-hover table-striped table-borderless table-fixed'>
+<ul class="timeline timeline-tag-left">
   <?php 
+  $i = 0;
   foreach($actions as $action)
   {
       $user = isset($users[$action->actor]) ? $users[$action->actor] : $action->actor;
       if($action->action == 'login' or $action->action == 'logout' or empty($action->objectLink)) $action->objectName = $action->objectLabel = '';
-      echo "<tr><td class='nobr' width='100%'>";
+      $class = $i % 3 == 0 ? "class='active'" : '';
+      echo "<li $class><div>";
       printf($lang->block->dynamicInfo, $action->date, $user, $action->actionLabel, $action->objectLabel, $action->objectLink, $action->objectName);
-      echo "</td></tr>";
+      echo "</div></li>";
+      $i++;
   }
  ?>
-</table>
+</ul>