GitHub user sarutak opened a pull request:

    https://github.com/apache/spark/pull/12170

    [SPARK-14397][WEBUI] <html> and <body> 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 =
          <html>
            <body>
              {linkToMaster}
              <div>
                <div style="float:left; margin-right:10px">{backButton}</div>
                <div style="float:left;">{range}</div>
                <div style="float:right; margin-left:10px">{nextButton}</div>
              </div>
              <br />
              <div style="height:500px; overflow:auto; padding:5px;">
                <pre>{logText}</pre>
              </div>
            </body>
          </html>
        UIUtils.basicSparkPage(content, logType + " log page for " + pageName)
    ```
    
    As you can see, <html> and <body> 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] = {
        <html>
          <head>
            {commonHeaderNodes}
            {if (useDataTables) dataTablesHeaderNodes else Seq.empty}
            <title>{title}</title>
          </head>
          <body>
            <div class="container-fluid">
              <div class="row-fluid">
                <div class="span12">
                  <h3 style="vertical-align: middle; display: inline-block;">
                    <a style="text-decoration: none" href={prependBaseUri("/")}>
                      <img 
src={prependBaseUri("/static/spark-logo-77x50px-hd.png")} />
                      <span class="version"
                            style="margin-right: 
15px;">{org.apache.spark.SPARK_VERSION}</span>
                    </a>
                    {title}
                  </h3>
                </div>
              </div>
              {content}
            </div>
          </body>
        </html>
      }
    ```
    
    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.

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/sarutak/spark SPARK-14397

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/spark/pull/12170.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #12170
    
----
commit 6afb3fb2fc282aed3a52f3b9a0978c8a155e1925
Author: Kousuke Saruta <saru...@oss.nttdata.co.jp>
Date:   2016-04-05T05:47:08Z

    Removed nested <html> tags

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org

Reply via email to