+
date;?>
actor) . ' ' . "{$action->actionLabel}" . $action->objectLabel . ' ' . html::a($action->objectLink, $action->objectName, '', "title='$action->objectName'");?>
diff --git a/module/my/css/dynamic.css b/module/my/css/dynamic.css
index 63dd739080..071ed48304 100644
--- a/module/my/css/dynamic.css
+++ b/module/my/css/dynamic.css
@@ -19,6 +19,11 @@
.dynamic.collapsed .timeline > li + li {display: none;}
.dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8';}
-.dynamic .label-action {margin-left: 12px;}
-.dynamic .label-name,
-.dynamic .label-name a {color: #838A9D;}
+.timeline>li:before {left: -26px;}
+.timeline>li+li:after {left: -23px;}
+.timeline-text {margin-left: -18px;}
+.label-action {padding: 0 4px;}
+.label-id {margin-left: 4px;}
+.timeline>li.active:before {left: -30px;}
+.timeline>li>div:after {left: -27px;}
+.timeline .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
diff --git a/module/my/view/dynamic.html.php b/module/my/view/dynamic.html.php
index f8dd4a9007..885973e447 100644
--- a/module/my/view/dynamic.html.php
+++ b/module/my/view/dynamic.html.php
@@ -54,9 +54,9 @@
time?>
user->realname;?>
- actionLabel;?>
+ actionLabel;?>
action != 'login' and $action->action != 'logout'):?>
- objectLabel;?>
+ objectLabel;?>
objectID):?>
objectID;?>
diff --git a/module/product/css/dashboard.css b/module/product/css/dashboard.css
index 9d4efaf435..3ba63973c7 100644
--- a/module/product/css/dashboard.css
+++ b/module/product/css/dashboard.css
@@ -3,5 +3,11 @@
.block-release .panel-body > .btn.pull-right {position: absolute; right: 20px; bottom: 20px;}
.release-line li .title {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
-.block-dynamic .label-action {margin-left: 12px;}
-.block-dynamic .label-action + a {color: #838A9D;}
+.timeline>li:before {left: -26px;}
+.timeline>li+li:after {left: -23px;}
+.timeline-text {margin-left: -18px;}
+.block-dynamic .label-action {padding: 0 6px;}
+.block-dynamic .label-action + a {padding-left: 6px;}
+.timeline>li.active:before {left: -30px;}
+.timeline>li>div:after {left: -27px;}
+.timeline .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
diff --git a/module/product/css/dynamic.css b/module/product/css/dynamic.css
index 6efa8fdb96..0858328480 100644
--- a/module/product/css/dynamic.css
+++ b/module/product/css/dynamic.css
@@ -20,5 +20,11 @@
.dynamic.collapsed .timeline > li + li {display: none;}
.dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8';}
-.dynamic .label-action {margin-left: 12px;}
-.dynamic .label-id + a {color: #838A9D;}
+.timeline>li:before {left: -26px;}
+.timeline>li+li:after {left: -23px;}
+.timeline-text {margin-left: -18px;}
+.label-action {padding: 0 4px;}
+.label-id {margin-left: 4px;}
+.timeline>li.active:before {left: -30px;}
+.timeline>li>div:after {left: -27px;}
+.timeline .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
diff --git a/module/product/view/dashboard.html.php b/module/product/view/dashboard.html.php
index 6073d92667..7223110f13 100644
--- a/module/product/view/dashboard.html.php
+++ b/module/product/view/dashboard.html.php
@@ -61,7 +61,7 @@
- major) echo "class='active'";?>>
-
+
date;?>
actor) . ' ' . "{$action->actionLabel}" . $action->objectLabel . ' ' . html::a($action->objectLink, $action->objectName);?>
diff --git a/module/product/view/dynamic.html.php b/module/product/view/dynamic.html.php
index 2ebd40cf3b..fb983ee881 100755
--- a/module/product/view/dynamic.html.php
+++ b/module/product/view/dynamic.html.php
@@ -83,7 +83,7 @@
time?>
actor);?>
- actionLabel;?>
+ actionLabel;?>
objectLabel;?>
objectID;?>
objectName) echo html::a($action->objectLink, $action->objectName);?>
diff --git a/module/project/css/dynamic.css b/module/project/css/dynamic.css
index 6efa8fdb96..0858328480 100644
--- a/module/project/css/dynamic.css
+++ b/module/project/css/dynamic.css
@@ -20,5 +20,11 @@
.dynamic.collapsed .timeline > li + li {display: none;}
.dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8';}
-.dynamic .label-action {margin-left: 12px;}
-.dynamic .label-id + a {color: #838A9D;}
+.timeline>li:before {left: -26px;}
+.timeline>li+li:after {left: -23px;}
+.timeline-text {margin-left: -18px;}
+.label-action {padding: 0 4px;}
+.label-id {margin-left: 4px;}
+.timeline>li.active:before {left: -30px;}
+.timeline>li>div:after {left: -27px;}
+.timeline .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
diff --git a/module/project/css/view.css b/module/project/css/view.css
index 196e87c506..f8bcc66346 100644
--- a/module/project/css/view.css
+++ b/module/project/css/view.css
@@ -2,5 +2,11 @@
.block-team div.col-xs-6 {white-space: nowrap; overflow: hidden;}
.cell .detail .row-grid {display: block;}
-.block-dynamic .label-action {margin-left: 12px;}
-.block-dynamic .label-action + a {color: #838A9D;}
+.timeline>li:before {left: -26px;}
+.timeline>li+li:after {left: -23px;}
+.timeline-text {margin-left: -18px;}
+.block-dynamic .label-action {padding: 0 6px;}
+.block-dynamic .label-action + a {padding-left: 6px;}
+.timeline>li.active:before {left: -30px;}
+.timeline>li>div:after {left: -27px;}
+.timeline .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
index 0d324492d6..48457ad88d 100644
--- a/module/project/view/view.html.php
+++ b/module/project/view/view.html.php
@@ -27,7 +27,7 @@
- major) echo "class='active'";?>>
-
+
date;?>
actor) . ' ' . "{$action->actionLabel}" . $action->objectLabel . ' ' . html::a($action->objectLink, $action->objectName, '', "title='$action->objectName'");?>
diff --git a/module/user/css/dynamic.css b/module/user/css/dynamic.css
index 9d3825b4c8..2151548788 100644
--- a/module/user/css/dynamic.css
+++ b/module/user/css/dynamic.css
@@ -19,5 +19,11 @@
.dynamic.collapsed .timeline > li + li {display: none;}
.dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8';}
-.dynamic .label-action {margin-left: 12px;}
-.dynamic .label-name a {color: #838A9D;}
+.timeline>li:before {left: -26px;}
+.timeline>li+li:after {left: -23px;}
+.timeline-text {margin-left: -18px;}
+.label-action {padding: 0 4px;}
+.label-id {margin-left: 4px;}
+.timeline>li.active:before {left: -30px;}
+.timeline>li>div:after {left: -27px;}
+.timeline .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
diff --git a/module/user/view/dynamic.html.php b/module/user/view/dynamic.html.php
index 6a33e0a05f..e01b4e7e55 100644
--- a/module/user/view/dynamic.html.php
+++ b/module/user/view/dynamic.html.php
@@ -52,7 +52,7 @@
time?>
actor);?>
- actionLabel;?>
+ actionLabel;?>
objectLabel;?>
objectID;?>
objectName) echo "" . html::a($action->objectLink, $action->objectName) . '';?>