Fix generated timeline table markup

app/assets/javascripts/angular/directives/timeline-table-row-directive.js

@@ -4,7 +4,10 @@ openprojectApp.directive('timelineTableRow', [function() {
     // TODO restrict to 'E' once https://github.com/angular/angular.js/issues/1459 is solved
     scope: true,
     link: function(scope, element, attributes) {
-      scope.rowObject = scope.row.payload;
+      var rowObject = scope.row.payload;
+
+      scope.rowObject = rowObject;
+      scope.changeDetected = rowObject.objectType === 'PlanningElement' && (rowObject.hasAlternateDates() || rowObject.isNewlyAdded() || rowObject.isDeleted());
       scope.indent = scope.hideTreeRoot ? scope.row.level-1 : scope.row.level;
 
       // set dom element

app/assets/javascripts/angular/helpers/timeline-table-helper.js

@@ -22,11 +22,13 @@ openprojectApp.factory('TimelineTableHelper', [function() {
       }
 
       // first level group
-      if(node.payload.objectType === 'Project') {
+      isNested = node.level >= 2;
+      if (node.payload.objectType === 'Project' && !isNested) {
         node.firstLevelGroup        = node.payload.getFirstLevelGrouping();
         node.firstLevelGroupingName = node.payload.getFirstLevelGroupingName();
       } else {
-        node.firstLevelGroup        = parent.firstLevelGroup;
+        // inherit group from parent
+        node.firstLevelGroup = parent.firstLevelGroup;
       }
     },
 

public/templates/timelines/timeline_table.html

@@ -2,9 +2,7 @@
   <thead>
     <tr>
       <th class="tl-first-column" ng-style="{height: height}">{{I18n.t('js.timelines.filter.column.name')}}</th>
-      <th ng-repeat="key in columns">
+      <th ng-repeat="key in columns">{{I18n.t('js.timelines.filter.column.' + key)}}</th>
-        {{I18n.t('js.timelines.filter.column.' + key)}}
-      </th>
     </tr>
   </thead>
 
@@ -25,7 +23,6 @@
         ng-class="{
           'tl-first-row': $first,
           'tl-last-row': $last,
-          'tl-grouping': isGrouping,
           'tl-project-row': rowObject.objectType === 'Project'
         }"
         ng-show="row.ancestors | ancestorsExpanded"
@@ -42,19 +39,17 @@
         </a>
 
         <span class="tl-word-ellipsis">
-          <span>
+          <span ng-if="changeDetected">
             <a title="{{I18n.t('js.timelines.change')}}"
                ng-class="{
-                 'icon tl-icon-added': rowObject.objectType === 'PlanningElement' && rowObject.isNewlyAdded(),
+                 'icon tl-icon-added': rowObject.isNewlyAdded(),
-                 'icon tl-icon-deleted': rowObject.objectType === 'PlanningElement' && rowObject.isDeleted(),
+                 'icon tl-icon-deleted': rowObject.isDeleted(),
-                 'icon tl-icon-changed': rowObject.objectType === 'PlanningElement' && rowObject.hasAlternateDates()
+                 'icon tl-icon-changed': !rowObject.isDeleted() && !rowObject.isNewlyAdded()
                }" />
           </span>
 
           <span>
-            <a modal title="{{row.text}}" target="row.url" ng-class="{'tl-discreet-link': true, 'tl-project': rowObject.objectType === 'Project'}">
+            <a modal title="{{row.text}}" target="row.url" ng-class="{'tl-discreet-link': true, 'tl-project': rowObject.objectType === 'Project'}">{{row.text}}</a>
-              {{row.text}}
-            </a>
           </span>
         </span>
       </td>