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/05/06 03:20:31 UTC
git commit: Showing status message in Job UI
Repository: incubator-aurora
Updated Branches:
refs/heads/master 7f2291835 -> 239747ec0
Showing status message in Job UI
Testing Done:
Tested on local laptop. Attached screenshot.
Bugs closed: AURORA-339, AURORA-374
Reviewed at https://reviews.apache.org/r/21093/
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/239747ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/239747ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/239747ec
Branch: refs/heads/master
Commit: 239747ec062903032c564f8310443ca21b66a703
Parents: 7f22918
Author: Suman Karumuri <ma...@apache.org>
Authored: Mon May 5 18:19:51 2014 -0700
Committer: Suman Karumuri <sk...@twitter.com>
Committed: Mon May 5 18:19:51 2014 -0700
----------------------------------------------------------------------
.../aurora/scheduler/http/ui/taskStatus.html | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/239747ec/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 2cab236..00e3a25 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
@@ -1,25 +1,23 @@
<task-status>
- <div class='row'>
- <div class='span4'>
+ <div>
<span title='{{formatedValue | scheduleStatusTooltip}}'>
<span ng-if='!showDetails'><i class='icon-plus'></i></span>
<span ng-if='showDetails'><i class='icon-minus'></i></span>
<span>
{{dataRow.latestActivity | toElapsedTime}} ago -
<span class='schedulingStatus'>{{formatedValue}}</span>
- <span ng-if='statusMessage'>: {{statusMessage}}</span>
+ <span ng-if='dataRow.statusMessage'>: {{dataRow.statusMessage}}</span>
</span>
</span>
- <ul ng-if='showDetails'>
- <li ng-repeat='taskEvent in dataRow.taskEvents'>
- {{taskEvent.date}} local -
+ <ul ng-if='showDetails'>
+ <li ng-repeat='taskEvent in dataRow.taskEvents'>
+ {{taskEvent.date}} local -
<span title='{{taskEvent.status | scheduleStatusTooltip}}'>
<span class='schedulingStatus'>{{taskEvent.status}}</span>
</span>
- <span ng-if='taskEvent.message'> - {{taskEvent.message}}</span>
- </li>
- </ul>
- </div>
+ <span ng-if='taskEvent.message'> - {{taskEvent.message}}</span>
+ </li>
+ </ul>
</div>
</task-status>
\ No newline at end of file