aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject [47/50] [abbrv] git commit: Moved ui resources into org/apache dir.
Date Wed, 15 Jan 2014 21:38:10 GMT
Moved ui resources into org/apache dir.


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

Branch: refs/heads/mansu/AURORA-4187_scheduler_home_page-no-seed
Commit: 6b62de38c0c2c87e35c4b0308c1809c253d6a9a0
Parents: 2b510d4
Author: Suman Karumuri <skarumuri@twitter.com>
Authored: Mon Jan 6 23:55:35 2014 -0800
Committer: Suman Karumuri <skarumuri@twitter.com>
Committed: Mon Jan 13 15:24:40 2014 -0800

----------------------------------------------------------------------
 .../aurora/scheduler/http/ui/css/app.css        |  9 ----
 .../twitter/aurora/scheduler/http/ui/index.html | 43 --------------------
 .../twitter/aurora/scheduler/http/ui/js/app.js  |  4 --
 .../aurora/scheduler/http/ui/js/controllers.js  | 29 -------------
 .../aurora/scheduler/http/ui/js/directives.js   |  8 ----
 .../aurora/scheduler/http/ui/js/services.js     | 39 ------------------
 .../aurora/scheduler/http/ui/roleLink.html      |  1 -
 .../apache/aurora/scheduler/http/ui/css/app.css |  9 ++++
 .../apache/aurora/scheduler/http/ui/index.html  | 43 ++++++++++++++++++++
 .../apache/aurora/scheduler/http/ui/js/app.js   |  4 ++
 .../aurora/scheduler/http/ui/js/controllers.js  | 29 +++++++++++++
 .../aurora/scheduler/http/ui/js/directives.js   |  8 ++++
 .../aurora/scheduler/http/ui/js/services.js     | 39 ++++++++++++++++++
 .../aurora/scheduler/http/ui/roleLink.html      |  1 +
 14 files changed, 133 insertions(+), 133 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/6b62de38/src/main/resources/com/twitter/aurora/scheduler/http/ui/css/app.css
