aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dmclaugh...@apache.org
Subject git commit: HTML Grid Fixes in Scheduler UI.
Date Tue, 23 Sep 2014 00:39:19 GMT
Repository: incubator-aurora
Updated Branches:
  refs/heads/master d1d089afc -> a52329b8f


HTML Grid Fixes in Scheduler UI.

Bugs closed: AURORA-436

Reviewed at https://reviews.apache.org/r/25913/


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

Branch: refs/heads/master
Commit: a52329b8f589f745bf530fecc855b6765bb4ea0c
Parents: d1d089a
Author: David McLaughlin <david@dmclaughlin.com>
Authored: Mon Sep 22 17:38:31 2014 -0700
Committer: David McLaughlin <dmclaughlin@twitter.com>
Committed: Mon Sep 22 17:38:31 2014 -0700

----------------------------------------------------------------------
 .../aurora/scheduler/http/ui/breadcrumb.html    |   2 +-
 .../apache/aurora/scheduler/http/ui/error.html  |  35 +--
 .../apache/aurora/scheduler/http/ui/job.html    | 244 +++++++++----------
 .../apache/aurora/scheduler/http/ui/role.html   |  60 ++---
 .../apache/aurora/scheduler/http/ui/update.html |  10 +-
 5 files changed, 169 insertions(+), 182 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/a52329b8/src/main/resources/org/apache/aurora/scheduler/http/ui/breadcrumb.html
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/breadcrumb.html b/src/main/resources/org/apache/aurora/scheduler/http/ui/breadcrumb.html
index 5c4fe96..b5f82ca 100644
--- a/src/main/resources/org/apache/aurora/scheduler/http/ui/breadcrumb.html
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/breadcrumb.html
@@ -1,5 +1,4 @@
 <div class='row'>
-  <div class='col-md-12'>
   <!--
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -13,6 +12,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
    -->
+  <div class='col-md-12'>
   <ul class='breadcrumb'>
     <li><a href='/scheduler'>Home</a></li>
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/a52329b8/src/main/resources/org/apache/aurora/scheduler/http/ui/error.html
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/error.html b/src/main/resources/org/apache/aurora/scheduler/http/ui/error.html
index 5b03aca..e3277c2 100644
--- a/src/main/resources/org/apache/aurora/scheduler/http/ui/error.html
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/error.html
@@ -1,20 +1,23 @@
-<div>
-  <!--
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
 
-        http://www.apache.org/licenses/LICENSE-2.0
+      http://www.apache.org/licenses/LICENSE-2.0
 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   -->
-  <p class='lead text-center text-warning'>
-    An error occurred when querying the server. Please reload this page.
-  </p>
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<div class='row'>
+  <div class='col-md-12'>
+    <p class='lead text-center text-warning'>
+      An error occurred when querying the server. Please reload this page.
+    </p>
 
-  <p class='text-center text-warning'>{{error}}</p>
+    <p class='text-center text-warning'>{{error}}</p>
+  </div>
 </div>
+

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/a52329b8/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 ca1a0f6..4a00a88 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
@@ -1,4 +1,4 @@
-<div>
+<div class='container-fluid'>
   <!--
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -13,15 +13,14 @@
    limitations under the License.
    -->
   <div ng-show='error'>
-    <error/>
+    <error></error>
   </div>
 
   <div ng-hide='error'>
-    <div class='container-fluid'>
-      <div>
-        <breadcrumb/>
-      </div>
+    <breadcrumb></breadcrumb>
 
+    <div class='row'>
+      <div class='col-md-12'>
         <div class='page-header'>
           <h2 class='text-center'>
             Job <em>{{job}}</em> in role <em>{{role}}</em> and environment
<em>{{environment}}</em>
@@ -33,146 +32,143 @@
             </span>
           </h2>
         </div>
-
-      <!-- begin update progress preview -->
-      <div ng-if="updateInProgress" class="content-box in-progress-alert">
-        <div class="row">
-          <div class="col-md-4">
-            <a href="/scheduler/{{role}}/{{environment}}/{{job}}/{{updateInProgress.update.summary.updateId}}">Update
In Progress</a>
-          </div>
-          <div class="col-md-4">
-            <progressbar class="progress" max="updateStats.totalInstancesToBeUpdated"
value="updateStats.instancesUpdatedSoFar" type="success"><i>{{updateStats.instancesUpdatedSoFar}}
of {{updateStats.totalInstancesToBeUpdated}}</i></progressbar>
-          </div>
-          <div class="col-md-4">
-            <span>started by <strong>{{updateInProgress.update.summary.user}}</strong></span><br/>
-            <span>{{updateInProgress.update.summary.state.createdTimestampMs | toElapsedTime}}
ago</span>
-          </div>
-        </div>
       </div>
