aurora-commits mailing list archives

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

Conflicts:
	src/main/resources/org/apache/aurora/scheduler/http/ui/css/app.css
	src/main/resources/org/apache/aurora/scheduler/http/ui/job.html
	src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js
	src/main/resources/org/apache/aurora/scheduler/http/ui/js/directives.js
	src/main/resources/org/apache/aurora/scheduler/http/ui/js/filters.js
	src/main/resources/org/apache/aurora/scheduler/http/ui/role.html
	src/main/resources/org/apache/aurora/scheduler/http/ui/taskStatus.html


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

Branch: refs/heads/mansu/job_page
Commit: 45b21730af1146909c8dc77fa3eda5c9e6e398e1
Parents: c3429fd 0086186
Author: Suman Karumuri <skarumuri@twitter.com>
Authored: Fri Apr 4 17:01:44 2014 -0700
Committer: Suman Karumuri <skarumuri@twitter.com>
Committed: Fri Apr 4 17:01:44 2014 -0700

----------------------------------------------------------------------
 .../apache/aurora/scheduler/http/ui/css/app.css | 15 ++++-
 .../apache/aurora/scheduler/http/ui/job.html    | 23 ++++---
 .../aurora/scheduler/http/ui/js/controllers.js  | 68 +++++++++++++-------
 .../aurora/scheduler/http/ui/js/directives.js   |  6 +-
 .../aurora/scheduler/http/ui/js/filters.js      |  8 ++-
 .../apache/aurora/scheduler/http/ui/role.html   | 16 ++---
 .../aurora/scheduler/http/ui/taskStatus.html    |  7 +-
 7 files changed, 94 insertions(+), 49 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/45b21730/src/main/resources/org/apache/aurora/scheduler/http/ui/css/app.css
----------------------------------------------------------------------
diff --cc src/main/resources/org/apache/aurora/scheduler/http/ui/css/app.css
index e81f561,a09e3c9..6b334dd
--- 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
@@@ -33,3 -32,13 +32,13 @@@ ul.breadcrumb 
  .schedulingStatus {
    border-bottom: 1px #aaaaaa dashed;
  }
+ 
+ .noMarginLeft {
+   margin-left: 0px;
+ }
+ 
+ .bottomRight {
+   bottom: 10px;
+   right: 10px;
+   position: fixed;
 -}
++}

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/45b21730/src/main/resources/org/apache/aurora/scheduler/http/ui/role.html
----------------------------------------------------------------------
diff --cc src/main/resources/org/apache/aurora/scheduler/http/ui/role.html
index 5698542,9f81bad..d823b6f
--- 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,7 -10,7 +10,7 @@@
        </div>
  
        <div>
-         <div class='row-fluid'>
 -        <div class='container-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>
@@@ -24,8 -18,14 +18,14 @@@
          </div>
  
          <div class='container-fluid'>
 -          <div ng-if='!environment'>
++         <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 noMarginLeft'>
                <div ng-controller="QuotaController">
                  <div ng-show='error'>
                    <error/>


Mime
View raw message