aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject [43/50] [abbrv] git commit: Vertically aligned the summary on job page and role page
Date Sat, 05 Apr 2014 00:05:29 GMT
Vertically aligned the summary on job page and role 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/71a4928e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/71a4928e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/71a4928e

Branch: refs/heads/mansu/job_page
Commit: 71a4928ec87a8f664e74d2e704bc3dd224b971fe
Parents: 8f4e9e3
Author: Suman Karumuri <skarumuri@twitter.com>
Authored: Fri Apr 4 10:12:28 2014 -0700
Committer: Suman Karumuri <skarumuri@twitter.com>
Committed: Fri Apr 4 10:31:17 2014 -0700

----------------------------------------------------------------------
 .../org/apache/aurora/scheduler/http/ui/css/app.css |  9 ++++++---
 .../org/apache/aurora/scheduler/http/ui/job.html    | 14 ++++++++------
 .../org/apache/aurora/scheduler/http/ui/role.html   | 16 ++++++++--------
 3 files changed, 22 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/71a4928e/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 e81f561..ab8fd85 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
@@ -25,9 +25,12 @@ ul.breadcrumb {
   border-bottom: 0px;
 }
 
-.center {
-  margin: 0px auto;
-  float: none;
+.summaryTable {
+  margin-left: 0px;
+}
+
+.summaryButton {
+  margin-bottom: 10px;
 }
 
 .schedulingStatus {

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/71a4928e/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 bbafb95..e83674f 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,14 +23,12 @@
         </div>
       </div>
 
-
       <div class='container-fluid'>
-        <h3>Active tasks
-          <button class="btn" ng-click='toggleSummaryVisibility()'>{{summaryButtonText}}</button>
-        </h3>
-
+        <button class="btn summaryButton" ng-click='toggleSummaryVisibility()'>
+          {{summaryButtonText}}
+        </button>
         <div ng-if='showSummary'>
-          <div class='span8 center'>
+          <div class='span8 summaryTable'>
             <smart-table config='taskSummaryTableConfig'
                          columns='taskSummaryTableColumns'
                          rows='taskSummary'
@@ -38,6 +36,10 @@
             </smart-table>
           </div>
         </div>
+      </div>
+
+      <div class='container-fluid'>
+        <h3>Active tasks</h3>
 
         <div>
           <smart-table config='activeTasksTableConfig'

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/71a4928e/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 5698542..f1f4dd3 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
@@ -10,22 +10,22 @@
       </div>
 
       <div>
-        <div class='row-fluid'>
+        <div class='container-fluid'>
           <h2 class='page-header text-center'>
             Jobs for role <em>{{role}}</em>
             <span ng-if='environment'> and environment <em>{{environment}}</em></span>
-
-            <span ng-if='!environment'>
-              <button class='btn' ng-click='toggleResourceVisibility()'>
-                {{resourceButtonText}}
-              </button>
-            </span>
           </h2>
         </div>
 
         <div class='container-fluid'>
+          <div ng-if='!environment'>
+            <button class='btn summaryButton' ng-click='toggleResourceVisibility()'>
+              {{resourceButtonText}}
+            </button>
+          </div>
+
           <div ng-show='showResources && !environment'>
-            <div class='span8 center'>
+            <div class='span8 summaryTable'>
               <div ng-controller="QuotaController">
                 <div ng-show='error'>
                   <error/>


Mime
View raw message