From a99aab00ea40138187c32f507a45f9d8ad3d2012 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Wed, 5 Aug 2020 17:04:47 +0800
Subject: [PATCH]  *Finish task #7587.

---
 module/action/model.php              | 6 +++---
 module/company/control.php           | 2 +-
 module/company/css/dynamic.css       | 1 +
 module/company/view/dynamic.html.php | 4 ++--
 module/my/control.php                | 2 +-
 module/my/css/dynamic.css            | 1 +
 module/my/view/dynamic.html.php      | 4 ++--
 module/product/control.php           | 2 +-
 module/product/css/dynamic.css       | 1 +
 module/product/view/dynamic.html.php | 4 ++--
 module/project/control.php           | 2 +-
 module/project/css/dynamic.css       | 1 +
 module/project/view/dynamic.html.php | 4 ++--
 module/user/control.php              | 2 +-
 module/user/css/dynamic.css          | 1 +
 module/user/view/dynamic.html.php    | 4 ++--
 16 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/module/action/model.php b/module/action/model.php
index 64d2ac9def..0aa57c4eec 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -1082,13 +1082,13 @@ class actionModel extends model
      * @access public
      * @return array
      */
-    public function buildDateGroup($actions, $direction = 'next')
+    public function buildDateGroup($actions, $direction = 'next', $type = 'today')
     {
         $dateGroup = array();
         foreach($actions as $action)
         {
             $timeStamp    = strtotime(isset($action->originalDate) ? $action->originalDate : $action->date);
-            $date         = date(DT_DATE4, $timeStamp);
+            $date         = $type == 'all' ? date(DT_DATE3, $timeStamp) : date(DT_DATE4, $timeStamp);
             $action->time = date(DT_TIME2, $timeStamp);
             $dateGroup[$date][] = $action;
         }
@@ -1103,7 +1103,7 @@ class actionModel extends model
                 foreach($lastDateActions as $action)
                 {
                     $timeStamp    = strtotime(isset($action->originalDate) ? $action->originalDate : $action->date);
-                    $date         = date(DT_DATE4, $timeStamp);
+                    $date         = $type == 'all' ? date(DT_DATE3, $timeStamp) : date(DT_DATE4, $timeStamp);
                     $action->time = date(DT_TIME2, $timeStamp);
                     $dateGroup[$date][] = $action;
                 }
diff --git a/module/company/control.php b/module/company/control.php
index e3633a5e63..4c1c107308 100644
--- a/module/company/control.php
+++ b/module/company/control.php
@@ -243,7 +243,7 @@ class company extends control
         $this->view->orderBy    = $orderBy;
         $this->view->pager      = $pager;
         $this->view->param      = $param;
-        $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction);
+        $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction, $browseType);
         $this->view->direction  = $direction;
         $this->display();
     }
diff --git a/module/company/css/dynamic.css b/module/company/css/dynamic.css
index 7857018ad7..0beed2ab9c 100644
--- a/module/company/css/dynamic.css
+++ b/module/company/css/dynamic.css
@@ -17,3 +17,4 @@
 .dynamic.collapsed .timeline {max-height: 58px;}
 .dynamic.collapsed .timeline > li + li {display: none;}
 .dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8'; }
+.margin-l-50px {margin-left: 50px;}
diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php
index 3ee42be80f..a2465c1753 100644
--- a/module/company/view/dynamic.html.php
+++ b/module/company/view/dynamic.html.php
@@ -41,14 +41,14 @@
     <?php foreach($dateGroups as $date => $actions):?>
     <?php $isToday = date(DT_DATE4) == $date;?>
     <div class="dynamic <?php if($isToday) echo 'active';?>">
-      <div class="dynamic-date">
+      <div class="dynamic-date <?php if($browseType == 'all') echo 'w-200px';?>">
         <?php if($isToday):?>
         <span class="date-label"><?php echo $lang->action->dynamic->today;?></span>
         <?php endif;?>
         <span class="date-text"><?php echo $date;?></span>
         <button type="button" class="btn btn-info btn-icon btn-sm dynamic-btn"><i class="icon icon-caret-down"></i></button>
       </div>
-      <ul class="timeline timeline-tag-left">
+      <ul class="timeline timeline-tag-left <?php if($browseType == 'all') echo 'margin-l-50px';?>">
         <?php if($direction == 'next') $actions = array_reverse($actions);?>
         <?php foreach($actions as $i => $action):?>
         <?php if(empty($firstAction)) $firstAction = $action;?>
