From 4f4cb1caca37c28cd8a8e58e259d41569d3290a7 Mon Sep 17 00:00:00 2001 From: asciimoo Date: Sun, 19 Jan 2014 22:58:50 +0100 Subject: [enh] results favico handling --- searx/templates/result_templates/default.html | 6 ++---- searx/templates/result_templates/videos.html | 6 ++---- searx/templates/results.html | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) (limited to 'searx/templates') diff --git a/searx/templates/result_templates/default.html b/searx/templates/result_templates/default.html index ab6d469b4..d06a4598a 100644 --- a/searx/templates/result_templates/default.html +++ b/searx/templates/result_templates/default.html @@ -1,13 +1,11 @@
{% if result['favicon'] %} -
- {{result['favicon']}}.ico -
+ {% endif %}
-

{{ result.title|safe }}


+

{{ result.title|safe }}

{% if result.content %}{{ result.content|safe }}
{% endif %}

{{ result.pretty_url }}

diff --git a/searx/templates/result_templates/videos.html b/searx/templates/result_templates/videos.html index ae6d8f16c..d3391f0d3 100644 --- a/searx/templates/result_templates/videos.html +++ b/searx/templates/result_templates/videos.html @@ -1,13 +1,11 @@
{% if result['favicon'] %} -
- {{result['favicon']}}.ico -
+ {% endif %}

{{ result.title|safe }}

- {{ result.title }} + {{ result.title }}

{{ result.url }}

diff --git a/searx/templates/results.html b/searx/templates/results.html index be40900c3..0fb9250ca 100644 --- a/searx/templates/results.html +++ b/searx/templates/results.html @@ -9,7 +9,7 @@ {% if suggestions %}
Suggestions: {% for suggestion in suggestions %}
{% endfor %}
{% endif %} - +
Number of results: {{ number_of_results }} -- cgit v1.2.3 From b7fa79081f3c7c9ce2974c406e07b1e48cb9534a Mon Sep 17 00:00:00 2001 From: asciimoo Date: Sun, 19 Jan 2014 23:17:50 +0100 Subject: [doc] about page updates --- searx/templates/about.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'searx/templates') diff --git a/searx/templates/about.html b/searx/templates/about.html index 4e3f4bf4e..1219c2ebe 100644 --- a/searx/templates/about.html +++ b/searx/templates/about.html @@ -39,7 +39,7 @@ Searx can be added to your browser's search bar, moreover it can be set as the d

New engines?

Don't forget to restart searx after config edit!

-- cgit v1.2.3 From 5cf2809cc98bd6c450fac683ed958dec30b0824e Mon Sep 17 00:00:00 2001 From: asciimoo Date: Mon, 20 Jan 2014 20:19:45 +0100 Subject: [mod] about page --- searx/templates/about.html | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'searx/templates') diff --git a/searx/templates/about.html b/searx/templates/about.html index 1219c2ebe..cc4e54dfe 100644 --- a/searx/templates/about.html +++ b/searx/templates/about.html @@ -8,25 +8,25 @@

Why use Searx?

    -
  • Maybe Searx won’t offer you as personalised results as Google, but it doesn't make a profile about you
    • -
  • Searx doesn't care about what you search, never shares anything with a third party, and it can't be used to compromise you
    • -
  • Searx is a free software, the code is 100% open and you can help to make it better. See more on github
    • +
  • 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, moreover believe +

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 don't show up in our logs, neither in 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. +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 have my own?

+

How can I make it my own?

-

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

+

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!

@@ -48,7 +48,7 @@ Searx can be added to your browser's search bar, moreover it can be set as the d

See the installation and setup wiki page

How to debug engines?

-

Stats page contains some useful data about the used engines.

+

Stats page contains some useful data about the engines used.

{% endblock %} -- cgit v1.2.3 From 449ffeeeef8659aef076bbcafec1e781c99c1667 Mon Sep 17 00:00:00 2001 From: asciimoo Date: Tue, 21 Jan 2014 11:14:55 +0100 Subject: [fix] link --- searx/templates/about.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'searx/templates') diff --git a/searx/templates/about.html b/searx/templates/about.html index cc4e54dfe..4d80235de 100644 --- a/searx/templates/about.html +++ b/searx/templates/about.html @@ -10,7 +10,7 @@
  • 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
    • +
  • 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

-- cgit v1.2.3 From e3369174febd2ce433c6fd5add353c04c4315cf2 Mon Sep 17 00:00:00 2001 From: asciimoo Date: Tue, 21 Jan 2014 12:38:51 +0100 Subject: [fix] link --- searx/templates/about.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'searx/templates') diff --git a/searx/templates/about.html b/searx/templates/about.html index 4d80235de..bb0a3e882 100644 --- a/searx/templates/about.html +++ b/searx/templates/about.html @@ -39,7 +39,7 @@ Searx can be added to your browser's search bar; moreover, it can be set as the

