From a8e7b90a4bf50f75ffedeaa4dad529a4a48185bd Mon Sep 17 00:00:00 2001
From: noelsmith <mail@noelsmith.com>
Date: Mon, 31 Aug 2015 22:44:34 +0100
Subject: [PATCH 1/8] Added class + function list to TOC

---
 python/docs/_static/pyspark.css    | 11 +++++++++
 python/docs/_static/pyspark.js     | 38 ++++++++++++++++++++++++++++++
 python/docs/_templates/layout.html |  6 +++++
 python/docs/conf.py                |  2 +-
 4 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 python/docs/_static/pyspark.css
 create mode 100644 python/docs/_static/pyspark.js
 create mode 100644 python/docs/_templates/layout.html

diff --git a/python/docs/_static/pyspark.css b/python/docs/_static/pyspark.css
new file mode 100644
index 0000000000000..09f1d3efcbdc0
--- /dev/null
+++ b/python/docs/_static/pyspark.css
@@ -0,0 +1,11 @@
+body {
+    background-color: #ffffff;
+}
+
+div.sphinxsidebar {
+    width: 260px;
+}
+
+div.bodywrapper {
+    margin: 0 0 0 260px;
+}
\ No newline at end of file
diff --git a/python/docs/_static/pyspark.js b/python/docs/_static/pyspark.js
new file mode 100644
index 0000000000000..3e386259ac489
--- /dev/null
+++ b/python/docs/_static/pyspark.js
@@ -0,0 +1,38 @@
+$(function (){
+
+    var sidebarLinkMap = function() {
+
+        var linkMap = {};
+        $('div.sphinxsidebar a.reference.internal').each(function (i,a)  {
+
+            var href = $(a).attr('href');
+            if (href && href.indexOf('#module-') == 0) {
+                var id = href.substr(8);
+                linkMap[id] = [$(a), null];
+            }
+        })
+
+        return linkMap;
+    }();
+
+
+    $('dl.class > dt, dl.function > dt').each(function (i,dt)  {
+        var id = dt.id;
+        var desc = $(dt).find('> code.descname').text();
+
+        if (id) {
+
+            var last_idx = id.lastIndexOf('.');
+            var mod_id = last_idx == -1? '': id.substr(0, last_idx);
+
+            var r = sidebarLinkMap[mod_id];
+            if (r) {
+                if (r[1] === null) {
+                    r[1] = $('<ul/>');
+                    r[0].after(r[1]);
+                }
+                r[1].append('<li><a href="#' + id + '">' + desc + '</a></li>');
+            }
+        }
+    });
+});
\ No newline at end of file
diff --git a/python/docs/_templates/layout.html b/python/docs/_templates/layout.html
new file mode 100644
index 0000000000000..2a568932a1e28
--- /dev/null
+++ b/python/docs/_templates/layout.html
@@ -0,0 +1,6 @@
+{% extends "!layout.html" %}
+{% set script_files = script_files + ["_static/pyspark.js"] %}
+{% set css_files = css_files + ['_static/pyspark.css'] %}
+{% block rootrellink %}
+    {{ super() }}
+{% endblock %}
\ No newline at end of file
diff --git a/python/docs/conf.py b/python/docs/conf.py
index 163987dd8e5fa..bda693ee480ae 100644
--- a/python/docs/conf.py
+++ b/python/docs/conf.py
@@ -135,7 +135,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['_static']
+html_static_path = ['_static']
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied

From f166d20b47bdb9df630239b748851b2f79c27ec2 Mon Sep 17 00:00:00 2001
From: noelsmith <mail@noelsmith.com>
Date: Wed, 2 Sep 2015 08:34:05 +0100
Subject: [PATCH 2/8] Simplified JavaScript + CSS tweaks

---
 python/docs/_static/pyspark.css | 46 ++++++++++++++++++--
 python/docs/_static/pyspark.js  | 76 ++++++++++++++++++++++++++-------
 2 files changed, 104 insertions(+), 18 deletions(-)

