From 1d30141c207e51c142cab3eee97783f08c1cb5c9 Mon Sep 17 00:00:00 2001 From: David A Roberts Date: Sat, 14 Jan 2017 18:40:37 +1000 Subject: [enh] show spelling corrections --- searx/templates/oscar/results.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'searx/templates/oscar') diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html index f5e95438d..11c950b9e 100644 --- a/searx/templates/oscar/results.html +++ b/searx/templates/oscar/results.html @@ -16,6 +16,18 @@

{{ _('Search results') }}

{% include 'oscar/search.html' %} + {% if corrections %} +
+ {{ _('Try searching for:') }} + {% for correction in corrections %} + + {% endfor %} +
+ {% endif %} + {% if answers %} {% for answer in answers %}
-- cgit v1.2.3 From 7fdfeca3a43e0e2bd8ef2dcb27cca7745edf596a Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Fri, 13 Jan 2017 22:15:11 +0100 Subject: [mod] add a __common__ template that can't be selected but that provides a common place for shared templates. What has been moved into this template : * opensearch*.xml is always the same whatever the themes. * the text inside */about.html --- searx/templates/oscar/about.html | 63 +---------------------- searx/templates/oscar/opensearch.xml | 28 ---------- searx/templates/oscar/opensearch_response_rss.xml | 23 --------- 3 files changed, 1 insertion(+), 113 deletions(-) delete mode 100644 searx/templates/oscar/opensearch.xml delete mode 100644 searx/templates/oscar/opensearch_response_rss.xml (limited to 'searx/templates/oscar') diff --git a/searx/templates/oscar/about.html b/searx/templates/oscar/about.html index 673738172..bc7fed8e1 100644 --- a/searx/templates/oscar/about.html +++ b/searx/templates/oscar/about.html @@ -1,66 +1,5 @@ {% extends "oscar/base.html" %} {% block title %}{{ _('about') }} - {% endblock %} {% block content %} - -

About searx

- -

Searx is a metasearch engine, aggregating the results of other search engines while not storing information about its users. -

-

Why use searx?

-
    -
  • searx may not offer you as personalised results as Google, but it doesn't generate a profile about you
    • -
  • searx doesn't care about what you search for, never shares anything with a third party, and it can't be used to compromise you
    • -
  • searx is free software, the code is 100% open and you can help to make it better. See more on github
    • -
-

If you do care about privacy, want to be a conscious user, or otherwise believe - in digital freedom, make searx your default search engine or run it on your own server

- -

Technical details - How does it work?

- -

Searx is a metasearch engine, -inspired by the seeks project.
-It provides basic privacy by mixing your queries with searches on other platforms without storing search data. Queries are made using a POST request on every browser (except chrome*). Therefore they show up in neither our logs, nor your url history. In case of Chrome* users there is an exception, searx uses the search bar to perform GET requests.
-Searx can be added to your browser's search bar; moreover, it can be set as the default search engine. -

- -

How can I make it my own?

- -

Searx appreciates your concern regarding logs, so take the code and run it yourself!
Add your Searx to this list to help other people reclaim their privacy and make the Internet freer! -
The more decentralized the Internet is, the more freedom we have!

- - -

More about searx

- - - - -
- -

FAQ

- -

How to add to firefox?

-

Install searx as a search engine on any version of Firefox! (javascript required)

- -

Developer FAQ

- -

New engines?

- -

Don't forget to restart searx after config edit!

- -

Installation/WSGI support?

-

See the installation and setup wiki page

- -

How to debug engines?

-

Stats page contains some useful data about the engines used.

