MAINT: Updates for latest sphinx

ivoire · Mar 19, 2019 · a154015 · a154015
1 parent 8c1817e
commit a154015
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/sphinx_bootstrap_theme/bootstrap/layout.html b/sphinx_bootstrap_theme/bootstrap/layout.html
@@ -8,14 +8,6 @@
   {% set bs_span_prefix = "span" %}
 {% endif %}
 
-{% set script_files = script_files + [
-    '_static/js/jquery-1.11.0.min.js',
-    '_static/js/jquery-fix.js',
-    '_static/bootstrap-' + bootstrap_version + '/js/bootstrap.min.js',
-    '_static/bootstrap-sphinx.js'
-  ]
-%}
-
 {%- set render_sidebar = (not embedded) and (not theme_nosidebar|tobool) and sidebars %}
 
 {%- set bs_content_width = render_sidebar and "9" or "12"%}
@@ -60,6 +52,10 @@
 <meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
 <meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1'>
 <meta name="apple-mobile-web-app-capable" content="yes">
+<script type="text/javascript" src="{{ pathto('_static/js/jquery-1.11.0.min.js', 1) }} "></script>
+<script type="text/javascript" src="{{ pathto('_static/js/jquery-fix.js', 1) }} "></script>
+<script type="text/javascript" src="{{ pathto('_static', 1) + '/bootstrap-' + bootstrap_version + '/js/bootstrap.min.js' }} "></script>
+<script type="text/javascript" src="{{ pathto('_static/js/_static/bootstrap-sphinx.js', 1) }} "></script>
 {% endblock %}
 
 {# Silence the sidebar's, relbar's #}
@@ -73,7 +69,7 @@
 <div class="container">
   <div class="row">
     {%- block sidebar1 %}{{ bsidebar() }}{% endblock %}
-    <div class="{{ bs_span_prefix }}{{ bs_content_width }} content">
+    <div class="body {{ bs_span_prefix }}{{ bs_content_width }} content" role="main">
       {% block body %}{% endblock %}
     </div>
     {% block sidebar2 %} {# possible location for sidebar #} {% endblock %}

diff --git a/sphinx_bootstrap_theme/bootstrap/search.html b/sphinx_bootstrap_theme/bootstrap/search.html
@@ -9,8 +9,8 @@
 #}
 {%- extends "layout.html" %}
 {% set title = _('Search') %}
-{% set script_files = script_files + ['_static/searchtools.js'] %}
 {% block extrahead %}
+  <script type="text/javascript" src="{{ pathto('_static/searchtools.js', 1) }} "></script>
   <script type="text/javascript">
     jQuery(function() { Search.loadIndex("{{ pathto('searchindex.js', 1) }}"); });
   </script>
@@ -42,15 +42,15 @@ <h1 id="search-documentation">{{ _('Search') }}</h1>
     </div>
     <input type="submit" class="btn btn-default" value="{{ _('search') }}" />
     <span id="search-progress" style="padding-left: 10px"></span>
-  </form>  
+  </form>
   {% else %}
   <form class="form-search">
     <input type="text" class="input-medium search-query" name="q" value="" />
     <input type="submit" class="btn btn-default" value="{{ _('search') }}" />
     <span id="search-progress" style="padding-left: 10px"></span>
   </form>
   {% endif %}
-  
+
   {% if search_performed %}
     <h2>{{ _('Search Results') }}</h2>
     {% if not search_results %}