aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject [01/10] Added tabs for active and completed tasks in Job page.
Date Wed, 28 May 2014 19:27:12 GMT
Repository: incubator-aurora
Updated Branches:
  refs/heads/master 3a992e2cd -> b6c71cc0f


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/b6c71cc0/3rdparty/javascript/bower_components/angular/bower.json
----------------------------------------------------------------------
diff --git a/3rdparty/javascript/bower_components/angular/bower.json b/3rdparty/javascript/bower_components/angular/bower.json
index 9079df9..88d44dd 100644
--- a/3rdparty/javascript/bower_components/angular/bower.json
+++ b/3rdparty/javascript/bower_components/angular/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular",
-  "version": "1.2.6",
+  "version": "1.2.9",
   "main": "./angular.js",
   "dependencies": {
   }

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/b6c71cc0/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java b/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
index 5b25d52..28e4741 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
@@ -143,6 +143,9 @@ public class ServletModule extends AbstractModule {
     registerAsset("bower_components/angular-route/angular-route.js", "/js/angular-route.js",
false);
     registerAsset("bower_components/underscore/underscore.js", "/js/underscore.js", false);
     registerAsset("bower_components/momentjs/moment.js", "/js/moment.js", false);
+    registerAsset("bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js",
+        "/js/ui-bootstrap-tpls.js",
+        false);
 
     registerAsset("ReadOnlyScheduler.js", "/js/readOnlyScheduler.js", false);
     registerAsset("api_types.js", "/js/apiTypes.js", false);

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/b6c71cc0/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
index 9bd8160..b4a2590 100644
--- 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
@@ -63,7 +63,7 @@ ul.breadcrumb {
   padding: 1em;
 }
 
-.instanceGroups:after, .visibleGroups:after{
+.instanceGroups:after, .visibleGroups:after {
   clear: both;
   content: "";
   display: block;
@@ -126,4 +126,18 @@ div.pagination {
 
 .smart-table-global-search {
   padding: 1em;
+}
+
+.group-summary {
+  padding-bottom: 10px;
+}
+
+.task-tab {
+  border-left: 1px solid #ddd;
+  border-right: 1px solid #ddd;
+  border-bottom: 1px solid #ddd;
+}
+
+.completed-tasks-tab {
+  padding-top: 10px;
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/b6c71cc0/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
index 9c468bd..08cb102 100644
--- a/src/main/resources/org/apache/aurora/scheduler/http/ui/index.html
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/index.html
@@ -39,6 +39,9 @@
 <script src='/js/bootstrap.min.js'></script>
 <link href='/css/bootstrap.min.css' rel='stylesheet'>
 
+<!-- Angular bootstrap -->
+<script src='/js/ui-bootstrap-tpls.js'></script>
+
 <!-- smart table -->
 <script src='/js/smartTable.js'></script>
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/b6c71cc0/src/main/resources/org/apache/aurora/scheduler/http/ui/job.html
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/job.html b/src/main/resources/org/apache/aurora/scheduler/http/ui/job.html
index a4b4ac7..aede600 100644
--- a/src/main/resources/org/apache/aurora/scheduler/http/ui/job.html
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/job.html
@@ -23,7 +23,7 @@
         </div>
       </div>
 
-      <div ng-controller="CronJobSummaryController">
+      <div ng-controller='CronJobSummaryController'>
         <div ng-show='error'>
           <error/>
         </div>
@@ -45,28 +45,59 @@
         </div>
       </div>
 
-      <group-summary groups="groupSummary"></group-summary>
+      <tabset justified='true'>
+        <tab heading='Active tasks ({{activeTasks.length}})' title='All Active tasks for
this job.'>
+          <div class='task-tab'>
+            <div class='group-summary'>
+              <group-summary groups='groupSummary'></group-summary>
+            </div>
+            <div class='container-fluid'>
+              <smart-table config='activeTasksTableConfig'
+                           columns='activeTasksTableColumns'
+                           rows='activeTasks'
+                           class='table table-striped table-hover table-bordered table-condensed'>
+              </smart-table>
+            </div>
+          </div>
+        </tab>
 
-      <div class='container-fluid'>
-        <h3>Active tasks</h3>
+        <tab heading='Completed tasks ({{completedTasks.length}})'
+             title='All completed tasks for this job.'>
+          <div class='task-tab container-fluid completed-tasks-tab'>
+            <smart-table config='completedTasksTableConfig'
+                         columns='completedTasksTableColumns'
+                         rows='completedTasks'
+                         class='table table-striped table-hover table-bordered table-condensed'>
+            </smart-table>
+          </div>
+        </tab>
 
-        <div>
-          <smart-table config='activeTasksTableConfig'
-                       columns='activeTasksTableColumns'
-                       rows='activeTasks'
-                       class='table table-striped table-hover table-bordered table-condensed'>
-          </smart-table>
-        </div>
-      </div>
+        <tab heading='All tasks' title='Both active and completed tasks for this job.'>
+          <div class='task-tab'>
+            <div class='group-summary'>
+              <group-summary groups='groupSummary'></group-summary>
+            </div>
 
-      <div class='container-fluid'>
-        <h3>Completed tasks</h3>
-        <smart-table config='completedTasksTableConfig'
-                     columns='completedTasksTableColumns'
-                     rows='completedTasks'
-                     class='table table-striped table-hover table-bordered table-condensed'>
-        </smart-table>
-      </div>
+            <div class='container-fluid'>
+              <h3>Active Tasks</h3>
+              <smart-table config='activeTasksTableConfig'
+                           columns='activeTasksTableColumns'
+                           rows='activeTasks'
+                           class='table table-striped table-hover table-bordered table-condensed'>
+              </smart-table>
+            </div>
+
+            <div class='container-fluid'>
+              <h3>Completed Tasks</h3>
+              <smart-table config='completedTasksTableConfig'
+                           columns='completedTasksTableColumns'
+                           rows='completedTasks'
+                           class='table table-striped table-hover table-bordered table-condensed'>
+              </smart-table>
+            </div>
+          </div>
+        </tab>
+      </tabset>
 
       <div class='container-fluid'>
         <a class='bottomRight' ng-click='toggleTaskInfoLinkVisibility()'>π</a>

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/b6c71cc0/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
index d52cdda..fb3b5b1 100644
--- 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
@@ -17,7 +17,7 @@ var auroraUI;
 
   // Declare app level module which depends on filters, and services
   auroraUI = angular.module('auroraUI',
-    ['ngRoute', 'auroraUI.controllers', 'smartTable.table']);
+    ['ngRoute', 'auroraUI.controllers', 'smartTable.table', 'ui.bootstrap']);
 
   auroraUI.config(function ($routeProvider, $locationProvider) {
     $routeProvider.when('/scheduler',

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/b6c71cc0/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 e239e7d..f86c210 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
@@ -24,7 +24,7 @@
     isPaginationEnabled: true,
     itemsByPage: 25,
     maxSize: 8,
-    selectionMode: 'single',
+    selectionMode: 'single'
   };
 
   var summaryTableConfig = {


Mime
View raw message