diff --git a/module/company/css/dynamic.css b/module/company/css/dynamic.css
index 7e5237559d..3d3a827277 100644
--- a/module/company/css/dynamic.css
+++ b/module/company/css/dynamic.css
@@ -10,7 +10,7 @@
.dynamic .timeline-tag {left: -75px; font-size: 14px; color: #838A9D;}
.dynamic .timeline-text {color: #3C4353;}
.dynamic .text-muted {color: #838A9D;}
-.dynamic .label-id {top: -1px;}
+.dynamic .label-id {top: -1px; border: 1px solid rgba(131,138,157,0.25); color: #838A9D;}
.dynamic.active .timeline,
.dynamic.active .dynamic-date {border-color: #00a9fc;}
.dynamic.active .dynamic-date:before {background-color: #00a9fc;}
@@ -21,3 +21,7 @@
.c-project, .c-product, .c-execution {width: 110px !important; overflow: unset;}
.c-user, .c-order {width: 96px !important; overflow: unset;}
.c-date {width: 200px;}
+
+.dynamic .label-action {margin-left: 12px;}
+.dynamic .label-name,
+.dynamic .label-name a {color: #838A9D;}
diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php
index d61d57213f..654da9ba61 100644
--- a/module/company/view/dynamic.html.php
+++ b/module/company/view/dynamic.html.php
@@ -73,8 +73,12 @@
actionLabel;?>
action != 'login' and $action->action != 'logout'):?>
objectLabel;?>
+ objectID):?>
+ objectID;?>
+
objectType == 'meeting') $tab = $action->project ? "data-app='project'" : "data-app='my'";?>
+
objectName) and $action->objectID)
{
@@ -93,9 +97,7 @@
echo html::a($action->objectLink, $action->objectName, '', $tab);
}
?>
- objectID):?>
- objectID;?>
-
+
diff --git a/module/execution/css/dynamic.css b/module/execution/css/dynamic.css
index 5e6cec8c8d..6efa8fdb96 100644
--- a/module/execution/css/dynamic.css
+++ b/module/execution/css/dynamic.css
@@ -12,10 +12,13 @@
.dynamic .timeline-tag {left: -75px; font-size: 14px; color: #838A9D;}
.dynamic .timeline-text {color: #3C4353;}
.dynamic .text-muted {color: #838A9D;}
-.dynamic .label-id {top: -1px;}
+.dynamic .label-id {top: -1px; border: 1px solid rgba(131,138,157,0.25); color: #838A9D;}
.dynamic.active .timeline,
.dynamic.active .dynamic-date {border-color: #00a9fc;}
.dynamic.active .dynamic-date:before {background-color: #00a9fc;}
.dynamic.collapsed .timeline {max-height: 58px;}
.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;}
diff --git a/module/my/css/dynamic.css b/module/my/css/dynamic.css
index b532c80b7c..63dd739080 100644
--- a/module/my/css/dynamic.css
+++ b/module/my/css/dynamic.css
@@ -11,10 +11,14 @@
.dynamic .timeline-tag {left: -75px; font-size: 14px; color: #838A9D;}
.dynamic .timeline-text {color: #3C4353;}
.dynamic .text-muted {color: #838A9D;}
-.dynamic .label-id {top: -1px;}
+.dynamic .label-id {top: -1px; border: 1px solid rgba(131,138,157,0.25); color: #838A9D;}
.dynamic.active .timeline,
.dynamic.active .dynamic-date {border-color: #00a9fc;}
.dynamic.active .dynamic-date:before {background-color: #00a9fc;}
.dynamic.collapsed .timeline {max-height: 58px;}
.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;}
diff --git a/module/my/view/dynamic.html.php b/module/my/view/dynamic.html.php
index 407dc57f6f..f8dd4a9007 100644
--- a/module/my/view/dynamic.html.php
+++ b/module/my/view/dynamic.html.php
@@ -56,9 +56,13 @@
user->realname;?>
actionLabel;?>
action != 'login' and $action->action != 'logout'):?>
- objectLabel;?>
+ objectLabel;?>
+ objectID):?>
+ objectID;?>
+
objectType == 'meeting') $tab = $action->project ? "data-app='project'" : "data-app='my'";?>
+
edition == 'max' and strpos($config->action->assetType, $action->objectType) !== false) and empty($action->objectName))
{
@@ -77,9 +81,7 @@
echo html::a($action->objectLink, $action->objectName, '', $tab);
}
?>
- objectID):?>
- objectID;?>
-
+
diff --git a/module/product/css/dynamic.css b/module/product/css/dynamic.css
index 5e6cec8c8d..6efa8fdb96 100644
--- a/module/product/css/dynamic.css
+++ b/module/product/css/dynamic.css
@@ -12,10 +12,13 @@
.dynamic .timeline-tag {left: -75px; font-size: 14px; color: #838A9D;}
.dynamic .timeline-text {color: #3C4353;}
.dynamic .text-muted {color: #838A9D;}
-.dynamic .label-id {top: -1px;}
+.dynamic .label-id {top: -1px; border: 1px solid rgba(131,138,157,0.25); color: #838A9D;}
.dynamic.active .timeline,
.dynamic.active .dynamic-date {border-color: #00a9fc;}
.dynamic.active .dynamic-date:before {background-color: #00a9fc;}
.dynamic.collapsed .timeline {max-height: 58px;}
.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;}
diff --git a/module/project/css/dynamic.css b/module/project/css/dynamic.css
index 5e6cec8c8d..6efa8fdb96 100644
--- a/module/project/css/dynamic.css
+++ b/module/project/css/dynamic.css
@@ -12,10 +12,13 @@
.dynamic .timeline-tag {left: -75px; font-size: 14px; color: #838A9D;}
.dynamic .timeline-text {color: #3C4353;}
.dynamic .text-muted {color: #838A9D;}
-.dynamic .label-id {top: -1px;}
+.dynamic .label-id {top: -1px; border: 1px solid rgba(131,138,157,0.25); color: #838A9D;}
.dynamic.active .timeline,
.dynamic.active .dynamic-date {border-color: #00a9fc;}
.dynamic.active .dynamic-date:before {background-color: #00a9fc;}
.dynamic.collapsed .timeline {max-height: 58px;}
.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;}
diff --git a/module/project/view/dynamic.html.php b/module/project/view/dynamic.html.php
index 0edb7f5bc9..69531bc782 100755
--- a/module/project/view/dynamic.html.php
+++ b/module/project/view/dynamic.html.php
@@ -84,7 +84,7 @@
time?>
actor);?>
- actionLabel;?>
+ actionLabel;?>
objectLabel;?>
objectID;?>
objectName) echo html::a($action->objectLink, $action->objectName);?>