From 7ab0e2289df39eed03b0b8c8b2b350faf2b4e4ee Mon Sep 17 00:00:00 2001 From: Shixiong Zhu Date: Tue, 29 Dec 2015 19:54:10 -0800 Subject: [SPARK-12490][CORE] Limit the css style scope to fix the Streaming UI #10441 broke the Streaming UI because of the new CSS style. screen shot 2015-12-29 at 4 49 04 pm This PR just added a class for the new style and only applied them to the paged tables. Author: Shixiong Zhu Closes #10517 from zsxwing/fix-streaming-ui. --- core/src/main/resources/org/apache/spark/ui/static/webui.css | 2 +- core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala | 3 ++- core/src/main/scala/org/apache/spark/ui/storage/RDDPage.scala | 3 ++- 3 files changed, 5 insertions(+), 3 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 dd708ef2c2..48f86d1536 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 @@ -227,7 +227,7 @@ a.expandbutton { cursor:pointer; } -th a, th a:hover { +.table-head-clickable th a, .table-head-clickable th a:hover { /* Make the entire header clickable, not just the text label */ display: block; width: 100%; 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 b02b99a6fc..08e7576b0c 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 @@ -1233,7 +1233,8 @@ private[ui] class TaskPagedTable( override def tableId: String = "task-table" - override def tableCssClass: String = "table table-bordered table-condensed table-striped" + override def tableCssClass: String = + "table table-bordered table-condensed table-striped table-head-clickable" override def pageSizeFormField: String = "task.pageSize" diff --git a/core/src/main/scala/org/apache/spark/ui/storage/RDDPage.scala b/core/src/main/scala/org/apache/spark/ui/storage/RDDPage.scala index 3e51ce2e97..606d15d599 100644 --- a/core/src/main/scala/org/apache/spark/ui/storage/RDDPage.scala +++ b/core/src/main/scala/org/apache/spark/ui/storage/RDDPage.scala @@ -237,7 +237,8 @@ private[ui] class BlockPagedTable( override def tableId: String = "rdd-storage-by-block-table" - override def tableCssClass: String = "table table-bordered table-condensed table-striped" + override def tableCssClass: String = + "table table-bordered table-condensed table-striped table-head-clickable" override def pageSizeFormField: String = "block.pageSize" -- cgit v1.2.3