mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Fix user manual search not working over https
This commit is contained in:
parent
5d404dd5ab
commit
1ce62bb882
@ -26,7 +26,7 @@
|
|||||||
<div class="body">
|
<div class="body">
|
||||||
{% if not embedded %}
|
{% if not embedded %}
|
||||||
<div id="ad-container" style="text-align:center">
|
<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"
|
<ins class="adsbygoogle"
|
||||||
style="display:inline-block;width:728px;height:90px"
|
style="display:inline-block;width:728px;height:90px"
|
||||||
data-ad-client="ca-pub-5939552585043235"
|
data-ad-client="ca-pub-5939552585043235"
|
||||||
@ -63,7 +63,7 @@
|
|||||||
|
|
||||||
{% block sidebarlogo %}
|
{% block sidebarlogo %}
|
||||||
<p class="logo">
|
<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>
|
</p>
|
||||||
|
|
||||||
<form action="https://www.paypal.com/cgi-bin/webscr" method="post" title="Contribute to support calibre development">
|
<form action="https://www.paypal.com/cgi-bin/webscr" method="post" title="Contribute to support calibre development">
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
{% extends "layout.html" %}
|
{% extends "layout.html" %}
|
||||||
{% set title = _('Search') %}
|
{% set title = _('Search') %}
|
||||||
{% block extrahead %}
|
{% 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() }}
|
{{ super() }}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
{% block body %}
|
{% block body %}
|
||||||
@ -29,7 +29,7 @@
|
|||||||
containing fewer words won't appear in the result list.{% endtrans %}
|
containing fewer words won't appear in the result list.{% endtrans %}
|
||||||
</p>
|
</p>
|
||||||
<div id="cse" style="width: 100%;">Loading</div>
|
<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">
|
<script type="text/javascript">
|
||||||
google.load('search', '1');
|
google.load('search', '1');
|
||||||
google.setOnLoadCallback(function() {
|
google.setOnLoadCallback(function() {
|
||||||
@ -41,8 +41,7 @@
|
|||||||
var params = $.getQueryParameters();
|
var params = $.getQueryParameters();
|
||||||
if (params.q) {
|
if (params.q) {
|
||||||
var query = params.q[0];
|
var query = params.q[0];
|
||||||
$('input[name="search"]')[0].value = query;
|
customSearchControl.execute(query);
|
||||||
$('input.gsc-search-button')[0].click();
|
|
||||||
}
|
}
|
||||||
}, true);
|
}, true);
|
||||||
</script>
|
</script>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user