Various formatting changes

3 files changed, 14 insertions, 16 deletions

diff --git a/core/src/main/scala/spark/Utils.scala b/core/src/main/scala/spark/Utils.scala
index 6966ee9ee9..af926b1e36 100644
--- a/core/src/main/scala/spark/Utils.scala
+++ b/core/src/main/scala/spark/Utils.scala
@@ -495,13 +495,13 @@ private object Utils extends Logging {
 
     ms match {
       case t if t < second =>
-        "%dms".format(t)
+        "%d ms".format(t)
       case t if t < minute =>
-        "%d.%03ds".format(t / second, t % second)
+        "%.1f s".format(t.toFloat / second)
       case t if t < hour =>
-        "%d:%02d".format(t / minute, (t % minute) / second)
+        "%.1f m".format(t.toFloat / minute)
       case t =>
-        "%d:%02d:%02d".format(t / hour, t % hour / minute, (t % hour) % minute / second)
+        "%.2f h".format(t.toFloat / hour)
     }
   }
 
diff --git a/core/src/main/scala/spark/ui/jobs/IndexPage.scala b/core/src/main/scala/spark/ui/jobs/IndexPage.scala
index cd04542faa..1e675ab2cb 100644
--- a/core/src/main/scala/spark/ui/jobs/IndexPage.scala
+++ b/core/src/main/scala/spark/ui/jobs/IndexPage.scala
@@ -18,8 +18,6 @@ private[spark] class IndexPage(parent: JobProgressUI) {
   val dateFmt = parent.dateFmt
 
   def render(request: HttpServletRequest): Seq[Node] = {
-    val stageHeaders = Seq("Stage ID", "Origin", "Submitted", "Duration", "Progress",
-                           "Tasks: Complete/Total", "Shuffle Activity", "Stored RDD")
     val activeStages = listener.activeStages.toSeq
     val completedStages = listener.completedStages.reverse.toSeq
     val failedStages = listener.failedStages.reverse.toSeq
@@ -67,9 +65,9 @@ private[spark] class IndexPage(parent: JobProgressUI) {
 
     <svg width={width.toString} height={height.toString}>
       <rect width={width.toString} height={height.toString}
-            fill="white" stroke="black" stroke-width="1" />
+            fill="white" stroke="rgb(51,51,51)" stroke-width="1" />
       <rect width={completeWidth.toString} height={height.toString}
-            fill="rgb(51,51,51)" stroke="black" stroke-width="1" />
+            fill="rgb(0,136,204)" stroke="black" stroke-width="1" />
     </svg>
   }
 
diff --git a/core/src/test/scala/spark/ui/UISuite.scala b/core/src/test/scala/spark/ui/UISuite.scala
index 127ab5ebc2..aa191f628b 100644
--- a/core/src/test/scala/spark/ui/UISuite.scala
+++ b/core/src/test/scala/spark/ui/UISuite.scala
@@ -34,13 +34,13 @@ class UISuite extends FunSuite {
     val hour = minute * 60
     def str = Utils.msDurationToString(_)
 
-    assert(str(123) === "123ms")
-    assert(str(second) === "1.000s")
-    assert(str(second + 452) === "1.452s")
-    assert(str(hour) === "1:00:00")
-    assert(str(minute) === "1:00")
-    assert(str(minute + 4 * second + 34) === "1:04")
-    assert(str(10 * hour + minute + 4 * second) === "10:01:04")
-    assert(str(10 * hour + 59 * minute + 59 * second + 999) === "10:59:59")
+    assert(str(123) === "123 ms")
+    assert(str(second) === "1.0 s")
+    assert(str(second + 462) === "1.5 s")
+    assert(str(hour) === "1.00 h")
+    assert(str(minute) === "1.0 m")
+    assert(str(minute + 4 * second + 34) === "1.1 m")
+    assert(str(10 * hour + minute + 4 * second) === "10.02 h")
+    assert(str(10 * hour + 59 * minute + 59 * second + 999) === "11.00 h")
   }
 }