From de9d7d2b5b6d80963505571700e83779fd98f850 Mon Sep 17 00:00:00 2001
From: "genmao.ygm" <genmao.ygm@alibaba-inc.com>
Date: Mon, 22 Dec 2014 14:14:39 -0800
Subject: [PATCH] [SPARK-4920][UI]:current spark version in UI is not striking.
It is not convenient to see the Spark version. We can keep the same style with Spark website.
Author: genmao.ygm <genmao.ygm@alibaba-inc.com>
Closes #3763 from uncleGen/master-clean-141222 and squashes the following commits:
0dcb9a9 [genmao.ygm] [SPARK-4920][UI]:current spark version in UI is not striking.
---
.../org/apache/spark/ui/static/webui.css | 10 ++++++++++
.../scala/org/apache/spark/ui/UIUtils.scala | 19 ++++++-------------
2 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/core/src/main/resources/org/apache/spark/ui/static/webui.css b/core/src/main/resources/org/apache/spark/ui/static/webui.css
index 68c52ac09b..5751964b79 100644
--- a/core/src/main/resources/org/apache/spark/ui/static/webui.css
+++ b/core/src/main/resources/org/apache/spark/ui/static/webui.css
@@ -169,6 +169,16 @@ span.additional-metric-title {
display: inline-block;
}
+.version {
+ line-height: 30px;
+ vertical-align: bottom;
+ font-size: 12px;
+ padding: 0;
+ margin: 0;
+ font-weight: bold;
+ color: #777;
+}
+
/* Hide all additional metrics by default. This is done here rather than using JavaScript to
* avoid slow page loads for stage pages with large numbers (e.g., thousands) of tasks. */
.scheduler_delay, .deserialization_time, .serialization_time, .getting_result_time {
diff --git a/core/src/main/scala/org/apache/spark/ui/UIUtils.scala b/core/src/main/scala/org/apache/spark/ui/UIUtils.scala
index d970fa30c1..7486cb6b1b 100644
--- a/core/src/main/scala/org/apache/spark/ui/UIUtils.scala
+++ b/core/src/main/scala/org/apache/spark/ui/UIUtils.scala
@@ -194,9 +194,12 @@ private[spark] object UIUtils extends Logging {
<body>
<div class="navbar navbar-static-top">
<div class="navbar-inner">
- <a href={prependBaseUri("/")} class="brand">
- <img src={prependBaseUri("/static/spark-logo-77x50px-hd.png")} />
- </a>
+ <div class="brand">
+ <a href={prependBaseUri("/")} class="brand">
+ <img src={prependBaseUri("/static/spark-logo-77x50px-hd.png")} />
+ <span class="version">{org.apache.spark.SPARK_VERSION}</span>
+ </a>
+ </div>
<ul class="nav">{header}</ul>
<p class="navbar-text pull-right">
<strong title={appName}>{shortAppName}</strong> application UI
@@ -214,11 +217,6 @@ private[spark] object UIUtils extends Logging {
</div>
{content}
</div>
- <div id="footer">
- <div class="container-fluid">
- <p class="muted credit">Spark {org.apache.spark.SPARK_VERSION}</p>
- </div>
- </div>
</body>
</html>
}
@@ -245,11 +243,6 @@ private[spark] object UIUtils extends Logging {
</div>
{content}
</div>
- <div id="footer">
- <div class="container-fluid">
- <p class="muted credit">Spark {org.apache.spark.SPARK_VERSION}</p>
- </div>
- </div>
</body>
</html>
}
--
GitLab