From 99435381a84072b110c32004b2fb778af9b96f77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= <sitbackandwait@gmail.com>
Date: Sat, 1 Feb 2020 11:01:17 +0100
Subject: [enh] introduce private engines

This PR adds a new setting to engines named `tokens`.
It expects a list of tokens which lets searx validate
if the request should be accepted or not.
---
 searx/templates/oscar/preferences.html | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
index 1a484dd4b..b03929df3 100644
--- a/searx/templates/oscar/preferences.html
+++ b/searx/templates/oscar/preferences.html
@@ -131,6 +131,12 @@
                              {% endfor %}
                          </select>
                     {{ preferences_item_footer(info, label, rtl) }}
+
+                    {% set label = _('Engine tokens') %}
+                    {% set info = _('Access tokens for private engines') %}
+                    {{ preferences_item_header(info, label, rtl) }}
+                        <input class="form-control" id='tokens' name='tokens' value='{{ preferences.tokens.get_value() }}'/>
+                    {{ preferences_item_footer(info, label, rtl) }}
                 </div>
                 </fieldset>
             </div>
-- 
cgit v1.2.3


From 88f9ac58f4577e3efed63bceb91b51258060a8a0 Mon Sep 17 00:00:00 2001
From: Dalf <alex@al-f.net>
Date: Fri, 14 Feb 2020 13:45:50 +0100
Subject: [mod] move public instance list to https://searx.space

---
 searx/templates/__common__/about.html | 2 +-
 searx/templates/oscar/base.html       | 2 +-
 searx/templates/simple/base.html      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'searx/templates')

diff --git a/searx/templates/__common__/about.html b/searx/templates/__common__/about.html
index bf1733359..ff86ddd28 100644
--- a/searx/templates/__common__/about.html
+++ b/searx/templates/__common__/about.html
@@ -22,7 +22,7 @@ Searx can be added to your browser's search bar; moreover, it can be set as the
 
 <h2>How can I make it my own?</h2>
 
-<p>Searx appreciates your concern regarding logs, so take the <a href="https://github.com/asciimoo/searx">code</a> and run it yourself! <br />Add your Searx to this <a href="https://github.com/asciimoo/searx/wiki/Searx-instances">list</a> to help other people reclaim their privacy and make the Internet freer!
+<p>Searx appreciates your concern regarding logs, so take the <a href="https://github.com/asciimoo/searx">code</a> and run it yourself! <br />Add your Searx to this <a href="https://searx.space/">list</a> to help other people reclaim their privacy and make the Internet freer!
 <br />The more decentralized the Internet is, the more freedom we have!</p>
 
 
diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html
index 66a9e6029..9465ca58a 100644
--- a/searx/templates/oscar/base.html
+++ b/searx/templates/oscar/base.html
@@ -88,7 +88,7 @@
                     {{ _('Powered by') }} <a href="https://asciimoo.github.io/searx/">searx</a> - {{ searx_version }} - {{ _('a privacy-respecting, hackable metasearch engine') }}<br/>
                     <a href="https://github.com/asciimoo/searx">{{ _('Source code') }}</a> |
                     <a href="https://github.com/asciimoo/searx/issues">{{ _('Issue tracker') }}</a> |
-                    <a href="https://github.com/asciimoo/searx/wiki/Searx-instances">{{ _('Public instances') }}</a>
+                    <a href="https://searx.space/">{{ _('Public instances') }}</a>
                 </small>
             </p>
         </div>
diff --git a/searx/templates/simple/base.html b/searx/templates/simple/base.html
index 92597b654..bba02dbf8 100644
--- a/searx/templates/simple/base.html
+++ b/searx/templates/simple/base.html
@@ -53,7 +53,7 @@
     {{ _('Powered by') }} <a href="{{ url_for('about') }}">searx</a> - {{ searx_version }} - {{ _('a privacy-respecting, hackable metasearch engine') }}<br/>
         <a href="https://github.com/asciimoo/searx">{{ _('Source code') }}</a> |
         <a href="https://github.com/asciimoo/searx/issues">{{ _('Issue tracker') }}</a> |
-        <a href="https://github.com/asciimoo/searx/wiki/Searx-instances">{{ _('Public instances') }}</a>
+        <a href="https://searx.space/">{{ _('Public instances') }}</a>
     </p>
   </footer>
   <!--[if gte IE 9]>-->
-- 
cgit v1.2.3