From d6c8987575d94b56b6b877e552de99fa0c62ba98 Mon Sep 17 00:00:00 2001 From: asciimoo Date: Fri, 17 Jan 2014 16:22:30 +0100 Subject: [enh] about page updates --- searx/templates/about.html | 45 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 25 deletions(-) (limited to 'searx') diff --git a/searx/templates/about.html b/searx/templates/about.html index 977422c5d..30e6c5b50 100644 --- a/searx/templates/about.html +++ b/searx/templates/about.html @@ -4,49 +4,44 @@

About searx

-

Searx is a metasearch engine inspired by the seeks-project. -
It tries to provide basic privacy by mixing your queries with those from others while avoiding storing search data. For all browsers (except chrom*) queries are made using a POST request. Thus they don't show up in our logs, nor in your url history. For Chrom* users there is an exception, searx is used from the search bar, it issues GET requests. -
You can add it to your browsers search bar and even make it your default search engine. +

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

-

What makes searx different

+

Why use Searx?

+

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

-

Engines

+

Technical details - How does it work?

-{% for (categ,search_engines) in categs %} -

{{ categ.capitalize() }}

- -{% endfor %} -

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

+

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!

-

Running public instances

+

FAQ

-

Trust

-

It's ok if you don't trust us regarding the logs, take the code and run it yourself! decentralize!

+

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!

-

WSGI support?

-

Okhin wrote a great and detailed article about the setup.

+ +

Installation/WSGI support?

+

See the installation and setup wiki page

+

How to debug engines?

Stats page contains some useful data about the used engines.

+
{% endblock %} -- cgit v1.2.3 From 8b3ca1112c77ab7d131c075530f0dc02c6029e7d Mon Sep 17 00:00:00 2001 From: asciimoo Date: Fri, 17 Jan 2014 16:23:23 +0100 Subject: [enh] /engines page added --- searx/templates/engines.html | 26 ++++++++++++++++++++++++++ searx/webapp.py | 7 ++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 searx/templates/engines.html (limited to 'searx') diff --git a/searx/templates/engines.html b/searx/templates/engines.html new file mode 100644 index 000000000..1f52dc09f --- /dev/null +++ b/searx/templates/engines.html @@ -0,0 +1,26 @@ +{% extends 'base.html' %} +{% block content %} +
+

Currently used search engines

+ + + + + + + {% for (categ,search_engines) in categs %} + {% for search_engine in search_engines %} + + {% if not search_engine.private %} + + + + + {% endif %} + {% endfor %} + {% endfor %} +
Engine nameCategory
{{ search_engine.name }}{{ categ }}
+

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

+

back

+
+{% endblock %} diff --git a/searx/webapp.py b/searx/webapp.py index 48448eb25..d6ec3a47b 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -174,8 +174,13 @@ def index(): @app.route('/about', methods=['GET']) def about(): + return render('about.html') + + +@app.route('/engines', methods=['GET']) +def list_engines(): global categories - return render('about.html', categs=categories.items()) + return render('engines.html', categs=categories.items()) @app.route('/preferences', methods=['GET', 'POST']) -- cgit v1.2.3 From 1db082a28738ff126a2f4d34777f2b6d6efc6d31 Mon Sep 17 00:00:00 2001 From: asciimoo Date: Fri, 17 Jan 2014 17:06:54 +0100 Subject: [enh][mod] search category order --- searx/webapp.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'searx') diff --git a/searx/webapp.py b/searx/webapp.py index d6ec3a47b..15ab17d15 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -70,7 +70,8 @@ def get_base_url(): def render(template_name, **kwargs): global categories - kwargs['categories'] = sorted(categories.keys()) + kwargs['categories'] = ['general'] + kwargs['categories'].extend(x for x in sorted(categories.keys()) if x != 'general') if not 'selected_categories' in kwargs: kwargs['selected_categories'] = [] cookie_categories = request.cookies.get('categories', '').split(',') -- cgit v1.2.3 From 2d179c4cf6817be2171451311e427a7828b0f61e Mon Sep 17 00:00:00 2001 From: asciimoo Date: Fri, 17 Jan 2014 17:07:25 +0100 Subject: [enh] general torrent search with piratebay --- searx/engines/piratebay.py | 1 + 1 file changed, 1 insertion(+) (limited to 'searx') diff --git a/searx/engines/piratebay.py b/searx/engines/piratebay.py index 11538dd6b..9cf410106 100644 --- a/searx/engines/piratebay.py +++ b/searx/engines/piratebay.py @@ -9,6 +9,7 @@ url = 'https://thepiratebay.se/' search_url = url + 'search/{search_term}/0/99/{search_type}' search_types = {'videos': '200' ,'music' : '100' + ,'files' : '0' } def request(query, params): -- cgit v1.2.3 From 69bd262b9e6de1da8d83134e3aaf7d6ab6837e22 Mon Sep 17 00:00:00 2001 From: asciimoo Date: Fri, 17 Jan 2014 17:14:21 +0100 Subject: [enh] about page updates II. --- searx/templates/about.html | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'searx') diff --git a/searx/templates/about.html b/searx/templates/about.html index 30e6c5b50..fd79d2a33 100644 --- a/searx/templates/about.html +++ b/searx/templates/about.html @@ -18,6 +18,14 @@

