Merge pull request #216 from stevepiercy/master

- fixed several bugs that caused search to fail
Pylons · May 19, 2014 · 6a0aad6 · 6a0aad6
2 parents 433eb4c + cfaf7b7
commit 6a0aad6
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/docs/_themes/substanced/layout.html b/docs/_themes/substanced/layout.html
@@ -22,22 +22,8 @@
         '_static/assets/js/main.js',
         '_static/underscore.js',
         '_static/doctools.js',
-        '_static/twitter.js'] %}
-{%- macro script() %}
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    '{{ url_root }}',
-        VERSION:     '{{ release|e }}',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '{{ '' if no_search_suffix else file_suffix }}',
-        HAS_SOURCE:  {{ has_source|lower }}
-      };
-    </script>
-    {%- for scriptfile in script_files %}
-    <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
-    {%- endfor %}
-    <script type="text/javascript">$('#searchbox').show(0);</script>
-{%- endmacro %}
+        '_static/twitter.js',
+        '_static/searchtools.js'] %}
 {# XXX necessary? #}
 {%- if url_root == '#' %}{% set url_root = '' %}{% endif %}
 {%- if not embedded and docstitle %}
@@ -71,6 +57,7 @@
             </div>
         </div>
 {%- endmacro %}
+
 {%- macro sidebar() %}
       {%- if render_sidebar %}
 <div class="span3 bs-docs-sidebar">
@@ -109,6 +96,23 @@
 </div>
       {%- endif %}
 {%- endmacro %}
+
+{%- macro script() %}
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+        URL_ROOT:    '{{ url_root }}',
+        VERSION:     '{{ release|e }}',
+        COLLAPSE_INDEX: false,
+        FILE_SUFFIX: '{{ '' if no_search_suffix else file_suffix }}',
+        HAS_SOURCE:  {{ has_source|lower }}
+      };
+    </script>
+    {%- for scriptfile in script_files %}
+    <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
+    {%- endfor %}
+    <script type="text/javascript">$('#searchbox').show(0);</script>
+{%- endmacro %}
+
 {%- macro css() %}
 {%- set css_files = ['_static/assets/css/theme_venera_blue.css',
                     '_static/pygments.css',
@@ -385,6 +389,7 @@ <h5 class='footer-header'>Substance D Developers</h5>
     </footer>
 {%- endblock %}
 {%- block script %}{{ script() }}{% endblock %}
+{%- block extraend %}{% endblock %}
     <script type="text/javascript">
      function handleTweets(tweets){
        var x = tweets.length;

diff --git a/docs/_themes/substanced/search.html b/docs/_themes/substanced/search.html
@@ -10,7 +10,8 @@
 {%- extends "layout.html" %}
 {% set title = _('Search') %}
 {% set script_files = script_files + ['_static/searchtools.js'] %}
-{% block extrahead %}
+{% block extraend %}
+  <script type="text/javascript">$('#fallback').hide();</script>
   <script type="text/javascript">
     jQuery(function() { Search.loadIndex("{{ pathto('searchindex.js', 1) }}"); });
   </script>

diff --git a/docs/conf.py b/docs/conf.py
@@ -144,7 +144,7 @@
 # The name of an image file (within the static path) to use as favicon of
 # the docs.  This file should be a Windows icon file (.ico) being 16x16 or
 # 32x32 pixels large.
-html_favicon = '_static/favicon.ico'
+html_favicon = '_themes/substanced/static/favicon.ico'
 
 # Add any paths that contain custom static files (such as style sheets)
 # here, relative to this directory. They are copied after the builtin