From 16f82cfd1fb51961d48c76a6774685e472192b4a Mon Sep 17 00:00:00 2001 From: Kousuke Saruta Date: Fri, 3 Apr 2015 19:48:14 +0900 Subject: [PATCH] Cleanuped --- .../apache/spark/ui/static/timeline-view.css | 39 ++++++++++--------- .../org/apache/spark/ui/jobs/JobPage.scala | 3 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/core/src/main/resources/org/apache/spark/ui/static/timeline-view.css b/core/src/main/resources/org/apache/spark/ui/static/timeline-view.css index 329c1a54e2333..26ca4110f8509 100644 --- a/core/src/main/resources/org/apache/spark/ui/static/timeline-view.css +++ b/core/src/main/resources/org/apache/spark/ui/static/timeline-view.css @@ -15,10 +15,6 @@ * limitations under the License. */ -.vis.timeline div.content { - width: 100%; -} - div#application-timeline, div#job-timeline { margin-bottom: 30px; } @@ -67,73 +63,78 @@ div#application-timeline, div#job-timeline { width: 100%; height: 19px; } -.task.task-assignment-timeline-object.succeeded { + +.vis.timeline div.content { + width: 100%; +} + +.vis.timeline .item.task.succeeded { background-color: #D5DDF6; } -.task.task-assignment-timeline-object.failed { +.vis.timeline .item.task.failed { background-color: #FF5475; } -.task.task-assignment-timeline-object.running { +.vis.timeline .item.task.running { background-color: #FDFFCA; } -.stage.job-timeline-object.succeeded { +.vis.timeline .item.stage.succeeded { background-color: #D5DDF6; } -.stage.job-timeline-object.succeeded.selected { +.vis.timeline .item.stage.succeeded.selected { background-color: #D5DDF6; border-color: #97B0F8; z-index: auto; } -.stage.job-timeline-object.failed { +.vis.timeline .item.stage.failed { background-color: #FF5475; } -.stage.job-timeline-object.failed.selected { +.vis.timeline .item.stage.failed.selected { background-color: #FF5475; border-color: #97B0F8; z-index: auto; } -.stage.job-timeline-object.running { +.vis.timeline .item.stage.running { background-color: #FDFFCA; } -.stage.job-timeline-object.running.selected { +.vis.timeline .item.stage.running.selected { background-color: #FDFFCA; border-color: #97B0F8; z-index: auto; } -.job.application-timeline-object.succeeded { +.vis.timeline .item.job.succeeded { background-color: #D5DDF6; } -.job.application-timeline-object.succeeded.selected { +.vis.timeline .item.job.succeeded.selected { background-color: #D5DDF6; border-color: #97B0F8; z-index: auto; } -.job.application-timeline-object.failed { +.vis.timeline .item.job.failed { background-color: #FF5475; } -.job.application-timeline-object.failed.selected { +.vis.timeline .item.job.failed.selected { background-color: #FF5475; border-color: #97B0F8; z-index: auto; } -.job.application-timeline-object.running { +.vis.timeline .item.job.running { background-color: #FDFFCA; } -.job.application-timeline-object.running.selected { +.vis.timeline .item.job.running.selected { background-color: #FDFFCA; border-color: #97B0F8; z-index: auto; diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala index 03e0bb3ffa250..65b16a6a28ede 100644 --- a/core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala +++ b/core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala @@ -131,7 +131,6 @@ private[ui] class JobPage(parent: JobsTab) extends WebUIPage("job") { |] """.stripMargin - val eventArrayAsStr = (stageEventJsonAsStrSeq ++ executorsJsonAsStrSeq).mkString("[", ",", "]") @@ -141,7 +140,7 @@ private[ui] class JobPage(parent: JobsTab) extends WebUIPage("job") { Zoom Lock ++ -
+
++