From 1ce62bb882e71abfab4f1e9ae9a485e6ae87e7c0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 4 Mar 2016 20:35:36 +0530
Subject: [PATCH] Fix user manual search not working over https

---
 manual/templates/layout.html | 4 ++--
 manual/templates/search.html | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/manual/templates/layout.html b/manual/templates/layout.html
index 534cb302dd..dd94deac6a 100644
--- a/manual/templates/layout.html
+++ b/manual/templates/layout.html
@@ -26,7 +26,7 @@
         <div class="body">
             {% if not embedded %}
             <div id="ad-container" style="text-align:center">
-                <script async="async" src="http://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+                <script async="async" src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
                 <ins class="adsbygoogle"
                     style="display:inline-block;width:728px;height:90px"
                     data-ad-client="ca-pub-5939552585043235"
@@ -63,7 +63,7 @@
 
 {% block sidebarlogo %}
         <p class="logo">
-            <a href="http://calibre-ebook.com"><img class="logo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/></a>
+            <a href="//calibre-ebook.com"><img class="logo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/></a>
         </p>
 
         <form action="https://www.paypal.com/cgi-bin/webscr" method="post" title="Contribute to support calibre development">
diff --git a/manual/templates/search.html b/manual/templates/search.html
index 014ee11a65..519c2356dd 100644
--- a/manual/templates/search.html
+++ b/manual/templates/search.html
@@ -10,7 +10,7 @@
 {% extends "layout.html" %}
 {% set title = _('Search') %}
 {% block extrahead %}
-    <link rel="stylesheet" href="http://www.google.com/cse/style/look/default.css" type="text/css" />
+    <link rel="stylesheet" href="https://www.google.com/cse/style/look/default.css" type="text/css" />
   {{ super() }}
 {% endblock %}
 {% block body %}
@@ -29,7 +29,7 @@
     containing fewer words won't appear in the result list.{% endtrans %}
   </p>
   <div id="cse" style="width: 100%;">Loading</div>
-<script src="http://www.google.com/jsapi" type="text/javascript"></script>
+<script src="https://www.google.com/jsapi" type="text/javascript"></script>
 <script type="text/javascript"> 
   google.load('search', '1');
   google.setOnLoadCallback(function() {
@@ -41,8 +41,7 @@
     var params = $.getQueryParameters();
     if (params.q) {
         var query = params.q[0];
-        $('input[name="search"]')[0].value = query;
-        $('input.gsc-search-button')[0].click();
+        customSearchControl.execute(query);
     }
   }, true);
 </script>