From e7788980ad1bb82e9ae084428d05a79b235c17ff Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Tue, 12 May 2020 14:17:47 +0200
Subject: [fix] about page- 'How to set as the default search engine?'

Searx supports OpenSearch, remove the inline JS from the about page.

close: https://github.com/asciimoo/searx/issues/1949
close: https://github.com/asciimoo/searx/issues/1616

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 searx/templates/__common__/about.html | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'searx/templates/__common__')

diff --git a/searx/templates/__common__/about.html b/searx/templates/__common__/about.html
index d3e8d06a6..9741b5162 100644
--- a/searx/templates/__common__/about.html
+++ b/searx/templates/__common__/about.html
@@ -59,12 +59,16 @@
 
   <h2 id='add to browser'>How to set as the default search engine?</h2>
 
-  <dt>Firefox</dt>
+  <p>
+    Searx supports <a href="https://github.com/dewitt/opensearch/blob/master/opensearch-1-1-draft-6.md">OpenSearch</a>.
+    For more information on changing your default search engine, see your browser's documentation:
+  </p>
 
-  <dd>
-    <a href="#" onclick="window.external.AddSearchProvider(window.location.protocol + '//' + window.location.host + '{{ url_for('opensearch') }}');">Install</a>
-    searx as a search engine on any version of Firefox! (javascript required)
-  </dd>
+  <ul>
+    <li><a href="https://support.mozilla.org/en-US/kb/add-or-remove-search-engine-firefox">Firefox</a></li>
+    <li><a href="https://support.microsoft.com/en-us/help/4028574/microsoft-edge-change-the-default-search-engine" >Microsoft Egde</a></li>
+    <li>Chrome based browsers <a href="https://www.chromium.org/tab-to-search">only add websites that the user navigates to without a path.</a>
+  </ul>
 
   <h2>Where to find anonymous usage statistics of this instance ?</h2>
 
-- 
cgit v1.2.3


From 0dc5bdb6ef602d00456eb1db96d45e2f42b2b7a4 Mon Sep 17 00:00:00 2001
From: Adam Tauber <asciimoo@gmail.com>
Date: Mon, 15 Jun 2020 20:11:12 +0200
Subject: [fix] add missing template file

---
 searx/templates/__common__/translations.js.tpl | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 searx/templates/__common__/translations.js.tpl

(limited to 'searx/templates/__common__')

diff --git a/searx/templates/__common__/translations.js.tpl b/searx/templates/__common__/translations.js.tpl
new file mode 100644
index 000000000..8453aba69
--- /dev/null
+++ b/searx/templates/__common__/translations.js.tpl
@@ -0,0 +1 @@
+var could_not_load = '{{ _('could not load data') }}!';
-- 
cgit v1.2.3


From 08c13daf85311aa1799b8ea9e0990fab058c2b7f Mon Sep 17 00:00:00 2001
From: Adam Tauber <asciimoo@gmail.com>
Date: Thu, 18 Jun 2020 19:37:14 +0200
Subject: [enh] update opensearch.xml to match major search engines
 opensearch.xml

---
 searx/templates/__common__/opensearch.xml | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

(limited to 'searx/templates/__common__')

diff --git a/searx/templates/__common__/opensearch.xml b/searx/templates/__common__/opensearch.xml
index 15d3eb792..27634245f 100644
--- a/searx/templates/__common__/opensearch.xml
+++ b/searx/templates/__common__/opensearch.xml
@@ -6,23 +6,13 @@
   <Image>{{ urljoin(host, url_for('static', filename='img/favicon.png')) }}</Image>
   <LongName>searx metasearch</LongName>
   {% if opensearch_method == 'get' %}
-    <Url type="text/html" method="get" template="{{ host }}search?q={searchTerms}"/>
-    {% if autocomplete %}
-    <Url type="application/x-suggestions+json" method="get" template="{{ host }}autocompleter">
-        <Param name="format" value="x-suggestions" />
-        <Param name="q" value="{searchTerms}" />
-    </Url>
-    {% endif %}
+    <Url rel="results" type="text/html" method="get" template="{{ host }}search?q={searchTerms}"/>
   {% else %}
-    <Url type="text/html" method="post" template="{{ host }}">
+    <Url rel="results" type="text/html" method="post" template="{{ host }}">
         <Param name="q" value="{searchTerms}" />
     </Url>
-    {% if autocomplete %}
-    <!-- TODO, POST REQUEST doesn't work -->
-    <Url type="application/x-suggestions+json" method="get" template="{{ host }}autocompleter">
-        <Param name="format" value="x-suggestions" />
-        <Param name="q" value="{searchTerms}" />
-    </Url>
-    {% endif %}
+  {% endif %}
+  {% if autocomplete %}
+    <Url rel="suggestions" type="application/json" template="{{ host }}autocompleter"/>
   {% endif %}
 </OpenSearchDescription>
-- 
cgit v1.2.3