From 92a4a5d42346c9c89f38683cf2d6cbeb976ee9ab Mon Sep 17 00:00:00 2001
From: Ryan P Kilby <kilbyr@gmail.com>
Date: Thu, 20 Feb 2020 02:23:06 -0800
Subject: [PATCH] Fix docs 404 (#7197)

* Use 'site_url' instead of hardcoding DRF homepage

* Use 'url' template filter instead of 'base_url'

This fixes static file loading for the 404 page.

* Only insert funding <hr> if toc is present

* Link quickstart to valid API guide page

* Fix 404 search modal link

* Use 'base_url' instead of 'site_url' on 404 page
---
 docs/tutorial/quickstart.md |  6 +++---
 docs_theme/404.html         |  2 +-
 docs_theme/main.html        | 20 ++++++++++----------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md
index 505f7f91d..546144670 100644
--- a/docs/tutorial/quickstart.md
+++ b/docs/tutorial/quickstart.md
@@ -137,12 +137,12 @@ Finally, we're including default login and logout views for use with the browsab
 
 ## Pagination
 Pagination allows you to control how many objects per page are returned. To enable it add the following lines to `tutorial/settings.py`
-    
+
     REST_FRAMEWORK = {
         'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination',
         'PAGE_SIZE': 10
     }
-    
+
 ## Settings
 
 Add `'rest_framework'` to `INSTALLED_APPS`. The settings module will be in `tutorial/settings.py`
@@ -224,5 +224,5 @@ If you want to get a more in depth understanding of how REST framework fits toge
 
 [image]: ../img/quickstart.png
 [tutorial]: 1-serialization.md
-[guide]: ../#api-guide
+[guide]: ../api-guide/requests.md
 [httpie]: https://github.com/jakubroztocil/httpie#installation
diff --git a/docs_theme/404.html b/docs_theme/404.html
index a89c0a418..bbb6b70ff 100644
--- a/docs_theme/404.html
+++ b/docs_theme/404.html
@@ -4,6 +4,6 @@
 
   <h1 id="404-page-not-found" style="text-align: center">404</h1>
   <p style="text-align: center"><strong>Page not found</strong></p>
-  <p style="text-align: center">Try the <a href="https://www.django-rest-framework.org/">homepage</a>, or <a href="#searchModal" data-toggle="modal">search the documentation</a>.</p>
+  <p style="text-align: center">Try the <a href="{{ base_url }}">homepage</a>, or <a href="#mkdocs_search_modal" data-toggle="modal">search the documentation</a>.</p>
 
 {% endblock %}
diff --git a/docs_theme/main.html b/docs_theme/main.html
index 21e9171a2..c2a29e1ae 100644
--- a/docs_theme/main.html
+++ b/docs_theme/main.html
@@ -5,17 +5,17 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta charset="utf-8">
   <title>{% if page.title %}{{ page.title }} - {% endif %}{{ config.site_name }}</title>
-  <link href="{{ base_url }}/img/favicon.ico" rel="icon" type="image/x-icon">
+  <link href="{{ 'img/favicon.ico'|url }}" rel="icon" type="image/x-icon">
   <link rel="canonical" href="{{ page.canonical_url|url }}" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta name="description" content="Django, API, REST{% if page %}, {{ page.title }}{% endif %}">
   <meta name="author" content="Tom Christie">
 
   <!-- Le styles -->
-  <link href="{{ base_url }}/css/prettify.css" rel="stylesheet">
-  <link href="{{ base_url }}/css/bootstrap.css" rel="stylesheet">
-  <link href="{{ base_url }}/css/bootstrap-responsive.css" rel="stylesheet">
-  <link href="{{ base_url }}/css/default.css" rel="stylesheet">
+  <link href="{{ 'css/prettify.css'|url }}" rel="stylesheet">
+  <link href="{{ 'css/bootstrap.css'|url }}" rel="stylesheet">
+  <link href="{{ 'css/bootstrap-responsive.css'|url }}" rel="stylesheet">
+  <link href="{{ 'css/default.css'|url }}" rel="stylesheet">
 
   <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
   <!--[if lt IE 9]>
@@ -102,7 +102,7 @@
                 {% endfor %}
 
                   <div class="promo">
-                    <hr/>
+                    {% if page.toc %}<hr/>{% endif %}
                     <div id="sidebarInclude">
                   </div>
               </ul>
@@ -139,10 +139,10 @@
   ================================================== -->
   <!-- Placed at the end of the document so the pages load faster -->
   <script async src="https://fund.django-rest-framework.org/sidebar_include.js"></script>
-  <script src="{{ base_url }}/js/jquery-1.8.1-min.js"></script>
-  <script src="{{ base_url }}/js/prettify-1.0.js"></script>
-  <script src="{{ base_url }}/js/bootstrap-2.1.1-min.js"></script>
-  <script src="{{ base_url }}/js/theme.js"></script>
+  <script src="{{ 'js/jquery-1.8.1-min.js'|url }}"></script>
+  <script src="{{ 'js/prettify-1.0.js'|url }}"></script>
+  <script src="{{ 'js/bootstrap-2.1.1-min.js'|url }}"></script>
+  <script src="{{ 'js/theme.js'|url }}"></script>
 
   <script>var base_url = '{{ base_url }}';</script>
   {% for path in config.extra_javascript %}