From ac8842bd54c004f976635280c75341945ed25c3b Mon Sep 17 00:00:00 2001
From: Kousuke Saruta <sarutak@oss.nttdata.co.jp>
Date: Wed, 13 May 2015 10:37:52 +0900
Subject: [PATCH] Fixed layout

---
 .../apache/spark/ui/static/timeline-view.css  | 16 ++------------
 .../apache/spark/ui/static/timeline-view.js   |  6 ++---
 .../org/apache/spark/ui/jobs/StagePage.scala  | 22 +++++++------------
 3 files changed, 12 insertions(+), 32 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 374d6d8e360a9..0e4541d7cee1b 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
@@ -25,23 +25,15 @@ div#application-timeline, div#job-timeline {
 }
 
 #task-assignment-timeline div.legend-area {
-  float: right;
   border: 1px solid #000000;
+  width: 554px;
 }
 
 #task-assignment-timeline .legend-area > svg {
-  width: 600px;
+  width: 100%;
   height: 55px;
 }
 
-#task-assignment-timeline > .timeline-header:after {
-  content: "";
-  clear: both;
-  height: 0;
-  display: block;
-  visibility: hidden;
-}
-
 #task-assignment-timeline div.item.range {
   padding: 0px;
   height: 26px;
@@ -251,10 +243,6 @@ tr.corresponding-item-hover > td, tr.corresponding-item-hover > th {
   margin: 0;
 }
 
-#task-assignment-timeline .control-panel {
-  float: left;
-}
-
 span.expand-application-timeline, span.expand-job-timeline,
 span.expand-task-assignment-timeline {
   cursor: pointer;
diff --git a/core/src/main/resources/org/apache/spark/ui/static/timeline-view.js b/core/src/main/resources/org/apache/spark/ui/static/timeline-view.js
index dcdf41b86aedb..ff435e6608afc 100644
--- a/core/src/main/resources/org/apache/spark/ui/static/timeline-view.js
+++ b/core/src/main/resources/org/apache/spark/ui/static/timeline-view.js
@@ -169,15 +169,13 @@ function drawTaskAssignmentTimeline(groupArray, eventObjArray, minLaunchTime, zo
         return "#task-" + taskIdx;
       };
 
-      $(this).click(function() {
-        window.location.href = getSelectorForTaskEntry(this);
-      });
-
       $(this).hover(
         function() {
+          $(getSelectorForTaskEntry(this)).addClass("corresponding-item-hover");
           $($(this).find("div.task-assignment-timeline-content")[0]).tooltip("show");
         },
         function() {
+          $(getSelectorForTaskEntry(this)).removeClass("corresponding-item-hover");
           $($(this).find("div.task-assignment-timeline-content")[0])
           .tooltip("hide");
         }
diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala
index 37c0b904a9618..d209100a6e746 100644
--- a/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala
+++ b/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala
@@ -515,15 +515,11 @@ private[ui] class StagePage(parent: StagesTab) extends WebUIPage("stage") {
     }.sortWith { (uiDataL, uiDataR) =>
       val taskInfoL = uiDataL.taskInfo
       val launchTimeL = taskInfoL.launchTime
-      val finishTimeL = if (!taskInfoL.running) taskInfoL.finishTime else currentTime
-      val totalExecutionTimeL = finishTimeL - launchTimeL
 
       val taskInfoR = uiDataR.taskInfo
       val launchTimeR = taskInfoR.launchTime
-      val finishTimeR = if (!taskInfoR.running) taskInfoR.finishTime else currentTime
-      val totalExecutionTimeR = finishTimeR - launchTimeR
 
-      totalExecutionTimeL > totalExecutionTimeR
+      launchTimeL > launchTimeR
     }.take(MAX_TIMELINE_TASKS).map { taskUIData =>
       val taskInfo = taskUIData.taskInfo
       val executorId = taskInfo.executorId
@@ -677,18 +673,16 @@ private[ui] class StagePage(parent: StagesTab) extends WebUIPage("stage") {
 
     <span class="expand-task-assignment-timeline">
       <span class="expand-task-assignment-timeline-arrow arrow-closed"></span>
-      <a>Event Timeline (Longest {numEffectiveTasks.min(MAX_TIMELINE_TASKS)} tasks)</a>
+      <a>Event Timeline (Most recent {numEffectiveTasks.min(MAX_TIMELINE_TASKS)} tasks)</a>
     </span> ++
     <div id="task-assignment-timeline" class="collapsed">
-      <div class="timeline-header">
-        <div class="control-panel">
-          <div id="task-assignment-timeline-zoom-lock">
-            <input type="checkbox"></input>
-            <span>Enable zooming</span>
-          </div>
+      <div class="control-panel">
+        <div id="task-assignment-timeline-zoom-lock">
+          <input type="checkbox"></input>
+          <span>Enable zooming</span>
         </div>
-        {TIMELINE_LEGEND}
       </div>
+      {TIMELINE_LEGEND}
     </div> ++
     <script type="text/javascript">
       {Unparsed(s"drawTaskAssignmentTimeline(" +
@@ -769,7 +763,7 @@ private[ui] class StagePage(parent: StagesTab) extends WebUIPage("stage") {
       val diskBytesSpilledSortable = maybeDiskBytesSpilled.map(_.toString).getOrElse("")
       val diskBytesSpilledReadable = maybeDiskBytesSpilled.map(Utils.bytesToString).getOrElse("")
 
-      <tr id={"task-" + info.index}>
+      <tr id={"task-" + info.taskId}>
         <td>{info.index}</td>
         <td>{info.taskId}</td>
         <td sorttable_customkey={info.attempt.toString}>{