-      <!-- end update progress preview -->
-
+    </div>
 
-      <div ng-controller='CronJobSummaryController'>
-        <div ng-show='error'>
-          <error/>
+    <!-- begin update progress preview -->
+    <div ng-if="updateInProgress" class="content-box in-progress-alert">
+      <div class="row">
+        <div class="col-md-4">
+          <a href="/scheduler/{{role}}/{{environment}}/{{job}}/{{updateInProgress.update.summary.updateId}}">Update
In Progress</a>
         </div>
-
-        <div ng-hide='error'>
-            <div ng-if='cronJobSummary'>
-              <h3>Cron Job Summary</h3>
-
-              <div>
-                <smart-table config='cronJobSummaryTableConfig'
-                             columns='cronJobSummaryTableColumns'
-                             rows='cronJobSummary'
-                             class='table table-striped table-hover table-bordered table-condensed'>
-                </smart-table>
-              </div>
-            </div>
+        <div class="col-md-4">
+          <progressbar class="progress" max="updateStats.totalInstancesToBeUpdated" value="updateStats.instancesUpdatedSoFar"
type="success"><i>{{updateStats.instancesUpdatedSoFar}} of {{updateStats.totalInstancesToBeUpdated}}</i></progressbar>
         </div>
-      </div>
-
-      <div ng-if="!tasksReady">
-        <div class="row">
-          <div class="col-md-12">
-            Loading job information.
-          </div>
+        <div class="col-md-4">
+          <span>started by <strong>{{updateInProgress.update.summary.user}}</strong></span><br/>
+          <span>{{updateInProgress.update.summary.state.createdTimestampMs | toElapsedTime}}
ago</span>
         </div>
       </div>
-
-      <tabset ng-if="tasksReady" 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'
+    </div>
+    <!-- end update progress preview -->
+
+    <div ng-controller='CronJobSummaryController'>
+      <div class='row'>
+        <div class='col-md-12'>
+          <div ng-if='cronJobSummary'>
+            <h3>Cron Job Summary</h3>
+
+            <div>
+              <smart-table config='cronJobSummaryTableConfig'
+                           columns='cronJobSummaryTableColumns'
+                           rows='cronJobSummary'
                            class='table table-striped table-hover table-bordered table-condensed'>
               </smart-table>
             </div>
           </div>
-        </tab>
+        </div>
+      </div>
+    </div>
 
-        <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'
+    <div ng-if="!tasksReady">
+      <div class="row">
+        <div class="col-md-12">
+          Loading job information.
+        </div>
+      </div>
+    </div>
+
+    <tabset ng-if="tasksReady" 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>
-        </tab>
-
-        <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>
+      </tab>
+
+      <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 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>
+      <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>
-        </tab>
-      </tabset>
 
-      <div ng-if="updates" class="content-box">
-        <div class='row'>
-          <div class='col-md-12'>
-            <h3>Update History</h3>
-            <table class="table table-bordered table-striped table-hover">
-              <tr>
-                <th>id</th>
-                <th>status</th>
-                <th>started</th>
-                <th>ended</th>
-                <th>user</th>
-              </tr>
-              <tr ng-repeat="update in updates">
-                <td>
-                  <a href="/scheduler/{{role}}/{{environment}}/{{job}}/{{update.updateId}}">
 {{update.updateId}}
-                  </a>
-                </td>
-                <td>
-                  {{update.state.status | toNiceStatus}}
-                </td>
-                <td>
-                  {{update.state.createdTimestampMs | toElapsedTime}} ago
-                </td>
-                <td>
-                  {{update.state.lastModifiedTimestampMs | toElapsedTime}} ago
-                </td>
-                <td>
-                  {{update.user}}
-                </td>
-              </tr>
-            </table>
+          <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>
-      </div>
-
-        <div class="container-fluid">
-          <a class='bottomRight' ng-click='toggleTaskInfoLinkVisibility()'>π</a>
+      </tab>
+    </tabset>
+
+    <div ng-if="updates" class="content-box">
+      <div class='row'>
+        <div class='col-md-12'>
+          <h3>Update History</h3>
+          <table class="table table-bordered table-striped table-hover">
+            <tr>
+              <th>id</th>
+              <th>status</th>
+              <th>started</th>
+              <th>ended</th>
+              <th>user</th>
+            </tr>
+            <tr ng-repeat="update in updates">
+              <td>
+                <a href="/scheduler/{{role}}/{{environment}}/{{job}}/{{update.updateId}}">
 {{update.updateId}}