diff --git a/module/my/control.php b/module/my/control.php
index ea181e4a96..6ed5c4fc00 100644
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -585,7 +585,7 @@ class my extends control
         $this->view->type       = $type;
         $this->view->orderBy    = $orderBy;
         $this->view->pager      = $pager;
-        $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction);
+        $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction, $type);
         $this->view->direction  = $direction;
         $this->display();
     }
diff --git a/module/my/css/dynamic.css b/module/my/css/dynamic.css
index c7ec7d754a..1abdede424 100644
--- a/module/my/css/dynamic.css
+++ b/module/my/css/dynamic.css
@@ -18,3 +18,4 @@
 .dynamic.collapsed .timeline {max-height: 58px;}
 .dynamic.collapsed .timeline > li + li {display: none;}
 .dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8'; }
+.margin-l-50px {margin-left: 50px;}
diff --git a/module/my/view/dynamic.html.php b/module/my/view/dynamic.html.php
index 4663a2ccd1..21f4d8eeb5 100644
--- a/module/my/view/dynamic.html.php
+++ b/module/my/view/dynamic.html.php
@@ -38,14 +38,14 @@
     <?php foreach($dateGroups as $date => $actions):?>
     <?php $isToday = date(DT_DATE4) == $date;?>
     <div class="dynamic <?php if($isToday) echo 'active';?>">
-      <div class="dynamic-date">
+      <div class="dynamic-date <?php if($type == 'all') echo 'w-200px';?>">
         <?php if($isToday):?>
         <span class="date-label"><?php echo $lang->action->dynamic->today;?></span>
         <?php endif;?>
         <span class="date-text"><?php echo $date;?></span>
         <button type="button" class="btn btn-info btn-icon btn-sm dynamic-btn"><i class="icon icon-caret-down"></i></button>
       </div>
-      <ul class="timeline timeline-tag-left">
+      <ul class="timeline timeline-tag-left <?php if($type == 'all') echo 'margin-l-50px';?>">
         <?php if($direction == 'next') $actions = array_reverse($actions);?>
         <?php foreach($actions as $i => $action):?>
         <?php if(empty($firstAction)) $firstAction = $action;?>
diff --git a/module/product/control.php b/module/product/control.php
index 69132d34cd..c35d101b6b 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -557,7 +557,7 @@ class product extends control
         $this->view->orderBy    = $orderBy;
         $this->view->param      = $param;
         $this->view->pager      = $pager;
-        $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction);
+        $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction, $type);
         $this->view->direction  = $direction;
         $this->display();
     }
diff --git a/module/product/css/dynamic.css b/module/product/css/dynamic.css
index ca418df21d..d26c43a9b8 100644
--- a/module/product/css/dynamic.css
+++ b/module/product/css/dynamic.css
@@ -19,3 +19,4 @@
 .dynamic.collapsed .timeline {max-height: 58px;}
 .dynamic.collapsed .timeline > li + li {display: none;}
 .dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8'; }
+.margin-l-50px {margin-left: 50px;}
diff --git a/module/product/view/dynamic.html.php b/module/product/view/dynamic.html.php
index 12cffb2909..0d995517e9 100755
--- a/module/product/view/dynamic.html.php
+++ b/module/product/view/dynamic.html.php
@@ -67,14 +67,14 @@
     <?php foreach($dateGroups as $date => $actions):?>
     <?php $isToday = date(DT_DATE4) == $date;?>
     <div class="dynamic <?php if($isToday) echo 'active';?>">
-      <div class="dynamic-date">
+      <div class="dynamic-date <?php if($type == 'all') echo 'w-200px';?>">
         <?php if($isToday):?>
         <span class="date-label"><?php echo $lang->action->dynamic->today;?></span>
         <?php endif;?>
         <span class="date-text"><?php echo $date;?></span>
         <button type="button" class="btn btn-info btn-icon btn-sm dynamic-btn"><i class="icon icon-caret-down"></i></button>
       </div>
-      <ul class="timeline timeline-tag-left">
+      <ul class="timeline timeline-tag-left <?php if($type == 'all') echo 'margin-l-50px';?>">
         <?php if($direction == 'next') $actions = array_reverse($actions);?>
         <?php foreach($actions as $i => $action):?>
         <?php if(empty($firstAction)) $firstAction = $action;?>