Technical details - How does it work?

+

Searx is a metasearch engine, +inspired by the [seeks-project](http://seeks-project.info/).
+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 issue 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?

+

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!

-- cgit v1.2.3 From d60e09e32cde69ceba10e441a87b6e856ab66cc4 Mon Sep 17 00:00:00 2001 From: asciimoo Date: Fri, 17 Jan 2014 17:15:52 +0100 Subject: [fix] markdown syntax removed --- searx/templates/about.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'searx') diff --git a/searx/templates/about.html b/searx/templates/about.html index fd79d2a33..a609a3270 100644 --- a/searx/templates/about.html +++ b/searx/templates/about.html @@ -19,7 +19,7 @@

Technical details - How does it work?

Searx is a metasearch engine, -inspired by the [seeks-project](http://seeks-project.info/).
+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 issue GET requests.
Searx can be added to your browser's search bar, moreover it can be set as the default search engine.

-- cgit v1.2.3 From bfc88aef19ced0dac054c135f8cfc2604ce851d3 Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Fri, 17 Jan 2014 17:26:45 +0100 Subject: flat design: logo, search box and some links --- searx/static/css/style.css | 15 +++++++++++---- searx/static/img/searx.png | Bin 34690 -> 7647 bytes 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'searx') diff --git a/searx/static/css/style.css b/searx/static/css/style.css index 2e6f450e1..6abe6b4bb 100644 --- a/searx/static/css/style.css +++ b/searx/static/css/style.css @@ -25,7 +25,16 @@ body, #container { .row p { padding: 0 10px; max-width: 700px; } .row h3,ul { margin: 4px 8px;} -.hmarg { margin: 0 20px; } +.hmarg { + margin: 0 20px; + border: 1px solid #3498DB; + padding: 4px 10px; +} + +a:link.hmarg { color: #3498DB; } +a:visited.hmarg { color: #3498DB; } +a:active.hmarg { color: #3498DB; } +a:hover.hmarg { color: #3498DB; } .top_margin { margin-top: 60px; } @@ -112,9 +121,7 @@ tr:hover td { background: #DDDDDD; } .center #search_wrapper { margin-left: auto; margin-right: auto; } .q { background: none repeat scroll 0 0 #FFFFFF; - border: 1px solid #8D8D8D; - border-radius: 3px; - box-shadow: 1px 1px 2px #999999 inset; + border: 1px solid #3498DB; color: #222222; font-size: 16px; height: 28px; diff --git a/searx/static/img/searx.png b/searx/static/img/searx.png index 45037ee33..e162da502 100644 Binary files a/searx/static/img/searx.png and b/searx/static/img/searx.png differ -- cgit v1.2.3 From cc5e7e94310f4670248754df59db3c3600543469 Mon Sep 17 00:00:00 2001 From: asciimoo Date: Fri, 17 Jan 2014 18:55:00 +0100 Subject: [fix] about page updates --- searx/templates/about.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'searx') diff --git a/searx/templates/about.html b/searx/templates/about.html index a609a3270..931578b95 100644 --- a/searx/templates/about.html +++ b/searx/templates/about.html @@ -20,14 +20,14 @@

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 issue GET requests.
+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.

How can I have 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!

+
The more decentralized the Internet is the more freedom we have!

-- cgit v1.2.3