+                </a>
+              </td>
+              <td>
+                {{update.state.status | toNiceStatus}}
+              </td>
+              <td>
+                {{update.state.createdTimestampMs | toElapsedTime}} ago
+              </td>
+              <td>
+                {{update.state.lastModifiedTimestampMs | toElapsedTime}} ago
+              </td>
+              <td>
+                {{update.user}}
+              </td>
+            </tr>
+          </table>
         </div>
       </div>
     </div>
+
+    <div class="container-fluid">
+      <a class='bottomRight' ng-click='toggleTaskInfoLinkVisibility()'>π</a>
+    </div>
   </div>
 </div>

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/a52329b8/src/main/resources/org/apache/aurora/scheduler/http/ui/role.html
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/role.html b/src/main/resources/org/apache/aurora/scheduler/http/ui/role.html
index c3a2fd9..d305fb5 100644
--- a/src/main/resources/org/apache/aurora/scheduler/http/ui/role.html
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/role.html
@@ -13,53 +13,43 @@
    limitations under the License.
    -->
   <div ng-show='error'>
-    <error/>
+    <error></error>
   </div>
 
   <div ng-hide='error'>
-    <div>
-      <div>
-        <breadcrumb/>
-      </div>
+    <breadcrumb></breadcrumb>
 
-      <div>
-        <div class='container-fluid'>
+    <div class='row'>
+      <div class='col-md-12'>
           <h2 class='page-header text-center'>
             Jobs for role <em>{{role}}</em>
             <span ng-if='environment'> and environment <em>{{environment}}</em></span>
           </h2>
-        </div>
-
-        <div class='container-fluid'>
-         <div ng-show='!environment'>
-            <div class='row'>
-              <div class='col-md-8'>
-                <div ng-controller="QuotaController">
-                  <div ng-show='error'>
-                    <error/>
-                  </div>
+      </div>
+    </div>
 
-                  <div ng-hide='error'>
-                    <h4>Resource consumption</h4>
-                    <smart-table config='resourcesTableConfig'
-                                 columns='resourcesTableColumns'
-                                 rows='resources'
-                                 class='table table-striped table-hover table-condensed'>
-                    </smart-table>
-                  </div>
-                </div>
-              </div>
-            </div>
+    <div class='row' ng-show='!environment'>
+      <div class='col-md-8'>
+        <div ng-controller="QuotaController">
+          <div>
+            <h4>Resource consumption</h4>
+            <smart-table config='resourcesTableConfig'
+                         columns='resourcesTableColumns'
+                         rows='resources'
+                         class='table table-striped table-hover table-condensed'>
+            </smart-table>
           </div>
         </div>
+      </div>
+    </div>
 
-        <div class='container-fluid'>
-          <smart-table config='jobsTableConfig'
-                       columns='jobsTableColumns'
-                       rows='jobs'
-                       class='table table-striped table-hover table-bordered table-condensed'>
-          </smart-table>
-        </div>
+    <div class='row'>
+      <div class='col-md-12'>
+        <smart-table config='jobsTableConfig'
+                     columns='jobsTableColumns'
+                     rows='jobs'
+                     class='table table-striped table-hover table-bordered table-condensed'>
+        </smart-table>
       </div>
     </div>
   </div>

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/a52329b8/src/main/resources/org/apache/aurora/scheduler/http/ui/update.html
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/update.html b/src/main/resources/org/apache/aurora/scheduler/http/ui/update.html
index b6cf4f0..aaff5b2 100644
--- a/src/main/resources/org/apache/aurora/scheduler/http/ui/update.html
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/update.html
@@ -13,13 +13,11 @@
  -->
 <div class="container-fluid">
   <div ng-show='error'>
-    <error/>
+    <error></error>
   </div>
 
   <div ng-hide='error'>
-    <div>
-      <breadcrumb/>
-    </div>
+    <breadcrumb></breadcrumb>
 
     <div class="content-box">
       <div class="row">
@@ -37,13 +35,13 @@
 
           <div class="row">
             <div class="col-md-3 col-md-offset-2">
-              <time-display timestamp="update.update.summary.state.createdTimestampMs"/>
+              <time-display timestamp="update.update.summary.state.createdTimestampMs"></time-display>
             </div>
             <div class="col-md-2 time-divider">
               <span>~</span>
             </div>
             <div class="col-md-3">
-              <time-display timestamp="update.update.summary.state.lastModifiedTimestampMs"/>
+              <time-display timestamp="update.update.summary.state.lastModifiedTimestampMs"></time-display>
             </div>
           </div>
           <div class="row">


Mime
View raw message