diff --git a/module/project/control.php b/module/project/control.php
index 6631a89c6e..559dfe053a 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -2195,7 +2195,7 @@ class project extends control
         $this->view->orderBy    = $orderBy;
         $this->view->pager      = $pager;
         $this->view->param      = $param;
-        $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction);
+        $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction, $type);
         $this->view->direction  = $direction;
         $this->display();
     }
diff --git a/module/project/css/dynamic.css b/module/project/css/dynamic.css
index ca418df21d..d26c43a9b8 100644
--- a/module/project/css/dynamic.css
+++ b/module/project/css/dynamic.css
@@ -19,3 +19,4 @@
 .dynamic.collapsed .timeline {max-height: 58px;}
 .dynamic.collapsed .timeline > li + li {display: none;}
 .dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8'; }
+.margin-l-50px {margin-left: 50px;}
diff --git a/module/project/view/dynamic.html.php b/module/project/view/dynamic.html.php
index 2cee4f31d7..2b7770dbdd 100755
--- a/module/project/view/dynamic.html.php
+++ b/module/project/view/dynamic.html.php
@@ -68,14 +68,14 @@
     <?php foreach($dateGroups as $date => $actions):?>
     <?php $isToday = date(DT_DATE4) == $date;?>
     <div class="dynamic <?php if($isToday) echo 'active';?>">
-      <div class="dynamic-date">
+      <div class="dynamic-date <?php if($type == 'all') echo 'w-200px';?>">
         <?php if($isToday):?>
         <span class="date-label"><?php echo $lang->action->dynamic->today;?></span>
         <?php endif;?>
         <span class="date-text"><?php echo $date;?></span>
         <button type="button" class="btn btn-info btn-icon btn-sm dynamic-btn"><i class="icon icon-caret-down"></i></button>
       </div>
-      <ul class="timeline timeline-tag-left">
+      <ul class="timeline timeline-tag-left <?php if($type == 'all') echo 'margin-l-50px';?>">
         <?php if($direction == 'next') $actions = array_reverse($actions);?>
         <?php foreach($actions as $i => $action):?>
         <?php if(empty($firstAction)) $firstAction = $action;?>
diff --git a/module/user/control.php b/module/user/control.php
index 45ce88c29d..52b143739e 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -992,7 +992,7 @@ class user extends control
         $this->view->account    = $account;
         $this->view->pager      = $pager;
         $this->view->user       = $this->user->getById($account);
-        $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction);
+        $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction, $period);
         $this->view->direction  = $direction;
         $this->display();
     }
diff --git a/module/user/css/dynamic.css b/module/user/css/dynamic.css
index 8fa4cd0448..c4b8cc81f0 100644
--- a/module/user/css/dynamic.css
+++ b/module/user/css/dynamic.css
@@ -18,3 +18,4 @@
 .dynamic.collapsed .timeline {max-height: 58px;}
 .dynamic.collapsed .timeline > li + li {display: none;}
 .dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8'; }
+.margin-l-50px {margin-left: 50px;}
diff --git a/module/user/view/dynamic.html.php b/module/user/view/dynamic.html.php
index 40eee11d2a..83bf799b0f 100644
--- a/module/user/view/dynamic.html.php
+++ b/module/user/view/dynamic.html.php
@@ -36,14 +36,14 @@
     <?php foreach($dateGroups as $date => $actions):?>
     <?php $isToday = date(DT_DATE4) == $date;?>
     <div class="dynamic <?php if($isToday) echo 'active';?>">
-      <div class="dynamic-date">
+      <div class="dynamic-date <?php if($type == 'all') echo 'w-200px';?>">
         <?php if($isToday):?>
         <span class="date-label"><?php echo $lang->action->dynamic->today;?></span>
         <?php endif;?>
         <span class="date-text"><?php echo $date;?></span>
         <button type="button" class="btn btn-info btn-icon btn-sm dynamic-btn"><i class="icon icon-caret-down"></i></button>
       </div>
-      <ul class="timeline timeline-tag-left">
+      <ul class="timeline timeline-tag-left <?php if($type == 'all') echo 'margin-l-50px';?>">
         <?php if($direction == 'next') $actions = array_reverse($actions);?>
         <?php foreach($actions as $i => $action):?>
         <?php if(empty($firstAction)) $firstAction = $action;?>