Merge branch 'feature/wire-up-detail-panels' of github.com:opf/openproject into feature/wire-up-detail-panels

app/assets/javascripts/angular/work_packages/controllers/work-package-details-controller.js

@@ -33,6 +33,8 @@ angular.module('openproject.workPackages.controllers')
   'workPackage',
   function($scope, workPackage) {
     $scope.workPackage = workPackage;
+    $scope.activities = workPackage.embedded.activities;
+
     $scope.$parent.preselectedWorkPackageId = $scope.workPackage.props.id;
   }
 ]);

public/templates/tabs/activity.html

@@ -1,6 +1,22 @@
-<div class="detail-panel-description">
+<div class="detail-panel-content" >
   <h3>Activity</h3>
-  <div class="detail-panel-description-content">
-    ...
+  <div class="detail-activity">
+    <ul class="work-package-details-activities">
+      <li ng-repeat="activity in activities">
+        <div class="comments-number"><a ng-href="#{{$index+1}}" ng-bind="$index+1"></a>
+          <div class="comments-icons"><i class="icon-quote"></i><i class="icon-edit"></i></div>
+        </div>
+        <img class="avatar" src="images/avatar_logout.png" />
+        <span class="user"><a href ng-bind="activity.props.userName"></a></span>
+        <span class="date">commented on <span ng-bind="activity.props.createdAt"/></span>
+        <span class="comment">
+          <ul class="work-package-details-activity-messages">
+            <li ng-repeat="message in activity.props.messages">
+              <span class="message" ng-bind="message"/>
+            </li>
+          </ul>
+        </span>
+      </li>
+    </ul>
   </div>
 </div>

public/templates/tabs/overview.html

@@ -73,11 +73,11 @@
       <span class="user"><a href="#">Niels Lindenthal</a></span>
       <span class="date">commented on 08/05/2014 16:42 Uhr</span>
       <span class="comment">
-      <ul>
-        <li>Status changed from scheduled to closed</li>
-        <li>Assignee deleted (Michael Frister)</li>
-        <li>% done changed from 0 to 100</li>
-      </ul>
+        <ul>
+          <li>Status changed from scheduled to closed</li>
+          <li>Assignee deleted (Michael Frister)</li>
+          <li>% done changed from 0 to 100</li>
+        </ul>
       </span>
     </li>
   </ul>