----------------------------------------------------------------------
diff --git a/src/main/resources/com/twitter/aurora/scheduler/http/ui/css/app.css b/src/main/resources/com/twitter/aurora/scheduler/http/ui/css/app.css
deleted file mode 100644
index 9a2fdf1..0000000
--- a/src/main/resources/com/twitter/aurora/scheduler/http/ui/css/app.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/* app css stylesheet */
-
-[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
-  display: none !important;
-}
-
-.pagination {
-  text-align: center;
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/6b62de38/src/main/resources/com/twitter/aurora/scheduler/http/ui/index.html
----------------------------------------------------------------------
diff --git a/src/main/resources/com/twitter/aurora/scheduler/http/ui/index.html b/src/main/resources/com/twitter/aurora/scheduler/http/ui/index.html
deleted file mode 100644
index c6706c1..0000000
--- a/src/main/resources/com/twitter/aurora/scheduler/http/ui/index.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!doctype html>
-<html lang="en" ng-app="auroraUI">
-<head>
-  <meta charset="utf-8">
-  <title>Aurora UI</title>
-  <link rel="stylesheet" href="/css/app.css"/>
-</head>
-<body class='ng-cloak'>
-
-<div class='container'>
-  <div ng-controller='JobSummaryController'>
-    <div class='page-header'>
-      <h2 class="text-center">{{title}}</h2>
-    </div>
-    <div>
-      <smart-table config="globalConfig" columns="columnCollection" rows="rowCollection"
-                   class='table table-striped table-hover table-bordered table-condensed'>
-      </smart-table>
-    </div>
-  </div>
-</div>
-
-<!-- Thrift -->
-<script src="/js/thrift.js"></script>
-<script src="/js/apiTypes.js"></script>
-<script src="/js/readOnlyScheduler.js"></script>
-
-<!-- Angular -->
-<script src="/js/angular.js"></script>
-<script src="/js/app.js"></script>
-<script src="/js/controllers.js"></script>
-<script src="/js/directives.js"></script>
-<script src="/js/services.js"></script>
-
-<!-- Bootstrap -->
-<script src="/js/bootstrap.min.js"></script>
-<link href="/css/bootstrap.min.css" rel="stylesheet">
-<link href="/js/jquery.min.js" rel="stylesheet">
-
-<!--smart table-->
-<script src="/js/smartTable.js"></script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/6b62de38/src/main/resources/com/twitter/aurora/scheduler/http/ui/js/app.js
----------------------------------------------------------------------
diff --git a/src/main/resources/com/twitter/aurora/scheduler/http/ui/js/app.js b/src/main/resources/com/twitter/aurora/scheduler/http/ui/js/app.js
deleted file mode 100644
index db6ea99..0000000
--- a/src/main/resources/com/twitter/aurora/scheduler/http/ui/js/app.js
+++ /dev/null
@@ -1,4 +0,0 @@
-'use strict';
-
-// Declare app level module which depends on filters, and services
-var auroraUI = angular.module('auroraUI', ['auroraUI.controllers', 'smartTable.table']);

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/6b62de38/src/main/resources/com/twitter/aurora/scheduler/http/ui/js/controllers.js
----------------------------------------------------------------------
diff --git a/src/main/resources/com/twitter/aurora/scheduler/http/ui/js/controllers.js b/src/main/resources/com/twitter/aurora/scheduler/http/ui/js/controllers.js
deleted file mode 100644
index 69b165e..0000000
--- a/src/main/resources/com/twitter/aurora/scheduler/http/ui/js/controllers.js
+++ /dev/null
@@ -1,29 +0,0 @@
-'use strict';
-
-/* Controllers */
-
-angular.module('auroraUI.controllers', []).
-    controller('JobSummaryController',
-    function ($scope, $window, auroraClient) {
-      $scope.title = 'Scheduled Jobs Summary';
-
-      $scope.columnCollection = [
-        {label : 'Role', map: 'role', cellTemplateUrl: 'roleLink.html'},
-        {label : 'Jobs', map: 'jobCount'},
-        {label : 'Cron Jobs', map: 'cronJobCount'}
-      ];
-
-      $scope.rowCollection = auroraClient.getJobSummary().summaries;
-
-      $scope.globalConfig = {
-        isGlobalSearchActivated: true,
-        isPaginationEnabled: true,
-        itemsByPage: 25,
-        maxSize: 8,
-        selectionMode: 'single'
-      };
-
-      $scope.$on('selectionChange', function (event, args) {
-        $window.location.href = "/scheduler/" + args.item.role;
-      });
-   });

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/6b62de38/src/main/resources/com/twitter/aurora/scheduler/http/ui/js/directives.js
----------------------------------------------------------------------
diff --git a/src/main/resources/com/twitter/aurora/scheduler/http/ui/js/directives.js b/src/main/resources/com/twitter/aurora/scheduler/http/ui/js/directives.js
deleted file mode 100644
index d2b2017..0000000
--- a/src/main/resources/com/twitter/aurora/scheduler/http/ui/js/directives.js
+++ /dev/null
@@ -1,8 +0,0 @@
-'use strict';
-
-auroraUI.directive('roleLink', function () {
-  return {
-    restrict: 'C',
-    template: "<a ng-href='/scheduler/{{formatedValue}}'>{{formatedValue}}</a>"
-  };
-});
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/6b62de38/src/main/resources/com/twitter/aurora/scheduler/http/ui/js/services.js
----------------------------------------------------------------------
diff --git a/src/main/resources/com/twitter/aurora/scheduler/http/ui/js/services.js b/src/main/resources/com/twitter/aurora/scheduler/http/ui/js/services.js
deleted file mode 100644
index 81560a0..0000000
--- a/src/main/resources/com/twitter/aurora/scheduler/http/ui/js/services.js
+++ /dev/null
@@ -1,39 +0,0 @@
-'use strict';
-
-auroraUI.factory(
-  'auroraClient',
-  function (auroraClientMock) {
-    return {
-      getJobSummary: function () {
-        var client = this.makeSchedulerClient();
-
-        var response;
-        console.log("querying server");
-        response = client.getJobSummary();
-        console.log(response);
-        return response.result.jobSummaryResult;
-      },
-
-      makeSchedulerClient: function () {
-        var transport = new Thrift.Transport("/api/");
-        var protocol = new Thrift.Protocol(transport);
-        return new ReadOnlySchedulerClient(protocol);
-      }
-    };
-  }
-);
-
-auroraUI.factory(
-  'auroraClientMock',
-  function () {
-    return {
-      getJobSummary: function () {
-        var summary = new JobSummary();
-        summary.role = "mesos";
-        summary.jobCount = 10;
-        summary.cronJobCount = 10;
-        return { 'summaries': [summary]};
-      }
-    }
-  }
-);

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/6b62de38/src/main/resources/com/twitter/aurora/scheduler/http/ui/roleLink.html
----------------------------------------------------------------------
diff --git a/src/main/resources/com/twitter/aurora/scheduler/http/ui/roleLink.html b/src/main/resources/com/twitter/aurora/scheduler/http/ui/roleLink.html
deleted file mode 100644
index fc25526..0000000
--- a/src/main/resources/com/twitter/aurora/scheduler/http/ui/roleLink.html
+++ /dev/null
@@ -1 +0,0 @@
-<div class="role-link"></div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/6b62de38/src/main/resources/org/apache/aurora/scheduler/http/ui/css/app.css
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/css/app.css b/src/main/resources/org/apache/aurora/scheduler/http/ui/css/app.css
new file mode 100644
index 0000000..9a2fdf1
--- /dev/null
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/css/app.css
@@ -0,0 +1,9 @@
+/* app css stylesheet */
+
+[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
+  display: none !important;
+}
+
+.pagination {
+  text-align: center;
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/6b62de38/src/main/resources/org/apache/aurora/scheduler/http/ui/index.html
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/index.html b/src/main/resources/org/apache/aurora/scheduler/http/ui/index.html
new file mode 100644
index 0000000..c6706c1
--- /dev/null
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/index.html
@@ -0,0 +1,43 @@
+<!doctype html>
+<html lang="en" ng-app="auroraUI">
+<head>
+  <meta charset="utf-8">
+  <title>Aurora UI</title>
+  <link rel="stylesheet" href="/css/app.css"/>
+</head>
+<body class='ng-cloak'>
+
+<div class='container'>
+  <div ng-controller='JobSummaryController'>
+    <div class='page-header'>
+      <h2 class="text-center">{{title}}</h2>
+    </div>
+    <div>
+      <smart-table config="globalConfig" columns="columnCollection" rows="rowCollection"
+                   class='table table-striped table-hover table-bordered table-condensed'>
+      </smart-table>
+    </div>
+  </div>
+</div>
+
+<!-- Thrift -->
+<script src="/js/thrift.js"></script>
+<script src="/js/apiTypes.js"></script>
+<script src="/js/readOnlyScheduler.js"></script>
+
+<!-- Angular -->
+<script src="/js/angular.js"></script>
+<script src="/js/app.js"></script>
+<script src="/js/controllers.js"></script>
+<script src="/js/directives.js"></script>
+<script src="/js/services.js"></script>
+
+<!-- Bootstrap -->
+<script src="/js/bootstrap.min.js"></script>
+<link href="/css/bootstrap.min.css" rel="stylesheet">
+<link href="/js/jquery.min.js" rel="stylesheet">
+
+<!--smart table-->
+<script src="/js/smartTable.js"></script>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/6b62de38/src/main/resources/org/apache/aurora/scheduler/http/ui/js/app.js
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/app.js b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/app.js
new file mode 100644
index 0000000..db6ea99
--- /dev/null
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/app.js
@@ -0,0 +1,4 @@
+'use strict';
+
+// Declare app level module which depends on filters, and services
+var auroraUI = angular.module('auroraUI', ['auroraUI.controllers', 'smartTable.table']);

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/6b62de38/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
new file mode 100644
index 0000000..69b165e
--- /dev/null
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js
@@ -0,0 +1,29 @@
+'use strict';
+
+/* Controllers */
+
+angular.module('auroraUI.controllers', []).
+    controller('JobSummaryController',
+    function ($scope, $window, auroraClient) {
+      $scope.title = 'Scheduled Jobs Summary';
+
+      $scope.columnCollection = [
+        {label : 'Role', map: 'role', cellTemplateUrl: 'roleLink.html'},
+        {label : 'Jobs', map: 'jobCount'},
+        {label : 'Cron Jobs', map: 'cronJobCount'}
+      ];
+
+      $scope.rowCollection = auroraClient.getJobSummary().summaries;
+
+      $scope.globalConfig = {
+        isGlobalSearchActivated: true,
+        isPaginationEnabled: true,
+        itemsByPage: 25,
+        maxSize: 8,
+        selectionMode: 'single'
+      };
+
+      $scope.$on('selectionChange', function (event, args) {
+        $window.location.href = "/scheduler/" + args.item.role;
+      });
+   });

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/6b62de38/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
new file mode 100644
index 0000000..d2b2017
--- /dev/null
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/directives.js
@@ -0,0 +1,8 @@
+'use strict';
+
+auroraUI.directive('roleLink', function () {
+  return {
+    restrict: 'C',
+    template: "<a ng-href='/scheduler/{{formatedValue}}'>{{formatedValue}}</a>"
+  };
+});
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/6b62de38/src/main/resources/org/apache/aurora/scheduler/http/ui/js/services.js
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/services.js b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/services.js
new file mode 100644
index 0000000..81560a0
--- /dev/null
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/services.js
@@ -0,0 +1,39 @@
+'use strict';
+
+auroraUI.factory(
+  'auroraClient',
+  function (auroraClientMock) {
+    return {
+      getJobSummary: function () {
+        var client = this.makeSchedulerClient();
+
+        var response;
+        console.log("querying server");
+        response = client.getJobSummary();
+        console.log(response);
+        return response.result.jobSummaryResult;
+      },
+
+      makeSchedulerClient: function () {
+        var transport = new Thrift.Transport("/api/");
+        var protocol = new Thrift.Protocol(transport);
+        return new ReadOnlySchedulerClient(protocol);
+      }
+    };
+  }
+);
+
+auroraUI.factory(
+  'auroraClientMock',
+  function () {
+    return {
+      getJobSummary: function () {
+        var summary = new JobSummary();
+        summary.role = "mesos";
+        summary.jobCount = 10;
+        summary.cronJobCount = 10;
+        return { 'summaries': [summary]};
+      }
+    }
+  }
+);

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/6b62de38/src/main/resources/org/apache/aurora/scheduler/http/ui/roleLink.html
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/roleLink.html b/src/main/resources/org/apache/aurora/scheduler/http/ui/roleLink.html
new file mode 100644
index 0000000..fc25526
--- /dev/null
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/roleLink.html
@@ -0,0 +1 @@
+<div class="role-link"></div>
\ No newline at end of file


Mime
View raw message