diff --git a/module/action/config.php b/module/action/config.php index d7e9abdb8f..df791bb285 100755 --- a/module/action/config.php +++ b/module/action/config.php @@ -63,6 +63,7 @@ $config->action->majorList['product'] = array('opened', 'edited'); $config->action->majorList['program'] = array('opened', 'edited'); $config->action->majorList['project'] = array('opened', 'edited'); $config->action->majorList['execution'] = array('opened', 'edited'); +$config->action->majorList['doc'] = array('releaseddoc', 'collected'); $config->action->needGetProjectType = 'build,task,bug,case,testcase,caselib,testtask,testsuite,testreport,doc,issue,release,risk,design,opportunity,trainplan,gapanalysis,researchplan,researchreport,'; $config->action->needGetRelateField = ',branch,story,productplan,release,task,build,bug,testcase,case,testtask,testreport,doc,doclib,issue,risk,opportunity,trainplan,gapanalysis,team,whitelist,researchplan,researchreport,meeting,kanbanlane,kanbancolumn,module,review,'; diff --git a/module/block/view/docdynamicblock.html.php b/module/block/view/docdynamicblock.html.php index d3a2c6a51d..a0285848b6 100644 --- a/module/block/view/docdynamicblock.html.php +++ b/module/block/view/docdynamicblock.html.php @@ -23,7 +23,8 @@ foreach($actions as $action) { $user = zget($users, $action->actor); - $class = in_array($action->action, array('releaseddoc', 'collected')) ? "active {$action->action}" : ''; + $class = $action->major ? 'active' : ''; + if(in_array($action->action, array('releaseddoc', 'collected'))) $class .= " {$action->action}"; echo "
  • "; if($action->objectLink) printf($lang->block->dynamicInfo, $action->date, $user, $action->actionLabel, $action->objectLabel, $action->objectLink, $action->objectName, $action->objectName); if(!$action->objectLink) printf($lang->block->noLinkDynamic, $action->date, $action->objectName, $user, $action->actionLabel, $action->objectLabel, ' ' . $action->objectName); diff --git a/module/block/view/dynamic.html.php b/module/block/view/dynamic.html.php index 4a936125a4..c378b7fa4a 100644 --- a/module/block/view/dynamic.html.php +++ b/module/block/view/dynamic.html.php @@ -10,6 +10,9 @@ .block-dynamic .label-action {padding: 0 6px;} .block-dynamic .label-action + a {padding-left: 6px;} .timeline > li.active:before {left: -30px;} +.timeline > li.collected:before, .timeline > li.releaseddoc:before {background-color: #FFF;} +.timeline > li.collected > div:after {background-color: #FFAF65;} +.timeline > li.releaseddoc > div:after {background-color: #66A2FF;} .timeline > li > div:after {left: -27px;} .timeline > li > div > .timeline-tag, .timeline > li > div > .timeline-text > .label-action {color: #838A9D;} .timeline > li > div > .timeline-text > a {color: #313C52;} @@ -24,8 +27,9 @@ $user = zget($users, $action->actor); if($action->action == 'login' or $action->action == 'logout') $action->objectName = $action->objectLabel = ''; if($action->objectType == 'sonarqubeproject') $action->objectName = $action->extra; - $class = $action->major ? "class='active'" : ''; - echo "
  • "; + $class = $action->major ? 'active' : ''; + if(in_array($action->action, array('releaseddoc', 'collected'))) $class .= " {$action->action}"; + echo "
  • "; if($action->objectLink) printf($lang->block->dynamicInfo, $action->date, $user, $action->actionLabel, $action->objectLabel, $action->objectLink, $action->objectName, $action->objectName); if(!$action->objectLink) printf($lang->block->noLinkDynamic, $action->date, $action->objectName, $user, $action->actionLabel, $action->objectLabel, ' ' . $action->objectName); echo "
  • "; diff --git a/module/company/css/dynamic.css b/module/company/css/dynamic.css index db83b01397..0be403bb0b 100644 --- a/module/company/css/dynamic.css +++ b/module/company/css/dynamic.css @@ -29,6 +29,9 @@ .label-action {padding: 0 4px;} .label-id {margin-left: 4px;} .timeline > li.active:before {left: -30px;} +.timeline > li.collected:before, .timeline > li.releaseddoc:before {background-color: #FFF;} +.timeline > li.collected > div:after {background-color: #FFAF65;} +.timeline > li.releaseddoc > div:after {background-color: #66A2FF;} .timeline > li > div:after {left: -27px;} .timeline .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} .timeline > li > div > .timeline-tag, .timeline > li > div > .timeline-text > .label-action {color: #838A9D;} diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php index b3e4814405..986090e95d 100644 --- a/module/company/view/dynamic.html.php +++ b/module/company/view/dynamic.html.php @@ -63,7 +63,9 @@ $action):?> action == 'adjusttasktowait') continue;?> -
  • major) echo "class='active'";?>> + major ? 'active' : '';?> + action, array('releaseddoc', 'collected'))) $class .= " {$action->action}";?> +
  • major) echo "class='$class'";?>>
    time?> diff --git a/module/execution/css/dynamic.css b/module/execution/css/dynamic.css index 33b2c09989..8ef4ebd3a6 100644 --- a/module/execution/css/dynamic.css +++ b/module/execution/css/dynamic.css @@ -26,6 +26,9 @@ .label-action {padding: 0 4px;} .label-id {margin-left: 4px;} .timeline > li.active:before {left: -30px;} +.timeline > li.collected:before, .timeline > li.releaseddoc:before {background-color: #FFF;} +.timeline > li.collected > div:after {background-color: #FFAF65;} +.timeline > li.releaseddoc > div:after {background-color: #66A2FF;} .timeline > li > div:after {left: -27px;} .timeline .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} .timeline > li > div > .timeline-tag, .timeline > li > div > .timeline-text > .label-action {color: #838A9D;} diff --git a/module/execution/view/dynamic.html.php b/module/execution/view/dynamic.html.php index 4de97a121d..edd375b54a 100755 --- a/module/execution/view/dynamic.html.php +++ b/module/execution/view/dynamic.html.php @@ -80,7 +80,9 @@ $action):?> action == 'adjusttasktowait') continue;?> -
  • major) echo "class='active'";?>> + major ? 'active' : '';?> + action, array('releaseddoc', 'collected'))) $class .= " {$action->action}";?> +
  • major) echo "class='$class'";?>>
    time?> diff --git a/module/my/css/dynamic.css b/module/my/css/dynamic.css index 4f445adaab..e95b8699ac 100644 --- a/module/my/css/dynamic.css +++ b/module/my/css/dynamic.css @@ -25,6 +25,9 @@ .label-action {padding: 0 4px;} .label-id {margin-left: 4px;} .timeline > li.active:before {left: -30px;} +.timeline > li.collected:before, .timeline > li.releaseddoc:before {background-color: #FFF;} +.timeline > li.collected > div:after {background-color: #FFAF65;} +.timeline > li.releaseddoc > div:after {background-color: #66A2FF;} .timeline > li > div:after {left: -27px;} .timeline .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} .timeline > li > div > .timeline-tag, .timeline > li > div > .timeline-text > .label-action {color: #838A9D;} diff --git a/module/my/view/dynamic.html.php b/module/my/view/dynamic.html.php index 56a2ee5219..83b94cf810 100644 --- a/module/my/view/dynamic.html.php +++ b/module/my/view/dynamic.html.php @@ -50,7 +50,9 @@ $action):?> action == 'adjusttasktowait') continue;?> -
  • major) echo "class='active'";?>> + major ? 'active' : '';?> + action, array('releaseddoc', 'collected'))) $class .= " {$action->action}";?> +
  • major) echo "class='$class'";?>>
    time?> diff --git a/module/product/css/dynamic.css b/module/product/css/dynamic.css index 620a0e8cfa..8ef4ebd3a6 100644 --- a/module/product/css/dynamic.css +++ b/module/product/css/dynamic.css @@ -25,8 +25,11 @@ .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 > li.active:before {left: -30px;} +.timeline > li.collected:before, .timeline > li.releaseddoc:before {background-color: #FFF;} +.timeline > li.collected > div:after {background-color: #FFAF65;} +.timeline > li.releaseddoc > div:after {background-color: #66A2FF;} +.timeline > li > div:after {left: -27px;} .timeline .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} .timeline > li > div > .timeline-tag, .timeline > li > div > .timeline-text > .label-action {color: #838A9D;} .timeline > li > div > .timeline-text > a {color: #313C52;} diff --git a/module/product/view/dynamic.html.php b/module/product/view/dynamic.html.php index e4c6ec2f71..61948f0229 100755 --- a/module/product/view/dynamic.html.php +++ b/module/product/view/dynamic.html.php @@ -78,7 +78,9 @@ $action):?> -
  • major) echo "class='active'";?>> + major ? 'active' : '';?> + action, array('releaseddoc', 'collected'))) $class .= " {$action->action}";?> +
  • major) echo "class='$class'";?>>
    time?> diff --git a/module/project/css/dynamic.css b/module/project/css/dynamic.css index 33b2c09989..8ef4ebd3a6 100644 --- a/module/project/css/dynamic.css +++ b/module/project/css/dynamic.css @@ -26,6 +26,9 @@ .label-action {padding: 0 4px;} .label-id {margin-left: 4px;} .timeline > li.active:before {left: -30px;} +.timeline > li.collected:before, .timeline > li.releaseddoc:before {background-color: #FFF;} +.timeline > li.collected > div:after {background-color: #FFAF65;} +.timeline > li.releaseddoc > div:after {background-color: #66A2FF;} .timeline > li > div:after {left: -27px;} .timeline .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} .timeline > li > div > .timeline-tag, .timeline > li > div > .timeline-text > .label-action {color: #838A9D;} diff --git a/module/project/view/dynamic.html.php b/module/project/view/dynamic.html.php index 27c7245032..24cab33978 100755 --- a/module/project/view/dynamic.html.php +++ b/module/project/view/dynamic.html.php @@ -79,7 +79,9 @@ $action):?> -
  • major) echo "class='active'";?>> + major ? 'active' : '';?> + action, array('releaseddoc', 'collected'))) $class .= " {$action->action}";?> +
  • major) echo "class='$class'";?>>
    time?>