You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by wf...@apache.org on 2014/07/29 22:21:33 UTC
git commit: Improve usability of links in the job page.
Repository: incubator-aurora
Updated Branches:
refs/heads/master 3143284f3 -> 4439be3d7
Improve usability of links in the job page.
Bugs closed: AURORA-561
Reviewed at https://reviews.apache.org/r/24062/
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/4439be3d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/4439be3d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/4439be3d
Branch: refs/heads/master
Commit: 4439be3d7dca91a459474068d3bcf02d2acf36ab
Parents: 3143284
Author: Bill Farner <wf...@apache.org>
Authored: Tue Jul 29 13:11:43 2014 -0700
Committer: Bill Farner <wf...@apache.org>
Committed: Tue Jul 29 13:14:46 2014 -0700
----------------------------------------------------------------------
.../apache/aurora/scheduler/http/ui/css/app.css | 4 ++++
.../aurora/scheduler/http/ui/js/directives.js | 18 +++++++++---------
.../aurora/scheduler/http/ui/taskSandbox.html | 6 +++---
.../aurora/scheduler/http/ui/taskStatus.html | 12 ++++++++----
4 files changed, 24 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4439be3d/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 e7a31c5..2a75231 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
@@ -21,6 +21,10 @@
border-bottom: darkgray 1px solid;
}
+a {
+ cursor: pointer
+}
+
.logo {
width: 200px;
}
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4439be3d/src/main/resources/org/apache/aurora/scheduler/http/ui/js/directives.js
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/directives.js b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/directives.js
index 12c7b8c..6cc31aa 100644
--- a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/directives.js
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/directives.js
@@ -18,14 +18,14 @@
auroraUI.directive('roleLink', function () {
return {
restrict: 'C',
- template: '<a ng-href="/scheduler/{{formatedValue}}">{{formatedValue}}</a>'
+ template: '<a ng-href="/scheduler/{{formattedValue}}">{{formattedValue}}</a>'
};
});
auroraUI.directive('roleEnvLink', function () {
return {
restrict: 'C',
- template: '<a ng-href="/scheduler/{{dataRow.role}}/{{formatedValue}}">{{formatedValue}}</a>'
+ template: '<a ng-href="/scheduler/{{dataRow.role}}/{{formattedValue}}">{{formattedValue}}</a>'
};
});
@@ -33,8 +33,8 @@
return {
restrict: 'C',
template:
- '<a ng-href="/scheduler/{{dataRow.role}}/{{dataRow.environment}}/{{formatedValue}}">' +
- '{{formatedValue}}</a>'
+ '<a ng-href="/scheduler/{{dataRow.role}}/{{dataRow.environment}}/{{formattedValue}}">' +
+ '{{formattedValue}}</a>'
};
});
@@ -63,10 +63,10 @@
return {
restrict: 'E',
replace: true,
- link: function (scope, element, attrs, ctrl) {
- element.on('click', function (e) {
+ link: function (scope) {
+ scope.toggleShowDetails = function () {
scope.showDetails = !scope.showDetails;
- });
+ };
}
};
});
@@ -74,8 +74,8 @@
auroraUI.directive('taskLink', function () {
return {
restrict: 'C',
- template: '<a class="col-md-8" ng-href="/structdump/task/{{formatedValue}}" target="_self">' +
- '{{formatedValue}}</a>'
+ template: '<a class="col-md-8" ng-href="/structdump/task/{{formattedValue}}" ' +
+ 'target="_self">{{formattedValue}}</a>'
};
});
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4439be3d/src/main/resources/org/apache/aurora/scheduler/http/ui/taskSandbox.html
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/taskSandbox.html b/src/main/resources/org/apache/aurora/scheduler/http/ui/taskSandbox.html
index da801f4..6b52467 100644
--- a/src/main/resources/org/apache/aurora/scheduler/http/ui/taskSandbox.html
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/taskSandbox.html
@@ -13,14 +13,14 @@
limitations under the License.
-->
<span ng-if='dataRow.sandboxExists'>
- <a ng-href='http://{{formatedValue}}:1338/task/{{dataRow.taskId}}'>
- {{formatedValue}}
+ <a ng-href='http://{{formattedValue}}:1338/task/{{dataRow.taskId}}'>
+ {{formattedValue}}
</a>
</span>
<span ng-if='!dataRow.sandboxExists'>
<abbr title='This sandbox link is disabled because the sandbox disk space has been reclaimed.'>
- {{formatedValue}}
+ {{formattedValue}}
</abbr>
</span>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4439be3d/src/main/resources/org/apache/aurora/scheduler/http/ui/taskStatus.html
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/taskStatus.html b/src/main/resources/org/apache/aurora/scheduler/http/ui/taskStatus.html
index bdf15cf..77efb2a 100644
--- a/src/main/resources/org/apache/aurora/scheduler/http/ui/taskStatus.html
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/taskStatus.html
@@ -13,12 +13,16 @@
limitations under the License.
-->
<div>
- <span title='{{formatedValue | scheduleStatusTooltip}}'>
- <span ng-if='!showDetails'><i class='glyphicon glyphicon-plus'></i></span>
- <span ng-if='showDetails'><i class='glyphicon glyphicon-minus'></i></span>
+ <span title='{{formattedValue | scheduleStatusTooltip}}'>
+ <span ng-if='!showDetails'>
+ <i class='glyphicon glyphicon-plus' ng-click="toggleShowDetails()"></i>
+ </span>
+ <span ng-if='showDetails'>
+ <i class='glyphicon glyphicon-minus' ng-click="toggleShowDetails()"></i>
+ </span>
<span>
{{dataRow.latestActivity | toElapsedTime}} ago -
- <span class='schedulingStatus'>{{formatedValue}}</span>
+ <span class='schedulingStatus'>{{formattedValue}}</span>
<span ng-if='dataRow.statusMessage'>: {{dataRow.statusMessage}}</span>
</span>
</span>