From 94b38cda4f5bbf480ec0ccbceeae65d9157291d8 Mon Sep 17 00:00:00 2001 From: AhyoungRyu Date: Fri, 10 Jun 2016 16:36:49 -0700 Subject: [PATCH 1/9] Add anchor.min.js --- docs/assets/themes/zeppelin/js/anchor.min.js | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100755 docs/assets/themes/zeppelin/js/anchor.min.js diff --git a/docs/assets/themes/zeppelin/js/anchor.min.js b/docs/assets/themes/zeppelin/js/anchor.min.js new file mode 100755 index 00000000000..68c3cb7073b --- /dev/null +++ b/docs/assets/themes/zeppelin/js/anchor.min.js @@ -0,0 +1,6 @@ +/*! + * AnchorJS - v1.1.1 - 2015-05-23 + * https://github.com/bryanbraun/anchorjs + * Copyright (c) 2015 Bryan Braun; Licensed MIT + */ +function AnchorJS(A){"use strict";this.options=A||{},this._applyRemainingDefaultOptions=function(A){this.options.icon=this.options.hasOwnProperty("icon")?A.icon:"",this.options.visible=this.options.hasOwnProperty("visible")?A.visible:"hover",this.options.placement=this.options.hasOwnProperty("placement")?A.placement:"right",this.options.class=this.options.hasOwnProperty("class")?A.class:""},this._applyRemainingDefaultOptions(A),this.add=function(A){var e,t,o,n,i,s,a,l,c,r,h,g,B,Q;if(this._applyRemainingDefaultOptions(this.options),A){if("string"!=typeof A)throw new Error("The selector provided to AnchorJS was invalid.")}else A="h1, h2, h3, h4, h5, h6";if(e=document.querySelectorAll(A),0===e.length)return!1;for(this._addBaselineStyles(),t=document.querySelectorAll("[id]"),o=[].map.call(t,function(A){return A.id}),i=0;i',B=document.createElement("div"),B.innerHTML=g,Q=B.childNodes,"always"===this.options.visible&&(Q[0].style.opacity="1"),""===this.options.icon&&(Q[0].style.fontFamily="anchorjs-icons",Q[0].style.fontStyle="normal",Q[0].style.fontVariant="normal",Q[0].style.fontWeight="normal"),"left"===this.options.placement?(Q[0].style.position="absolute",Q[0].style.marginLeft="-1em",Q[0].style.paddingRight="0.5em",e[i].insertBefore(Q[0],e[i].firstChild)):(Q[0].style.paddingLeft="0.375em",e[i].appendChild(Q[0]))}return this},this.remove=function(A){for(var e,t=document.querySelectorAll(A),o=0;o Date: Fri, 10 Jun 2016 16:37:42 -0700 Subject: [PATCH 2/9] Enable anchor.min.js in Zeppelin docs site --- docs/_includes/themes/zeppelin/default.html | 1 + docs/assets/themes/zeppelin/js/docs.js | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/_includes/themes/zeppelin/default.html b/docs/_includes/themes/zeppelin/default.html index ff9c0d61542..eb99b9bd0fd 100644 --- a/docs/_includes/themes/zeppelin/default.html +++ b/docs/_includes/themes/zeppelin/default.html @@ -32,6 +32,7 @@ + diff --git a/docs/assets/themes/zeppelin/js/docs.js b/docs/assets/themes/zeppelin/js/docs.js index d687727c761..d1e1d006f55 100644 --- a/docs/assets/themes/zeppelin/js/docs.js +++ b/docs/assets/themes/zeppelin/js/docs.js @@ -107,7 +107,12 @@ function maybeScrollToHash() { $(function() { codeTabs(); - viewSolution(); + // Display anchor links when hovering over headers. For documentation of the + // configuration options, see the AnchorJS documentation. + anchors.options = { + placement: 'right' + }; + anchors.add(); $(window).bind('hashchange', function() { maybeScrollToHash(); @@ -115,5 +120,5 @@ $(function() { // Scroll now too in case we had opened the page on a hash, but wait a bit because some browsers // will try to do *their* initial scroll after running the onReady handler. - $(window).load(function() { setTimeout(function() { maybeScrollToHash(); }, 25); }); + $(window).load(function() { setTimeout(function() { maybeScrollToHash(); }, 25); }); }); From 21be556592f943b42539942472a2a1b12770f116 Mon Sep 17 00:00:00 2001 From: AhyoungRyu Date: Fri, 10 Jun 2016 16:38:24 -0700 Subject: [PATCH 3/9] Disable decoration below the anchor --- docs/assets/themes/zeppelin/css/style.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/assets/themes/zeppelin/css/style.css b/docs/assets/themes/zeppelin/css/style.css index e318805651d..9c6c64c8a08 100644 --- a/docs/assets/themes/zeppelin/css/style.css +++ b/docs/assets/themes/zeppelin/css/style.css @@ -523,6 +523,8 @@ a.anchor { background: #286090; } +a.anchorjs-link:hover { text-decoration: none; } + /* Custom, iPhone Retina */ @media only screen and (max-width: 480px) { .jumbotron h1 { From 05e0f366bf1ad015e3406859c8d41b1a585710ca Mon Sep 17 00:00:00 2001 From: AhyoungRyu Date: Sun, 12 Jun 2016 11:00:00 -0700 Subject: [PATCH 4/9] Change anchor placement right->left --- docs/assets/themes/zeppelin/js/docs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/assets/themes/zeppelin/js/docs.js b/docs/assets/themes/zeppelin/js/docs.js index d1e1d006f55..6dcf2f6797a 100644 --- a/docs/assets/themes/zeppelin/js/docs.js +++ b/docs/assets/themes/zeppelin/js/docs.js @@ -110,7 +110,7 @@ $(function() { // Display anchor links when hovering over headers. For documentation of the // configuration options, see the AnchorJS documentation. anchors.options = { - placement: 'right' + placement: 'left' }; anchors.add(); From 0d218a29c28ec54510e2f7e2395c7f05d59627b9 Mon Sep 17 00:00:00 2001 From: AhyoungRyu Date: Sun, 12 Jun 2016 12:20:37 -0700 Subject: [PATCH 5/9] Add anchor.js license --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index db076c66d99..177a1baf9e1 100644 --- a/LICENSE +++ b/LICENSE @@ -234,7 +234,7 @@ The text of each license is also included at licenses/LICENSE-[project]-[version (The MIT License) Simple line icons v1.0.0 (http://thesabbir.github.io/simple-line-icons/) - https://github.com/thesabbir/simple-line-icons/tree/1.0.0 (The MIT License) jekyll-bootstrap 0.3.0 (https://github.com/plusjade/jekyll-bootstrap) - https://github.com/plusjade/jekyll-bootstrap (The MIT License) jekyll 1.3.0 (http://jekyllrb.com/) - https://github.com/jekyll/jekyll/blob/v1.3.0/LICENSE - + (MIT License) AnchorJS (https://github.com/bryanbraun/anchorjs) ======================================================================== From ff614a25658a05c7f312b72a7d26b589037fdeef Mon Sep 17 00:00:00 2001 From: AhyoungRyu Date: Sun, 12 Jun 2016 12:57:22 -0700 Subject: [PATCH 6/9] Add anchor.min.js to rat plugin exclude list --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index ba828c69e87..d74b2500660 100755 --- a/pom.xml +++ b/pom.xml @@ -496,6 +496,9 @@ docs/sitemap.txt **/dependency-reduced-pom.xml + + docs/assets/themes/zeppelin/js/anchor.min.js + docs/assets/themes/zeppelin/css/syntax.css From 8fa7fd65b7577c553aa93603026c279200437767 Mon Sep 17 00:00:00 2001 From: AhyoungRyu Date: Mon, 13 Jun 2016 00:19:45 -0700 Subject: [PATCH 7/9] Remove useless white space in docs.js --- docs/assets/themes/zeppelin/js/docs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/assets/themes/zeppelin/js/docs.js b/docs/assets/themes/zeppelin/js/docs.js index 6dcf2f6797a..1d2d002344c 100644 --- a/docs/assets/themes/zeppelin/js/docs.js +++ b/docs/assets/themes/zeppelin/js/docs.js @@ -120,5 +120,5 @@ $(function() { // Scroll now too in case we had opened the page on a hash, but wait a bit because some browsers // will try to do *their* initial scroll after running the onReady handler. - $(window).load(function() { setTimeout(function() { maybeScrollToHash(); }, 25); }); + $(window).load(function() { setTimeout(function() { maybeScrollToHash(); }, 25); }); }); From 06a2edd4aee44fad780226c9e0ebb77678412952 Mon Sep 17 00:00:00 2001 From: AhyoungRyu Date: Mon, 13 Jun 2016 00:22:01 -0700 Subject: [PATCH 8/9] Change license location --- LICENSE | 1 - zeppelin-distribution/src/bin_license/LICENSE | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 177a1baf9e1..4df14309e01 100644 --- a/LICENSE +++ b/LICENSE @@ -234,7 +234,6 @@ The text of each license is also included at licenses/LICENSE-[project]-[version (The MIT License) Simple line icons v1.0.0 (http://thesabbir.github.io/simple-line-icons/) - https://github.com/thesabbir/simple-line-icons/tree/1.0.0 (The MIT License) jekyll-bootstrap 0.3.0 (https://github.com/plusjade/jekyll-bootstrap) - https://github.com/plusjade/jekyll-bootstrap (The MIT License) jekyll 1.3.0 (http://jekyllrb.com/) - https://github.com/jekyll/jekyll/blob/v1.3.0/LICENSE - (MIT License) AnchorJS (https://github.com/bryanbraun/anchorjs) ======================================================================== diff --git a/zeppelin-distribution/src/bin_license/LICENSE b/zeppelin-distribution/src/bin_license/LICENSE index 040b3eea609..2c6d2ad30b0 100644 --- a/zeppelin-distribution/src/bin_license/LICENSE +++ b/zeppelin-distribution/src/bin_license/LICENSE @@ -138,7 +138,8 @@ The text of each license is also included at licenses/LICENSE-[project]-[version (The MIT License) slf4j v1.7.10 (org.slf4j:slf4j-api:jar:1.7.10 - http://www.slf4j.org) - http://www.slf4j.org/license.html (The MIT License) slf4j-log4j12 v1.7.10 (org.slf4j:slf4j-log4j12:jar:1.7.10 - http://www.slf4j.org) - http://www.slf4j.org/license.html (The MIT License) bcprov-jdk15on v1.51 (org.bouncycastle:bcprov-jdk15on:jar:1.51 - http://www.bouncycastle.org/java.html) - http://www.bouncycastle.org/licence.html - + (The MIT License) AnchorJS (https://github.com/bryanbraun/anchorjs) - https://github.com/bryanbraun/anchorjs/blob/master/README.md#license + The following components are provided under the MIT License. (The MIT License) Objenesis (org.objenesis:objenesis:2.1 - https://github.com/easymock/objenesis) - Copyright (c) 2006-2015 the original author and authors From 14625c84ea90359222c4be58c364d6bfc8c0b6aa Mon Sep 17 00:00:00 2001 From: AhyoungRyu Date: Mon, 13 Jun 2016 00:24:09 -0700 Subject: [PATCH 9/9] Revert LICENSE file --- LICENSE | 1 + 1 file changed, 1 insertion(+) diff --git a/LICENSE b/LICENSE index 4df14309e01..db076c66d99 100644 --- a/LICENSE +++ b/LICENSE @@ -236,6 +236,7 @@ The text of each license is also included at licenses/LICENSE-[project]-[version (The MIT License) jekyll 1.3.0 (http://jekyllrb.com/) - https://github.com/jekyll/jekyll/blob/v1.3.0/LICENSE + ======================================================================== Apache licenses ========================================================================