aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject [48/50] [abbrv] git commit: Updated taskLink.
Date Sat, 05 Apr 2014 00:05:34 GMT
Updated taskLink.


Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/09519c3c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/09519c3c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/09519c3c

Branch: refs/heads/mansu/job_page
Commit: 09519c3cab6de1b3785b06e41bfe15ed28ee3bfc
Parents: 7db19d9
Author: Suman Karumuri <skarumuri@twitter.com>
Authored: Fri Apr 4 13:46:52 2014 -0700
Committer: Suman Karumuri <skarumuri@twitter.com>
Committed: Fri Apr 4 14:34:14 2014 -0700

----------------------------------------------------------------------
 .../org/apache/aurora/scheduler/http/ui/js/controllers.js      | 4 ++--
 .../org/apache/aurora/scheduler/http/ui/js/directives.js       | 6 +++---
 .../org/apache/aurora/scheduler/http/ui/taskStatus.html        | 4 +++-
 3 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/09519c3c/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js
index 1641a9d..319344b 100644
--- a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js
@@ -325,7 +325,7 @@ auroraUIControllers.controller('JobController',
         }
       });
 
-    var taskIdColumn = {label: 'Task ID', map: 'status', cellTemplateUrl: '/taskLink.html'};
+    var taskIdColumn = {label: 'Task ID', map: 'taskId', cellTemplateUrl: '/taskLink.html'};
 
     $scope.activeTasksTableColumns = taskColumns;
 
@@ -433,7 +433,7 @@ auroraUIControllers.controller('JobController',
     function summarizeTaskEvents(taskEvents) {
       return _.map(taskEvents, function (taskEvent) {
         return {
-          date: moment(taskEvent.timestamp).format('MM DD h:mm:ss'),
+          date: moment(taskEvent.timestamp).format('MM/DD h:mm:ss'),
           status: _.invert(ScheduleStatus)[taskEvent.status],
           message: taskEvent.message
         };

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/09519c3c/src/main/resources/org/apache/aurora/scheduler/http/ui/js/directives.js
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/directives.js b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/directives.js
index 2c0634d..3ebd28a 100644
--- a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/directives.js
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/directives.js
@@ -39,7 +39,7 @@ auroraUI.directive('error', function () {
 auroraUI.directive('taskSandboxLink', function () {
   return {
     restrict: 'C',
-    template: '<a ng-href="http://{{formatedValue}}:1338/task/{{dataRow.taskId}}">'
+
+    template: '<a class="span2" ng-href="http://{{formatedValue}}:1338/task/{{dataRow.taskId}}">'
+
       '{{formatedValue}}</a>'
   };
 });
@@ -59,8 +59,8 @@ auroraUI.directive('taskStatus', function () {
 auroraUI.directive('taskLink', function () {
   return {
     restrict: 'C',
-    template: '<a ng-href="/scheduler/structdump/task/{{formatedValue}}">' +
-      '<i class="icon-cog"></i></a>'
+    template: '<a class="span4" ng-href="/scheduler/structdump/task/{{formatedValue}}">'
+
+      '{{formatedValue}}</a>'
   };
 });
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/09519c3c/src/main/resources/org/apache/aurora/scheduler/http/ui/taskStatus.html
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/taskStatus.html b/src/main/resources/org/apache/aurora/scheduler/http/ui/taskStatus.html
index 9f0cc4a..9f04f51 100644
--- a/src/main/resources/org/apache/aurora/scheduler/http/ui/taskStatus.html
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/taskStatus.html
@@ -3,7 +3,9 @@
     <span title='{{formatedValue | scheduleStatusTooltip}}'>
       <span ng-if='!showDetails'><i class='icon-plus'></i></span>
       <span ng-if='showDetails'><i class='icon-minus'></i></span>
-      <span class='schedulingStatus'>{{formatedValue}}</span>
+      <span>
+        {{dataRow.latestActivity}} - <span class='schedulingStatus'>{{formatedValue}}</span>
+      </span>
     </span>
 
     <ul ng-if='showDetails'>


Mime
View raw message