aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject git commit: Always show resource consumption table on Job page.
Date Fri, 09 May 2014 21:26:01 GMT
Repository: incubator-aurora
Updated Branches:
  refs/heads/master 1646ea437 -> 1dfbd39df


Always show resource consumption table on Job page.

Testing Done:
Tested on local laptop. Screenshots attached.

Bugs closed: AURORA-386

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


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

Branch: refs/heads/master
Commit: 1dfbd39df2fc8baee942d6d23e7b2af31c8b76c0
Parents: 1646ea4
Author: Suman Karumuri <mansu@apache.org>
Authored: Fri May 9 14:25:13 2014 -0700
Committer: Suman Karumuri <skarumuri@twitter.com>
Committed: Fri May 9 14:25:13 2014 -0700

----------------------------------------------------------------------
 .../apache/aurora/scheduler/http/ui/js/controllers.js    | 10 ----------
 .../org/apache/aurora/scheduler/http/ui/role.html        | 11 +++--------
 2 files changed, 3 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1dfbd39d/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 7c80bd7..768c4fe 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
@@ -77,16 +77,6 @@ auroraUIControllers.controller('JobSummaryController',
 
     $scope.error = '';
 
-    var showResourcesMsg = 'Show Resource Consumption';
-    var hideResourcesMsg = 'Hide Resource Consumption';
-    $scope.showResources = false;
-    $scope.resourceButtonText = showResourcesMsg;
-
-    $scope.toggleResourceVisibility = function () {
-      $scope.showResources = !$scope.showResources;
-      $scope.resourceButtonText = ($scope.showResources ? showResourcesMsg : hideResourcesMsg);
-    };
-
     $scope.jobsTableColumns = [
       {label: 'Job Type', map: 'jobType'},
       {label: 'Environment', map: 'environment', cellTemplateUrl: '/roleEnvLink.html'},

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1dfbd39d/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 ff631c8..94fda63 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,7 +10,7 @@
       </div>
 
       <div>
-       <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>
@@ -18,13 +18,7 @@
         </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 ng-show='!environment'>
             <div class='row'>
               <div class='span8'>
                 <div ng-controller="QuotaController">
@@ -33,6 +27,7 @@
                   </div>
 
                   <div ng-hide='error'>
+                    <h4>Resource consumption</h4>
                     <smart-table config='resourcesTableConfig'
                                  columns='resourcesTableColumns'
                                  rows='resources'


Mime
View raw message