From 0208063a89b8523c71390ef93773c6f093f74826 Mon Sep 17 00:00:00 2001
From: Joe Evans <joseph.evans@gmail.com>
Date: Mon, 16 May 2022 19:00:16 -0700
Subject: [PATCH] Port website fixes (#20993, #20995, #21009) from v1.9.x
 branch (#21015)

* [v1.9.x] Update website footer to include required Apache links (#20993)

* Update footer to include required Apache links, according to https://www.apache.org/foundation/marks/pmcs#navigation

* Better layout with col-3 class.

* Fix 'module 'jinja2' has no attribute 'contextfilter''

* Update Makefile

* Update Makefile

Co-authored-by: Bartosz Kuncer <bartosz.kuncer@intel.com>

* [v1.9.x] Fix css for Apache links, add to Python docs. (#20995)

* Add Apache links to python docs footer, update hostname in CI script.

* Don't use relative_url function.

* Add link to ASF.

* Fix medium blog integration. (#21009)

* Update broken links to fix linkcheck.

Co-authored-by: Bartosz Kuncer <bartosz.kuncer@intel.com>
Co-authored-by: matherit <97054789+matherit@users.noreply.github.com>
---
 .../themes/mx-theme/mxtheme/footer.html       | 19 ++++++++---
 .../mx-theme/src/scss/footer/_footer.scss     |  1 +
 docs/static_site/Makefile                     |  5 +++
 docs/static_site/src/_includes/footer.html    | 22 ++++++++----
 docs/static_site/src/_includes/head.html      | 16 ++++++---
 docs/static_site/src/_layouts/home.html       | 24 ++++++-------
 docs/static_site/src/_sass/minima/_blog.scss  | 34 +++----------------
 .../static_site/src/_sass/minima/_layout.scss |  1 +
 docs/static_site/src/pages/blog.html          | 28 ++++++---------
 python/mxnet/ndarray/numpy_extension/_op.py   |  2 +-
 python/mxnet/numpy_extension/_op.py           |  2 +-
 src/operator/rnn.cc                           |  2 +-
 12 files changed, 79 insertions(+), 77 deletions(-)

diff --git a/docs/python_docs/themes/mx-theme/mxtheme/footer.html b/docs/python_docs/themes/mx-theme/mxtheme/footer.html
index fcb2ea97414b..4d136dfb939b 100644
--- a/docs/python_docs/themes/mx-theme/mxtheme/footer.html
+++ b/docs/python_docs/themes/mx-theme/mxtheme/footer.html
@@ -1,7 +1,7 @@
 <footer class="site-footer h-card">
     <div class="wrapper">
         <div class="row">
-            <div class="col-4">
+            <div class="col-3">
                 <h4 class="footer-category-title">Resources</h4>
                 <ul class="contact-list">
                     <li><a
@@ -14,11 +14,22 @@ <h4 class="footer-category-title">Resources</h4>
 
                 </ul>
             </div>
+            <div class="col-3">
+                <h4 class="footer-category-title">Apache</h4>
+                <ul class="apache-list">
+                    <li><a href="https://www.apache.org/foundation/">Foundation</a></li>
+                    <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                    <li><a href="/api/faq/security.html">Security</a></li>
+                    <li><a href="https://www.apache.org/licenses/">License</a></li>
+                    <li><a href="https://www.apache.org/events/current-event">Events</a></li>
+                    <li><a href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
+                </ul>
+            </div>
 
-            <div class="col-4"><ul class="social-media-list"><li><a href="https://github.com/apache/incubator-mxnet"><svg class="svg-icon"><use xlink:href="{{pathto('_static/minima-social-icons.svg#github', 1)}}"></use></svg> <span class="username">apache/incubator-mxnet</span></a></li><li><a href="https://www.twitter.com/apachemxnet"><svg class="svg-icon"><use xlink:href="{{pathto('_static/minima-social-icons.svg#twitter', 1)}}"></use></svg> <span class="username">apachemxnet</span></a></li><li><a href="https://youtube.com/apachemxnet"><svg class="svg-icon"><use xlink:href="{{pathto('_static/minima-social-icons.svg#youtube', 1)}}"></use></svg> <span class="username">apachemxnet</span></a></li></ul>
+            <div class="col-3"><ul class="social-media-list"><li><a href="https://github.com/apache/incubator-mxnet"><svg class="svg-icon"><use xlink:href="{{pathto('_static/minima-social-icons.svg#github', 1)}}"></use></svg> <span class="username">apache/incubator-mxnet</span></a></li><li><a href="https://www.twitter.com/apachemxnet"><svg class="svg-icon"><use xlink:href="{{pathto('_static/minima-social-icons.svg#twitter', 1)}}"></use></svg> <span class="username">apachemxnet</span></a></li><li><a href="https://youtube.com/apachemxnet"><svg class="svg-icon"><use xlink:href="{{pathto('_static/minima-social-icons.svg#youtube', 1)}}"></use></svg> <span class="username">apachemxnet</span></a></li></ul>
 </div>
 
-            <div class="col-4 footer-text">
+            <div class="col-3 footer-text">
                 <p>A flexible and efficient library for deep learning.</p>
             </div>
         </div>
@@ -32,7 +43,7 @@ <h4 class="footer-category-title">Resources</h4>
                 <img src="{{pathto('_static/apache_incubator_logo.png', 1)}}" class="footer-logo col-2">
             </div>
             <div class="footer-bottom-warning col-9">
-                <p>Apache MXNet is an effort undergoing incubation at The Apache Software Foundation (ASF), <span style="font-weight:bold">sponsored by the <i>Apache Incubator</i></span>. Incubation is required
+                <p>Apache MXNet is an effort undergoing incubation at <a href="http://www.apache.org/">The Apache Software Foundation</a> (ASF), <span style="font-weight:bold">sponsored by the <i>Apache Incubator</i></span>. Incubation is required
                     of all newly accepted projects until a further review indicates that the infrastructure,
                     communications, and decision making process have stabilized in a manner consistent with other
                     successful ASF projects. While incubation status is not necessarily a reflection of the completeness
diff --git a/docs/python_docs/themes/mx-theme/src/scss/footer/_footer.scss b/docs/python_docs/themes/mx-theme/src/scss/footer/_footer.scss
index 5ce4768e22dd..b1bf7e9c0714 100644
--- a/docs/python_docs/themes/mx-theme/src/scss/footer/_footer.scss
+++ b/docs/python_docs/themes/mx-theme/src/scss/footer/_footer.scss
@@ -147,6 +147,7 @@ footer.mdl-mini-footer {
 }
 
 .contact-list,
+.apache-list,
 .social-media-list {
   list-style: none;
   margin-left: 0;
diff --git a/docs/static_site/Makefile b/docs/static_site/Makefile
index 98889c2ceaf1..e69fc84667d4 100644
--- a/docs/static_site/Makefile
+++ b/docs/static_site/Makefile
@@ -20,6 +20,11 @@ all: html
 html:
 	mkdir -p build
 	wget -O src/assets/js/jquery-3.3.1.min.js https://code.jquery.com/jquery-3.3.1.min.js
+	wget -O src/assets/img/mxnet-icon.png https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/image/mxnet-icon.png
+	wget -O src/assets/docsearch.min.css 'https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css'
+	wget -O src/assets/js/docsearch.min.js 'https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js'
+	wget -O src/assets/retainable.css https://www.twilik.com/assets/retainable/rss-embed/retainable.css
+	wget -O src/assets/js/retainable.js https://www.twilik.com/assets/retainable/rss-embed/retainable.js
 	cd src && bundle install && JEKYLL_ENV=production bundle exec jekyll build --config _config_prod.yml -d ../build/html && cd ..
 	wget https://mxnet-website-static-artifacts.s3.us-east-2.amazonaws.com/versions.zip && unzip versions.zip -d build/html
 	find build/html/ -type d -name '__MACOSX' -exec rm -rf {} +
diff --git a/docs/static_site/src/_includes/footer.html b/docs/static_site/src/_includes/footer.html
index a2748ca6c416..b8f909ccdcbd 100644
--- a/docs/static_site/src/_includes/footer.html
+++ b/docs/static_site/src/_includes/footer.html
@@ -1,7 +1,7 @@
 <footer class="site-footer h-card">
     <div class="wrapper">
         <div class="row">
-            <div class="col-4">
+            <div class="col-3">
                 <h4 class="footer-category-title">Resources</h4>
                 <ul class="contact-list">
                     <li><a href="{{'community#stay-connected'|relative_url}}">Mailing lists</a></li>
@@ -10,15 +10,25 @@ <h4 class="footer-category-title">Resources</h4>
                     <li><a href="https://github.com/apache/incubator-mxnet/projects">Projects</a></li>
                     <li><a href="https://cwiki.apache.org/confluence/display/MXNET/Apache+MXNet+Home">Developer Wiki</a></li>
                     <li><a href="{{'community'|relative_url}}">Contribute To MXNet</a></li>
-
+                </ul>
+            </div>
+            <div class="col-3">
+                <h4 class="footer-category-title">Apache</h4>
+                <ul class="apache-list">
+                    <li><a href="https://www.apache.org/foundation/">Foundation</a></li>
+                    <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                    <li><a href="{{'/api/faq/security.html' | relative_url }}">Security</a></li>
+                    <li><a href="https://www.apache.org/licenses/">License</a></li>
+                    <li><a href="https://www.apache.org/events/current-event">Events</a></li>
+                    <li><a href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
                 </ul>
             </div>
 
-            <div class="col-4">
+            <div class="col-3">
                 {%- include social.html -%}
             </div>
 
-            <div class="col-4 footer-text">
+            <div class="col-3 footer-text">
                 <p>{{- site.description | escape -}}</p>
             </div>
         </div>
@@ -31,13 +41,13 @@ <h4 class="footer-category-title">Resources</h4>
                 <img src="{{'/assets/img/apache_incubator_logo.png' | relative_url}}" class="footer-logo col-2">
             </div>
             <div class="footer-bottom-warning col-9">
-                <p>Apache MXNet is an effort undergoing incubation at The Apache Software Foundation (ASF), <span
+                <p>Apache MXNet is an effort undergoing incubation at <a href="http://www.apache.org/">The Apache Software Foundation</a> (ASF), <span
                         style="font-weight:bold">sponsored by the <i>Apache Incubator</i></span>. Incubation is required
                     of all newly accepted projects until a further review indicates that the infrastructure,
                     communications, and decision making process have stabilized in a manner consistent with other
                     successful ASF projects. While incubation status is not necessarily a reflection of the completeness
                     or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
-                </p><p>"Copyright © 2017-2018, The Apache Software Foundation Apache MXNet, MXNet, Apache, the Apache
+                </p><p>"Copyright © 2017-2022, The Apache Software Foundation Apache MXNet, MXNet, Apache, the Apache
                     feather, and the Apache MXNet project logo are either registered trademarks or trademarks of the
                     Apache Software Foundation."</p>
             </div>
diff --git a/docs/static_site/src/_includes/head.html b/docs/static_site/src/_includes/head.html
index 5ec779c01f0b..11264726e700 100644
--- a/docs/static_site/src/_includes/head.html
+++ b/docs/static_site/src/_includes/head.html
@@ -2,21 +2,27 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link href="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/image/mxnet-icon.png" rel="icon" type="image/png">
+  <link href="{{ "/assets/img/mxnet-icon.png" | relative_url }}" rel="icon" type="image/png">
   {%- seo -%}
-  <script src="https://medium-widget.pixelpoint.io/widget.js"></script>
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css" />
-  <link rel="stylesheet" href="{{ '/assets/main.css' | relative_url }}">
+  {%- if jekyll.environment == 'production' -%}
+    <link rel="stylesheet" href="{{ "/assets/docsearch.min.css" | relative_url }}" />
+    <link rel="stylesheet" href="{{ "/assets/retainable.css" | relative_url }}" />
+  {%- else -%}
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css" />
+    <link rel="stylesheet" href="https://www.twilik.com/assets/retainable/rss-embed/retainable.css" />
+  {%- endif -%}
+  <link rel="stylesheet" href="{{ "/assets/main.css" | relative_url }}">
   {%- feed_meta -%}
   {%- if jekyll.environment == 'production' and site.google_analytics -%}
     {%- include google-analytics.html -%}
   {%- endif -%}
   {%- if jekyll.environment == 'production' -%}
     <script src="{{'/assets/js/jquery-3.3.1.min.js'|relative_url}}"></script>
+    <script src="{{ "/assets/js/docsearch.min.js" | relative_url }}"></script>
   {%- else -%}
     <script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js" defer></script>
   {%- endif -%}
-  <script src="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js" defer></script>
   <script src="{{'/assets/js/globalSearch.js'|relative_url}}" defer></script>
   <script src="{{'/assets/js/clipboard.js'|relative_url}}" defer></script>
   <script src="{{'/assets/js/copycode.js'|relative_url}}" defer></script>
diff --git a/docs/static_site/src/_layouts/home.html b/docs/static_site/src/_layouts/home.html
index 430c03f96aa2..00286e65fa90 100644
--- a/docs/static_site/src/_layouts/home.html
+++ b/docs/static_site/src/_layouts/home.html
@@ -131,19 +131,11 @@ <h2>Latest News</h2>
                 </div>
             </div>
 
-            <div id="medium-widget"></div>
-            <script>
-                MediumWidget.Init({renderTo: '#medium-widget',
-                    params: {
-                        "resource": "https://medium.com/apache-mxnet",
-                        "postsPerLine": 3,
-                        "limit": 3,
-                        "picture": "big",
-                        "fields": ["description", "claps", "publishAt"],
-                        "ratio": "landscape"
-                    }
-                })
-            </script>
+            <div class="row" id="retainable-rss-embed" data-rss="https://medium.com/feed/apache-mxnet"
+                data-maxcols="3" data-layout="slider" data-poststyle="external"
+                data-readmore="Read more.." data-buttonclass="btn btn-primary">
+            </div>
+
         </div>
     </div>
 
@@ -182,6 +174,12 @@ <h3>{{feature.title}}</h3>
 
 {%- include footer.html -%}
 
+{%- if jekyll.environment == 'production' -%}
+  <script src="{{ "/assets/js/retainable.js" | relative_url }}"></script>
+{%- else -%}
+  <script src="https://www.twilik.com/assets/retainable/rss-embed/retainable.js"></script>
+{%- endif -%}
+
 </body>
 
 </html>
diff --git a/docs/static_site/src/_sass/minima/_blog.scss b/docs/static_site/src/_sass/minima/_blog.scss
index 9f14e316f445..2a38ca7222ad 100644
--- a/docs/static_site/src/_sass/minima/_blog.scss
+++ b/docs/static_site/src/_sass/minima/_blog.scss
@@ -15,37 +15,13 @@
  * specific language governing permissions and limitations
  * under the License. */
 
-.medium-widget-article__item {
-  transition: box-shadow 0.3s linear;
-
-  &:hover {
-    box-shadow: inset 0 -2px 0 0 $color-mxnet;
-    filter: none;
-    border-bottom: 1px white solid;
-
-    a.medium-widget-article__title {
-      color: orangered;
-    }
-  }
-
-  margin: 20px;
-  background-color: $grey-color-light;
-  padding: 0px;
-  border: 1px solid $grey-color-light
+.page-content-home div#rtb h2 {
+  font-size: 0.6em;
 }
 
-.medium-widget-article__title {
-  font-weight: 300;
-}
-
-.medium-widget-article__content {
-  padding: 15px;
-}
-
-@include media-query($on-palm) {
-  .medium-widget-article__row {
-    flex-direction: column;
-  }
+#rtb div.col-sm-4.rtb-col {
+	border: 1px solid $grey-color-light;
+	margin: 20px;
 }
 
 .blog-more {
diff --git a/docs/static_site/src/_sass/minima/_layout.scss b/docs/static_site/src/_sass/minima/_layout.scss
index 5dd4a968a354..8ed010aebf32 100644
--- a/docs/static_site/src/_sass/minima/_layout.scss
+++ b/docs/static_site/src/_sass/minima/_layout.scss
@@ -184,6 +184,7 @@
 }
 
 .contact-list,
+.apache-list,
 .social-media-list {
   list-style: none;
   margin-left: 0;
diff --git a/docs/static_site/src/pages/blog.html b/docs/static_site/src/pages/blog.html
index 37e43a3fbf69..407cb09c7e3d 100644
--- a/docs/static_site/src/pages/blog.html
+++ b/docs/static_site/src/pages/blog.html
@@ -34,24 +34,18 @@
     </div>
 </div>
 
-<div id="medium-widget"></div>
-<script>
-
-    MediumWidget.Init({renderTo: '#medium-widget',
-        params: {
-            "resource": "https://medium.com/apache-mxnet",
-            "postsPerLine": 3,
-            "limit": 9,
-            "picture": "big",
-            "fields": ["description", "claps", "publishAt"],
-            "ratio": "landscape"
-        }
-    })
-
-
-</script>
-
+<div class="row">
+        <div class="col-12" id="retainable-rss-embed" data-rss="https://medium.com/feed/apache-mxnet"
+            data-maxcols="3" data-layout="grid" data-poststyle="external" data-readmore="Read more..">
+	</div>
+</div>
 <div class="blog-more">
 <a style="margin-top:20px" href="https://medium.com/apache-mxnet" class="btn btn-action">See All Blog Posts<span class="span-accented">›</span></a>
 
 </div>
+{%- if jekyll.environment == 'production' -%}
+  <script src="{{ "/assets/js/retainable.js" | relative_url }}"></script>
+{%- else -%}
+  <script src="https://www.twilik.com/assets/retainable/rss-embed/retainable.js"></script>
+{%- endif -%}
+
diff --git a/python/mxnet/ndarray/numpy_extension/_op.py b/python/mxnet/ndarray/numpy_extension/_op.py
index bce895aa6759..0529f40a5c81 100644
--- a/python/mxnet/ndarray/numpy_extension/_op.py
+++ b/python/mxnet/ndarray/numpy_extension/_op.py
@@ -918,7 +918,7 @@ def rnn(data=None, parameters=None, state=None, state_cell=None, sequence_length
         h_t = \tanh(W_{ih} * x_t + b_{ih}  +  W_{hh} * h_{(t-1)} + b_{hh})
 
     Reference paper: Finding structure in time - Elman, 1988.
-    https://crl.ucsd.edu/~elman/Papers/fsit.pdf
+    https://axon.cs.byu.edu/~martinez/classes/678/Papers/Elman_time.pdf
 
     **LSTM**
 
diff --git a/python/mxnet/numpy_extension/_op.py b/python/mxnet/numpy_extension/_op.py
index 61a1cce4d763..d2818304ca47 100644
--- a/python/mxnet/numpy_extension/_op.py
+++ b/python/mxnet/numpy_extension/_op.py
@@ -872,7 +872,7 @@ def rnn(data=None, parameters=None, state=None, state_cell=None, sequence_length
         h_t = \tanh(W_{ih} * x_t + b_{ih}  +  W_{hh} * h_{(t-1)} + b_{hh})
 
     Reference paper: Finding structure in time - Elman, 1988.
-    https://crl.ucsd.edu/~elman/Papers/fsit.pdf
+    https://axon.cs.byu.edu/~martinez/classes/678/Papers/Elman_time.pdf
 
     **LSTM**
 
diff --git a/src/operator/rnn.cc b/src/operator/rnn.cc
index 5a03b06674c8..d2b37147e039 100644
--- a/src/operator/rnn.cc
+++ b/src/operator/rnn.cc
@@ -330,7 +330,7 @@ With Tanh activtion function:
     h_t = \tanh(W_{ih} * x_t + b_{ih}  +  W_{hh} * h_{(t-1)} + b_{hh})
 
 Reference paper: Finding structure in time - Elman, 1988.
-https://crl.ucsd.edu/~elman/Papers/fsit.pdf
+https://axon.cs.byu.edu/~martinez/classes/678/Papers/Elman_time.pdf
 
 **LSTM**