You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by ma...@apache.org on 2014/04/05 02:05:33 UTC
[47/50] [abbrv] git commit: Added the pi symbol.
Added the pi symbol.
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/7db19d9b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/7db19d9b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/7db19d9b
Branch: refs/heads/mansu/job_page
Commit: 7db19d9bfc4abd9e14903b6c376c620eadd4af43
Parents: 6a44f6c
Author: Suman Karumuri <sk...@twitter.com>
Authored: Fri Apr 4 13:37:38 2014 -0700
Committer: Suman Karumuri <sk...@twitter.com>
Committed: Fri Apr 4 13:41:28 2014 -0700
----------------------------------------------------------------------
.../apache/aurora/scheduler/http/ui/css/app.css | 6 ++++++
.../apache/aurora/scheduler/http/ui/job.html | 9 ++++++---
.../aurora/scheduler/http/ui/js/controllers.js | 21 +++++++++++++-------
3 files changed, 26 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/7db19d9b/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 3a26e7d..a09e3c9 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
@@ -35,4 +35,10 @@ ul.breadcrumb {
.noMarginLeft {
margin-left: 0px;
+}
+
+.bottomRight {
+ bottom: 10px;
+ right: 10px;
+ position: fixed;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/7db19d9b/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 372c362..a56a69f 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
@@ -11,9 +11,8 @@
<div class='container-fluid'>
<div class='page-header'>
- <h2 class='text-center'>Job <em>{{job}}</em> in role <em>{{role}}</em> and
- environment <em>{{environment}}</em>
-
+ <h2 class='text-center'>
+ Job <em>{{job}}</em> in role <em>{{role}}</em> and environment <em>{{environment}}</em>
<span ng-if='jobDashboardURL'>
<a ng-href='{{jobDashboardURL}}' title='Container stats for this job'>
<i class='icon-large icon-stats'></i>
@@ -58,6 +57,10 @@
class='table table-striped table-hover table-bordered table-condensed'>
</smart-table>
</div>
+
+ <div class='container-fluid'>
+ <span class='bottomRight' ng-click='toggleTaskInfoLinkVisibility()'>π</span>
+ </div>
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/7db19d9b/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 503575e..1641a9d 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
@@ -297,13 +297,6 @@ auroraUIControllers.controller('JobController',
$scope.toggleSummaryVisibility = function () {
$scope.showSummary = !$scope.showSummary;
$scope.summaryButtonText = $scope.showSummary ? hideSummary : showSummary;
-
- $scope.activeTasksTableColumns = $scope.showSummary
- ? addColumn(2, taskColumns, taskIdColumn)
- : taskColumns;
- $scope.completedTasksTableColumns = $scope.showSummary
- ? addColumn(3, completedTaskColumns, taskIdColumn) :
- completedTaskColumns;
};
var taskTableConfig = {
@@ -345,6 +338,20 @@ auroraUIControllers.controller('JobController',
_.last(currentColumns, currentColumns.length - idxPosition));
}
+ $scope.showTaskInfoLink = false;
+
+ $scope.toggleTaskInfoLinkVisibility = function () {
+ $scope.showTaskInfoLink = !$scope.showTaskInfoLink;
+
+ $scope.activeTasksTableColumns = $scope.showTaskInfoLink
+ ? addColumn(2, taskColumns, taskIdColumn)
+ : taskColumns;
+
+ $scope.completedTasksTableColumns = $scope.showTaskInfoLink
+ ? addColumn(3, completedTaskColumns, taskIdColumn) :
+ completedTaskColumns;
+ };
+
$scope.jobDashboardURL = '';
$scope.completedTasks = [];