- -
+{% include '__common__/about.html' %} {% endblock %} diff --git a/searx/templates/oscar/opensearch.xml b/searx/templates/oscar/opensearch.xml deleted file mode 100644 index 15d3eb792..000000000 --- a/searx/templates/oscar/opensearch.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - {{ instance_name }} - a privacy-respecting, hackable metasearch engine - UTF-8 - {{ urljoin(host, url_for('static', filename='img/favicon.png')) }} - searx metasearch - {% if opensearch_method == 'get' %} - - {% if autocomplete %} - - - - - {% endif %} - {% else %} - - - - {% if autocomplete %} - - - - - - {% endif %} - {% endif %} - diff --git a/searx/templates/oscar/opensearch_response_rss.xml b/searx/templates/oscar/opensearch_response_rss.xml deleted file mode 100644 index ddb60fa5e..000000000 --- a/searx/templates/oscar/opensearch_response_rss.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - Searx search: {{ q|e }} - {{ base_url }}?q={{ q|e }} - Search results for "{{ q|e }}" - searx - {{ number_of_results }} - 1 - {{ number_of_results }} - - -- cgit v1.2.3 From 30695265c26a79864df982e717fb35811943b98a Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Thu, 26 Jan 2017 21:12:41 +0100 Subject: [enh] search input design mods according to #226 --- searx/templates/oscar/advanced.html | 12 +++++++++--- searx/templates/oscar/languages.html | 2 +- searx/templates/oscar/results.html | 2 +- searx/templates/oscar/search.html | 18 +++++++++++++++--- searx/templates/oscar/time-range.html | 2 +- 5 files changed, 27 insertions(+), 9 deletions(-) (limited to 'searx/templates/oscar') diff --git a/searx/templates/oscar/advanced.html b/searx/templates/oscar/advanced.html index b4a054a11..95d99ba6a 100644 --- a/searx/templates/oscar/advanced.html +++ b/searx/templates/oscar/advanced.html @@ -4,7 +4,13 @@ {{ _('Advanced settings') }}
- {% include 'oscar/categories.html' %} - {% include 'oscar/time-range.html' %} - {% include 'oscar/languages.html' %} + {% include 'oscar/categories.html' %} +
+
+ {% include 'oscar/time-range.html' %} +
+
+ {% include 'oscar/languages.html' %} +
+
diff --git a/searx/templates/oscar/languages.html b/searx/templates/oscar/languages.html index 03df06823..96c1c3a9c 100644 --- a/searx/templates/oscar/languages.html +++ b/searx/templates/oscar/languages.html @@ -1,7 +1,7 @@ {% if preferences %} + + -
- {% include 'oscar/advanced.html' %} +
+ {% include 'oscar/time-range.html' %}
+
+ {% include 'oscar/languages.html' %} +
+
+
+
+ {% include 'oscar/categories.html' %} +
+
diff --git a/searx/templates/oscar/time-range.html b/searx/templates/oscar/time-range.html index 6ce1b91cb..d5efe9182 100644 --- a/searx/templates/oscar/time-range.html +++ b/searx/templates/oscar/time-range.html @@ -1,4 +1,4 @@ - -- cgit v1.2.3 From 04306bad892dccdc5ceb5811bcf7b32624185af6 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Thu, 26 Jan 2017 21:18:10 +0100 Subject: [fix] whitespace --- searx/templates/oscar/macros.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'searx/templates/oscar') diff --git a/searx/templates/oscar/macros.html b/searx/templates/oscar/macros.html index 221300fe4..808b08a95 100644 --- a/searx/templates/oscar/macros.html +++ b/searx/templates/oscar/macros.html @@ -10,7 +10,7 @@ {%- endmacro %} {%- macro result_link(url, title, classes='') -%} -{{ title }} +{{ title }} {%- endmacro -%} -- cgit v1.2.3 From 8354bd0c60177cceaddfabd740af63613ba26ad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Thu, 29 Dec 2016 00:20:30 +0100 Subject: [enh] make result url green --- searx/templates/oscar/macros.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'searx/templates/oscar') diff --git a/searx/templates/oscar/macros.html b/searx/templates/oscar/macros.html index 808b08a95..e71091e70 100644 --- a/searx/templates/oscar/macros.html +++ b/searx/templates/oscar/macros.html @@ -37,7 +37,7 @@ {{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info") }} {% endif %} -
{{ result.pretty_url }}
+
{{ result.pretty_url }}
{%- endmacro %} @@ -50,7 +50,7 @@ {% if proxify %} {{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info") }} {% endif %} -
{{ result.pretty_url }}
+
{{ result.pretty_url }}
{%- endmacro %} {% macro preferences_item_header(info, label, rtl) -%} -- cgit v1.2.3 From 508d0f063ef877e1df5f8236e3216fd2c78b6df7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Thu, 29 Dec 2016 00:21:18 +0100 Subject: [enh] make number of results less prominent --- searx/templates/oscar/results.html | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'searx/templates/oscar') diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html index b32dc7734..457b93ee5 100644 --- a/searx/templates/oscar/results.html +++ b/searx/templates/oscar/results.html @@ -92,14 +92,7 @@