diff --git a/python/docs/_static/pyspark.css b/python/docs/_static/pyspark.css
index 09f1d3efcbdc0..82156d4632ff7 100644
--- a/python/docs/_static/pyspark.css
+++ b/python/docs/_static/pyspark.css
@@ -3,9 +3,49 @@ body {
 }
 
 div.sphinxsidebar {
-    width: 260px;
+    width: 270px;
 }
 
 div.bodywrapper {
-    margin: 0 0 0 260px;
-}
\ No newline at end of file
+    margin: 0 0 0 270px;
+}
+
+div.sphinxsidebar ul {
+    margin-right: 10px;
+}
+
+div.sphinxsidebar li a {
+    word-break: break-all;
+}
+
+span.pys-tag {
+    font-size: 11px;
+    font-weight: bold;
+    margin: 0 0 0 2px;
+    padding: 1px 3px 1px 3px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+    text-align: center;
+    text-decoration: none;
+}
+
+span.pys-tag-experimental {
+    background-color: rgb(37, 112, 128);
+    color: rgb(255, 255, 255);
+}
+
+span.pys-tag-deprecated {
+    background-color: rgb(238, 238, 238);
+    color: rgb(62, 67, 73);
+}
+
+div.pys-note-experimental {
+    background-color: rgb(88, 151, 165);
+    border-color: rgb(59, 115, 127);
+    color: rgb(255, 255, 255);
+}
+
+div.pys-note-deprecated {
+}
+
diff --git a/python/docs/_static/pyspark.js b/python/docs/_static/pyspark.js
index 3e386259ac489..f2115c5c0c210 100644
--- a/python/docs/_static/pyspark.js
+++ b/python/docs/_static/pyspark.js
@@ -1,37 +1,83 @@
-$(function (){
-
-    var sidebarLinkMap = function() {
+    function startsWith(s, prefix) {
+        return s && s.indexOf(prefix) === 0;
+    }
 
+    function buildSidebarLinkMap() {
         var linkMap = {};
         $('div.sphinxsidebar a.reference.internal').each(function (i,a)  {
-
             var href = $(a).attr('href');
-            if (href && href.indexOf('#module-') == 0) {
+            if (startsWith(href, '#module-')) {
                 var id = href.substr(8);
                 linkMap[id] = [$(a), null];
             }
         })
-
         return linkMap;
-    }();
+    };
+
+
+    function getAdNoteDivs(dd) {
+        var noteDivs = {};
+        dd.find('> div.admonition.note > p.last').each(function (i, p) {
+            var text = $(p).text();
+            if (!noteDivs.experimental && startsWith(text, 'Experimental')) {
+                noteDivs.experimental = $(p).parent();
+            }
+            if (!noteDivs.deprecated && startsWith(text, 'Deprecated')) {
+                noteDivs.deprecated = $(p).parent();
+            }
+        });
+        return noteDivs;
+    }
+
 
+    function getParentId(name) {
+        var last_idx = name.lastIndexOf('.');
+        return last_idx == -1? '': name.substr(0, last_idx);
+    }
 
-    $('dl.class > dt, dl.function > dt').each(function (i,dt)  {
-        var id = dt.id;
-        var desc = $(dt).find('> code.descname').text();
+
+
+$(function (){
+
+    var sidebarLinkMap = buildSidebarLinkMap();
+
+    $('dl.class, dl.function').each(function (i,dl)  {
+
+        dl = $(dl);
+        dt = dl.children('dt').eq(0);
+        dd = dl.children('dd').eq(0);
+        var id = dt.attr('id');
+        var desc = dt.find('> code.descname').text();
+        var adNoteDivs = getAdNoteDivs(dd);
+
+        //console.log("Match", dt, id);
 
         if (id) {
+            var parent_id = getParentId(id);
 
-            var last_idx = id.lastIndexOf('.');
-            var mod_id = last_idx == -1? '': id.substr(0, last_idx);
+            //console.log("Id -> Parent", id, parent_id);
 
-            var r = sidebarLinkMap[mod_id];
+            var r = sidebarLinkMap[parent_id];
             if (r) {
                 if (r[1] === null) {
                     r[1] = $('<ul/>');
-                    r[0].after(r[1]);
+                    r[0].parent().append(r[1]);
+                }
+                var tags = '';
+                if (adNoteDivs.experimental) {
+                    tags += ' <span class="pys-tag pys-tag-experimental">E</span>';
+                    adNoteDivs.experimental.addClass('pys-note pys-note-experimental');
+                }
+                if (adNoteDivs.deprecated) {
+                    tags += ' <span class="pys-tag pys-tag-deprecated">D</span>';
+                    adNoteDivs.deprecated.addClass('pys-note pys-note-deprecated');
                 }
-                r[1].append('<li><a href="#' + id + '">' + desc + '</a></li>');
+                var li = $('<li/>');
+                var a = $('<a href="#' + id + '">' + desc + '</a>');
+                li.append(a);
+                li.append(tags);
+                r[1].append(li);
+                sidebarLinkMap[id] = [a, null];
             }
         }
     });

From ad7b3f541213bf5a39ec259a5c62caac2a9dfee4 Mon Sep 17 00:00:00 2001
From: noelsmith <mail@noelsmith.com>
Date: Wed, 2 Sep 2015 10:46:55 +0100
Subject: [PATCH 3/8] Removed commented out code. Functions now hidden in
 closure.

---
 python/docs/_static/pyspark.js | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/python/docs/_static/pyspark.js b/python/docs/_static/pyspark.js
index f2115c5c0c210..537023def2c47 100644
--- a/python/docs/_static/pyspark.js
+++ b/python/docs/_static/pyspark.js
@@ -1,3 +1,5 @@
+$(function (){
+
     function startsWith(s, prefix) {
         return s && s.indexOf(prefix) === 0;
     }
@@ -14,7 +16,6 @@
         return linkMap;
     };
 
-
     function getAdNoteDivs(dd) {
         var noteDivs = {};
         dd.find('> div.admonition.note > p.last').each(function (i, p) {
@@ -29,16 +30,11 @@
         return noteDivs;
     }
 
-
     function getParentId(name) {
         var last_idx = name.lastIndexOf('.');
         return last_idx == -1? '': name.substr(0, last_idx);
     }
 
-
-
-$(function (){
-
     var sidebarLinkMap = buildSidebarLinkMap();
 
     $('dl.class, dl.function').each(function (i,dl)  {
@@ -50,13 +46,9 @@ $(function (){
         var desc = dt.find('> code.descname').text();
         var adNoteDivs = getAdNoteDivs(dd);
 
-        //console.log("Match", dt, id);
-
         if (id) {
             var parent_id = getParentId(id);
 
-            //console.log("Id -> Parent", id, parent_id);
-
             var r = sidebarLinkMap[parent_id];
             if (r) {
                 if (r[1] === null) {

From b8c28961b4070aac57b328112ac621d19eec46c1 Mon Sep 17 00:00:00 2001
From: noelsmith <mail@noelsmith.com>
Date: Thu, 3 Sep 2015 22:51:33 +0100
Subject: [PATCH 4/8] Added tooltips

---
 python/docs/_static/pyspark.css | 24 +++++++++++++++++++++++-
 python/docs/_static/pyspark.js  |  9 +++++++--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/python/docs/_static/pyspark.css b/python/docs/_static/pyspark.css
index 82156d4632ff7..89a3ca043649e 100644
--- a/python/docs/_static/pyspark.css
+++ b/python/docs/_static/pyspark.css
@@ -21,7 +21,7 @@ div.sphinxsidebar li a {
 span.pys-tag {
     font-size: 11px;
     font-weight: bold;
-    margin: 0 0 0 2px;
+    margin: 0 0 0 4px;
     padding: 1px 3px 1px 3px;
     -moz-border-radius: 3px;
     -webkit-border-radius: 3px;
@@ -49,3 +49,25 @@ div.pys-note-experimental {
 div.pys-note-deprecated {
 }
 
+.hasTooltip {
+    position:relative;
+}
+.hasTooltip span {
+    display:none;
+}
+
+.hasTooltip:hover span.tooltip {
+    display: inline-block;
+    -moz-border-radius: 2px;
+    -webkit-border-radius: 2px;
+    border-radius: 2px;
+    background-color: rgb(250, 250, 250);
+    color: rgb(68, 68, 68);
+    font-weight: normal;
+    box-shadow: 1px 1px 3px rgb(127, 127, 127);
+    position: absolute;
+    padding: 0 3px 0 3px;
+    top: 1.3em;
+    left: 10px;
+    z-index: 9999
+}
diff --git a/python/docs/_static/pyspark.js b/python/docs/_static/pyspark.js
index 537023def2c47..09e42efc52343 100644
--- a/python/docs/_static/pyspark.js
+++ b/python/docs/_static/pyspark.js
@@ -35,6 +35,11 @@ $(function (){
         return last_idx == -1? '': name.substr(0, last_idx);
     }
 
+    function buildTag(text, cls, tooltip) {
+        return '<span class="pys-tag ' + cls + ' hasTooltip">' + text + '<span class="tooltip">'
+            + tooltip + '</span></span>'
+    }
+
     var sidebarLinkMap = buildSidebarLinkMap();
 
     $('dl.class, dl.function').each(function (i,dl)  {
@@ -57,11 +62,11 @@ $(function (){
                 }
                 var tags = '';
                 if (adNoteDivs.experimental) {
-                    tags += ' <span class="pys-tag pys-tag-experimental">E</span>';
+                    tags += buildTag('E', 'pys-tag-experimental', 'Experimental');
                     adNoteDivs.experimental.addClass('pys-note pys-note-experimental');
                 }
                 if (adNoteDivs.deprecated) {
-                    tags += ' <span class="pys-tag pys-tag-deprecated">D</span>';
+                    tags += buildTag('D', 'pys-tag-deprecated', 'Deprecated');
                     adNoteDivs.deprecated.addClass('pys-note pys-note-deprecated');
                 }
                 var li = $('<li/>');

From 5982a0d575341b921f991424e5cfe3ad7dbd1cfd Mon Sep 17 00:00:00 2001
From: noelsmith <mail@noelsmith.com>
Date: Sat, 5 Sep 2015 20:09:05 +0100
Subject: [PATCH 5/8] Minor tweaks to CSS

---
 python/docs/_static/pyspark.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/python/docs/_static/pyspark.css b/python/docs/_static/pyspark.css
index 89a3ca043649e..3b759b7746e58 100644
--- a/python/docs/_static/pyspark.css
+++ b/python/docs/_static/pyspark.css
@@ -3,11 +3,11 @@ body {
 }
 
 div.sphinxsidebar {
-    width: 270px;
+    width: 274px;
 }
 
 div.bodywrapper {
-    margin: 0 0 0 270px;
+    margin: 0 0 0 274px;
 }
 
 div.sphinxsidebar ul {
@@ -21,7 +21,7 @@ div.sphinxsidebar li a {
 span.pys-tag {
     font-size: 11px;
     font-weight: bold;
-    margin: 0 0 0 4px;
+    margin: 0 0 0 2px;
     padding: 1px 3px 1px 3px;
     -moz-border-radius: 3px;
     -webkit-border-radius: 3px;
@@ -68,6 +68,6 @@ div.pys-note-deprecated {
     position: absolute;
     padding: 0 3px 0 3px;
     top: 1.3em;
-    left: 10px;
+    left: 14px;
     z-index: 9999
 }

From 98465ca59930c4dfd336cc1bdd0883319671356b Mon Sep 17 00:00:00 2001
From: noelsmith <mail@noelsmith.com>
Date: Wed, 9 Sep 2015 08:18:12 +0100
Subject: [PATCH 6/8] Minor formatting change

---
 python/docs/_static/pyspark.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/python/docs/_static/pyspark.js b/python/docs/_static/pyspark.js
index 09e42efc52343..cb5da994ed46f 100644
--- a/python/docs/_static/pyspark.js
+++ b/python/docs/_static/pyspark.js
@@ -40,6 +40,7 @@ $(function (){
             + tooltip + '</span></span>'
     }
 
+
     var sidebarLinkMap = buildSidebarLinkMap();
 
     $('dl.class, dl.function').each(function (i,dl)  {
@@ -78,4 +79,4 @@ $(function (){
             }
         }
     });
-});
\ No newline at end of file
+});

From 8162bb13860d13af2d11f59e4c8a0935c97c55e0 Mon Sep 17 00:00:00 2001
From: noelsmith <mail@noelsmith.com>
Date: Thu, 10 Sep 2015 22:55:39 +0100
Subject: [PATCH 7/8] Added license to css. Added newline

---
 python/docs/_static/pyspark.css    | 17 +++++++++++++++++
 python/docs/_templates/layout.html |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/python/docs/_static/pyspark.css b/python/docs/_static/pyspark.css
index 3b759b7746e58..41106f2f6e26d 100644
--- a/python/docs/_static/pyspark.css
+++ b/python/docs/_static/pyspark.css
@@ -1,3 +1,20 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
 body {
     background-color: #ffffff;
 }
diff --git a/python/docs/_templates/layout.html b/python/docs/_templates/layout.html
index 2a568932a1e28..ab36ebababf88 100644
--- a/python/docs/_templates/layout.html
+++ b/python/docs/_templates/layout.html
@@ -3,4 +3,4 @@
 {% set css_files = css_files + ['_static/pyspark.css'] %}
 {% block rootrellink %}
     {{ super() }}
-{% endblock %}
\ No newline at end of file
+{% endblock %}

From f0ae4fdc9802d71d0f6f8614ef524e8c80badd9d Mon Sep 17 00:00:00 2001
From: noelsmith <mail@noelsmith.com>
Date: Sat, 19 Sep 2015 22:20:06 +0100
Subject: [PATCH 8/8] Fixed Javascript to work with Sphinx 1.2+. Added minimal
 Sphinx version

---
 python/docs/_static/pyspark.js | 2 +-
 python/docs/conf.py            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/python/docs/_static/pyspark.js b/python/docs/_static/pyspark.js
index cb5da994ed46f..f35978036bfde 100644
--- a/python/docs/_static/pyspark.js
+++ b/python/docs/_static/pyspark.js
@@ -49,7 +49,7 @@ $(function (){
         dt = dl.children('dt').eq(0);
         dd = dl.children('dd').eq(0);
         var id = dt.attr('id');
-        var desc = dt.find('> code.descname').text();
+        var desc = dt.find('> .descname').text();
         var adNoteDivs = getAdNoteDivs(dd);
 
         if (id) {
diff --git a/python/docs/conf.py b/python/docs/conf.py
index bda693ee480ae..365d6af514177 100644
--- a/python/docs/conf.py
+++ b/python/docs/conf.py
@@ -23,7 +23,7 @@
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
+needs_sphinx = '1.2'
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom