Make websupport builder inherit from serializing builder, remove separate WebSupportApp.

1 files changed, 10 insertions, 10 deletions

diff --git a/sphinx/themes/basic/searchresults.html b/sphinx/themes/basic/searchresults.html
index 4b5da1a39..d7af48b2f 100644
--- a/sphinx/themes/basic/searchresults.html
+++ b/sphinx/themes/basic/searchresults.html
@@ -1,6 +1,6 @@
 {#
     basic/searchresults.html
-    ~~~~~~~~~~~~~~~~~
+    ~~~~~~~~~~~~~~~~~~~~~~~~
 
     Template for the body of the search results page.
 
@@ -17,20 +17,20 @@
   <input type="submit" value="search" />
   <span id="search-progress" style="padding-left: 10px"></span>
 </form>
-{% if search_performed %}
-<h2>Search Results</h2>
-{% if not search_results %}
-<p>Your search did not match any results.</p>
-{% endif %}
-{% endif %}
+{%- if search_performed %}
+  <h2>Search Results</h2>
+  {%- if not search_results %}
+  <p>Your search did not match any results.</p>
+  {%- endif %}
+{%- endif %}
 <div id="search-results">
-  {% if search_results %}
+  {%- if search_results %}
   <ul class="search">
     {% for href, caption, context in search_results %}
-    <li><a href="{{ href }}?highlight={{ q }}">{{ caption }}</a>
+    <li><a href="{{ docroot }}{{ href }}/?highlight={{ q }}">{{ caption }}</a>
       <div class="context">{{ context|e }}</div>
     </li>
     {% endfor %}
   </ul>
-  {% endif %}
+  {%- endif %}
 </div>