aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject [31/50] [abbrv] git commit: Merge branch 'mansu/aurora-39_list_jobs_per_role2' into mansu/aurora-281_job_page
Date Sat, 05 Apr 2014 00:05:17 GMT
Merge branch 'mansu/aurora-39_list_jobs_per_role2' into mansu/aurora-281_job_page


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

Branch: refs/heads/mansu/job_page
Commit: 27170990c100db8fc26a463ce0d45d7c733786b5
Parents: c70e7a4 7d64f87
Author: Suman Karumuri <skarumuri@twitter.com>
Authored: Sun Mar 30 01:20:56 2014 -0700
Committer: Suman Karumuri <skarumuri@twitter.com>
Committed: Sun Mar 30 01:20:56 2014 -0700

----------------------------------------------------------------------
 .../org/apache/aurora/scheduler/http/ui/js/controllers.js      | 1 -
 .../org/apache/aurora/scheduler/http/ui/js/directives.js       | 6 +++---
 .../org/apache/aurora/scheduler/http/ui/js/services.js         | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/27170990/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/27170990/src/main/resources/org/apache/aurora/scheduler/http/ui/js/directives.js
----------------------------------------------------------------------
diff --cc src/main/resources/org/apache/aurora/scheduler/http/ui/js/directives.js
index a7be8b5,1a093d1..4d912be
--- 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
@@@ -35,37 -35,3 +35,37 @@@ auroraUI.directive('error', function (
      templateUrl: '/error.html'
    };
  });
 +
 +auroraUI.directive('taskSandboxLink', function () {
 +  return {
 +    restrict: 'C',
 +    template: '<a ng-href="http://{{formatedValue}}:1338/task/{{dataRow.taskId}}">'
+
 +      '{{formatedValue}}</a>'
 +  };
 +});
 +
 +auroraUI.directive('taskStatus', function () {
 +  return {
 +    restrict: 'E',
 +    replace: true,
 +    link: function (scope, element, attrs, ctrl) {
 +      element.on('click', function (e) {
 +        scope.showDetails = !scope.showDetails;
 +      });
 +    }
 +  };
 +});
 +
 +auroraUI.directive('taskLink', function () {
 +  return {
 +    restrict: 'C',
 +    template: '<a ng-href="/scheduler/structdump/task/{{formatedValue}}" target="_blank">'
+
 +      '<i class="icon-cog"></i></a>'
 +  };
 +});
 +
 +auroraUI.directive('schedulingDetail', function () {
 +  return {
 +    restrict: 'C'
 +  };
- })
++})

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/27170990/src/main/resources/org/apache/aurora/scheduler/http/ui/js/services.js
----------------------------------------------------------------------


Mime
View raw message