{title}

Return-Path: X-Original-To: apmail-spark-commits-archive@minotaur.apache.org Delivered-To: apmail-spark-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D7E3E198F0 for ; Tue, 5 Apr 2016 17:51:27 +0000 (UTC) Received: (qmail 41456 invoked by uid 500); 5 Apr 2016 17:51:27 -0000 Delivered-To: apmail-spark-commits-archive@spark.apache.org Received: (qmail 41428 invoked by uid 500); 5 Apr 2016 17:51:27 -0000 Mailing-List: contact commits-help@spark.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@spark.apache.org Received: (qmail 41419 invoked by uid 99); 5 Apr 2016 17:51:27 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Apr 2016 17:51:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9EC1BDFC72; Tue, 5 Apr 2016 17:51:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zsxwing@apache.org To: commits@spark.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: spark git commit: [SPARK-14397][WEBUI] and tags are nested in LogPage Date: Tue, 5 Apr 2016 17:51:27 +0000 (UTC) Repository: spark Updated Branches: refs/heads/master d35690158 -> e4bd50412 [SPARK-14397][WEBUI] and tags are nested in LogPage ## What changes were proposed in this pull request? In `LogPage`, the content to be rendered is defined as follows. ``` val content = {linkToMaster}

{backButton}

{range}

{nextButton}

{logText}

UIUtils.basicSparkPage(content, logType + " log page for " + pageName) ``` As you can see, and tags will be rendered. On the other hand, `UIUtils.basicSparkPage` will render those tags so those tags will be nested. ``` def basicSparkPage( content: => Seq[Node], title: String, useDataTables: Boolean = false): Seq[Node] = { {commonHeaderNodes} {if (useDataTables) dataTablesHeaderNodes else Seq.empty} {title}

{org.apache.spark.SPARK_VERSION} {title}

{content}

} ``` These are the screen shots before this patch is applied. ![before1](https://cloud.githubusercontent.com/assets/4736016/14273236/03cbed8a-fb44-11e5-8786-bc1bfa4d3f8c.png) ![before2](https://cloud.githubusercontent.com/assets/4736016/14273237/03d1741c-fb44-11e5-9dee-ea93022033a6.png) And these are the ones after this patch is applied. ![after1](https://cloud.githubusercontent.com/assets/4736016/14273248/1b6a7d8a-fb44-11e5-8a3b-69964f3434f6.png) ![after2](https://cloud.githubusercontent.com/assets/4736016/14273249/1b6b9c38-fb44-11e5-9d6f-281d64c842e4.png) The appearance is not changed but the html source code is changed. ## How was this patch tested? Manually run some jobs on my standalone-cluster and check the WebUI. Author: Kousuke Saruta Closes #12170 from sarutak/SPARK-14397. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/e4bd5041 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/e4bd5041 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/e4bd5041 Branch: refs/heads/master Commit: e4bd50412043c1ed2816406ba8d2af4f775ee3cf Parents: d356901 Author: Kousuke Saruta Authored: Tue Apr 5 10:51:23 2016 -0700 Committer: Shixiong Zhu Committed: Tue Apr 5 10:51:23 2016 -0700 ---------------------------------------------------------------------- .../apache/spark/deploy/worker/ui/LogPage.scala | 26 +++++++++----------- 1 file changed, 12 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/e4bd5041/core/src/main/scala/org/apache/spark/deploy/worker/ui/LogPage.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/deploy/worker/ui/LogPage.scala b/core/src/main/scala/org/apache/spark/deploy/worker/ui/LogPage.scala index 6500cab..e75c0ce 100644 --- a/core/src/main/scala/org/apache/spark/deploy/worker/ui/LogPage.scala +++ b/core/src/main/scala/org/apache/spark/deploy/worker/ui/LogPage.scala @@ -107,20 +107,18 @@ private[ui] class LogPage(parent: WorkerWebUI) extends WebUIPage("logPage") with } val content = - - - {linkToMaster} -

{backButton}

{range}

{nextButton}

-
-

{logText}

- - +

+ {linkToMaster} +

{backButton}

{range}

{nextButton}

+
+

{logText}

UIUtils.basicSparkPage(content, logType + " log page for " + pageName) } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org For additional commands, e-mail: commits-help@spark.apache.org