Some tweaking with shared page header

7 files changed, 18 insertions, 9 deletions

diff --git a/core/src/main/scala/spark/ui/JettyUtils.scala b/core/src/main/scala/spark/ui/JettyUtils.scala
index 726a95594b..225daf5778 100644
--- a/core/src/main/scala/spark/ui/JettyUtils.scala
+++ b/core/src/main/scala/spark/ui/JettyUtils.scala
@@ -12,7 +12,7 @@ import org.eclipse.jetty.server.handler.{ResourceHandler, HandlerList, ContextHa
 import scala.util.{Try, Success, Failure}
 import scala.xml.Node
 
-import spark.Logging
+import spark.{Utils, SparkContext, Logging}
 
 /** Utilities for launching a web server using Jetty's HTTP Server class */
 private[spark] object JettyUtils extends Logging {
@@ -97,9 +97,18 @@ private[spark] object JettyUtils extends Logging {
 object UIUtils {
 
   /** Returns a page containing the supplied content and the spark web ui headers */
-  def headerSparkPage(content: => Seq[Node], title: String): Seq[Node] = {
+  def headerSparkPage(content: => Seq[Node], sc: SparkContext, title: String): Seq[Node] = {
     val newContent =
-      <h2><a href="/storage">Storage</a> | <a href="/stages">Jobs</a> </h2><hl/>;
+      <div class="row">
+        <div class="span12">
+          <ul class="unstyled">
+            <li><strong>Master:</strong> {sc.master}</li>
+            <li><strong>Application:</strong> {sc.appName}</li>
+          </ul>
+          <h3><a href="/storage">Storage</a> | <a href="/stages">Jobs</a> </h3>
+        </div>
+      </div>
+      <hr/>;
     sparkPage(newContent ++ content, title)
   }
 
diff --git a/core/src/main/scala/spark/ui/SparkUI.scala b/core/src/main/scala/spark/ui/SparkUI.scala
index deb6284a66..cfa805fcf8 100644
--- a/core/src/main/scala/spark/ui/SparkUI.scala
+++ b/core/src/main/scala/spark/ui/SparkUI.scala
@@ -18,7 +18,7 @@ private[spark] class SparkUI(sc: SparkContext) extends Logging {
 
   val handlers = Seq[(String, Handler)](
     ("/static", createStaticHandler(SparkUI.STATIC_RESOURCE_DIR)),
-    ("*", (request: HttpServletRequest) => headerSparkPage(<h1>Test</h1>, "Test page"))
+    ("*", (request: HttpServletRequest) => headerSparkPage(<h1>Test</h1>, sc, "Test page"))
   )
   val storage = new BlockManagerUI(sc)
   val jobs = new JobProgressUI(sc)
diff --git a/core/src/main/scala/spark/ui/jobs/IndexPage.scala b/core/src/main/scala/spark/ui/jobs/IndexPage.scala
index 87f3abc6b0..5a4658499a 100644
--- a/core/src/main/scala/spark/ui/jobs/IndexPage.scala
+++ b/core/src/main/scala/spark/ui/jobs/IndexPage.scala
@@ -30,7 +30,7 @@ class IndexPage(parent: JobProgressUI) {
     val content = <h2>Active Stages</h2> ++ activeStageTable ++
                   <h2>Completed Stages</h2>  ++ completedStageTable
 
-    headerSparkPage(content, "Spark Stages")
+    headerSparkPage(content, parent.sc, "Spark Stages")
   }
 
   def getElapsedTime(submitted: Option[Long], completed: Long): String = {
diff --git a/core/src/main/scala/spark/ui/jobs/JobProgressUI.scala b/core/src/main/scala/spark/ui/jobs/JobProgressUI.scala
index d260523590..47a6bcc2c3 100644
--- a/core/src/main/scala/spark/ui/jobs/JobProgressUI.scala
+++ b/core/src/main/scala/spark/ui/jobs/JobProgressUI.scala
@@ -17,7 +17,7 @@ import spark.executor.TaskMetrics
 import spark.Success
 
 /** Web UI showing progress status of all jobs in the given SparkContext. */
-private[spark] class JobProgressUI(sc: SparkContext) {
+private[spark] class JobProgressUI(val sc: SparkContext) {
   val listener = new JobProgressListener
   val dateFmt = new SimpleDateFormat("EEE, MMM d yyyy HH:mm:ss")
 
diff --git a/core/src/main/scala/spark/ui/jobs/StagePage.scala b/core/src/main/scala/spark/ui/jobs/StagePage.scala
index d76c07e458..42eb1f9eef 100644
--- a/core/src/main/scala/spark/ui/jobs/StagePage.scala
+++ b/core/src/main/scala/spark/ui/jobs/StagePage.scala
@@ -53,7 +53,7 @@ class StagePage(parent: JobProgressUI) {
     val content =
       <h2>Summary Metrics</h2> ++ quantileTable ++ <h2>Tasks</h2> ++ taskTable;
 
-    headerSparkPage(content, "Stage Details: %s".format(stageId))
+    headerSparkPage(content, parent.sc, "Stage Details: %s".format(stageId))
   }
 
   def quantileRow(data: Seq[String]): Seq[Node] = <tr> {data.map(d => <td>{d}</td>)} </tr>
diff --git a/core/src/main/scala/spark/ui/storage/IndexPage.scala b/core/src/main/scala/spark/ui/storage/IndexPage.scala
index 52b9087099..cd7f6bd9f2 100644
--- a/core/src/main/scala/spark/ui/storage/IndexPage.scala
+++ b/core/src/main/scala/spark/ui/storage/IndexPage.scala
@@ -42,7 +42,7 @@ class IndexPage(parent: BlockManagerUI) {
         </div>
       </div> ++ {rddTable};
 
-    headerSparkPage(content, "Spark Storage ")
+    headerSparkPage(content, parent.sc, "Spark Storage ")
   }
 
   def rddRow(rdd: RDDInfo): Seq[Node] = {
diff --git a/core/src/main/scala/spark/ui/storage/RDDPage.scala b/core/src/main/scala/spark/ui/storage/RDDPage.scala
index 1031b2e17f..059affedbd 100644
--- a/core/src/main/scala/spark/ui/storage/RDDPage.scala
+++ b/core/src/main/scala/spark/ui/storage/RDDPage.scala
@@ -65,7 +65,7 @@ class RDDPage(parent: BlockManagerUI) {
         </div>
           <hr/> ++ {workerTable};
 
-    headerSparkPage(content, "RDD Info: " + rddInfo.name)
+    headerSparkPage(content, parent.sc, "RDD Info: " + rddInfo.name)
   }
 
   def blockRow(blk: (String, BlockStatus)): Seq[Node] = {