New engines?

Don't forget to restart searx after config edit!

-- cgit v1.2.3 From 2b1d2dbc841d970ed369e6479693dcc80fa01233 Mon Sep 17 00:00:00 2001 From: asciimoo Date: Wed, 22 Jan 2014 00:17:49 +0100 Subject: [enh] i18n support --- searx/templates/engines.html | 9 ++++----- searx/templates/index.html | 4 ++-- searx/templates/preferences.html | 8 ++++---- searx/templates/results.html | 6 +++--- searx/templates/stats.html | 2 +- 5 files changed, 14 insertions(+), 15 deletions(-) (limited to 'searx/templates') diff --git a/searx/templates/engines.html b/searx/templates/engines.html index 1f52dc09f..008e860f1 100644 --- a/searx/templates/engines.html +++ b/searx/templates/engines.html @@ -1,12 +1,12 @@ {% extends 'base.html' %} {% block content %}
-

Currently used search engines

+

{{ _('Currently used search engines') }}

- - + + {% for (categ,search_engines) in categs %} {% for search_engine in search_engines %} @@ -20,7 +20,6 @@ {% endfor %} {% endfor %}
Engine nameCategory{{ _('Engine name') }}{{ _('Category') }}
-

Please add more engines to this list, pull requests are welcome!

-

back

+

{{ _('back') }}

{% endblock %} diff --git a/searx/templates/index.html b/searx/templates/index.html index d9fa3b502..18320ae09 100644 --- a/searx/templates/index.html +++ b/searx/templates/index.html @@ -4,8 +4,8 @@

searx

{% include 'search.html' %}

- about - preferences + {{ _('about') }} + {{ _('preferences') }}

{% endblock %} diff --git a/searx/templates/preferences.html b/searx/templates/preferences.html index 705139e58..d47dd4834 100644 --- a/searx/templates/preferences.html +++ b/searx/templates/preferences.html @@ -2,18 +2,18 @@ {% block head %} {% endblock %} {% block content %}
-

Preferences

+

{{ _('Preferences') }}

- Default categories + {{ _('Default categories') }}

{% include 'categories.html' %}

- +
-
back
+
{{ _('back') }}
{% endblock %} diff --git a/searx/templates/results.html b/searx/templates/results.html index 0fb9250ca..238671878 100644 --- a/searx/templates/results.html +++ b/searx/templates/results.html @@ -7,12 +7,12 @@
{% if suggestions %} -
Suggestions: {% for suggestion in suggestions %}
{% endfor %}
+
{{ _('Suggestions') }}:{% for suggestion in suggestions %}
{% endfor %}
{% endif %}
- Number of results: {{ number_of_results }} + {{ _('Number of results') }}: {{ number_of_results }}
{% for result in results %} @@ -23,7 +23,7 @@ {% endif %} {% endfor %}
- Download results + {{ _('Download results') }}
diff --git a/searx/templates/stats.html b/searx/templates/stats.html index 933616e32..cb5757b31 100644 --- a/searx/templates/stats.html +++ b/searx/templates/stats.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block head %} {% endblock %} {% block content %} -

Engine stats

+

{{ _('Engine stats') }}

{% for stat_name,stat_category in stats %}
-- cgit v1.2.3 From 852dfc77c652fcd5557b097d37a3b5b5543391f9 Mon Sep 17 00:00:00 2001 From: asciimoo Date: Wed, 22 Jan 2014 00:59:18 +0100 Subject: [enh] configurable localization --- searx/templates/categories.html | 2 +- searx/templates/preferences.html | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) (limited to 'searx/templates') diff --git a/searx/templates/categories.html b/searx/templates/categories.html index b1fd3d1fc..57e63c85d 100644 --- a/searx/templates/categories.html +++ b/searx/templates/categories.html @@ -1,7 +1,7 @@
{% for category in categories %}
- +
{% endfor %}
diff --git a/searx/templates/preferences.html b/searx/templates/preferences.html index d47dd4834..3c2afef21 100644 --- a/searx/templates/preferences.html +++ b/searx/templates/preferences.html @@ -5,15 +5,25 @@

{{ _('Preferences') }}

+
{{ _('Default categories') }} -

{% include 'categories.html' %}

- -
+
+ {{ _('Interface language') }} +

+ +

+
+ +
{{ _('back') }}
{% endblock %} -- cgit v1.2.3