From 9bc24080bf4c24a182cf2b5616095c2f6bea5821 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Fri, 13 Mar 2020 00:43:05 +0100 Subject: [fix] add answers, suggestions, corrections to rss output fixes #1888 --- .../__common__/opensearch_response_rss.xml | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'searx/templates') diff --git a/searx/templates/__common__/opensearch_response_rss.xml b/searx/templates/__common__/opensearch_response_rss.xml index 32c42e7c7..3781dd87c 100644 --- a/searx/templates/__common__/opensearch_response_rss.xml +++ b/searx/templates/__common__/opensearch_response_rss.xml @@ -25,5 +25,29 @@ {% if r.pubdate %}{{ r.pubdate }}{% endif %} {% endfor %} + {% if answers %} + {% for a in answers %} + + {{ a }} + answer + + {% endfor %} + {% endif %} + {% if corrections %} + {% for a in corrections %} + + {{ a }} + correction + + {% endfor %} + {% endif %} + {% if suggestions %} + {% for a in suggestions %} + + {{ a }} + suggestion + + {% endfor %} + {% endif %} -- cgit v1.2.3 From 2621c24cc7992a7c6968d5ce389364c3bf4cc7e2 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Mon, 23 Mar 2020 12:41:02 +0100 Subject: [enh] add clear search button to oscar theme - fixes #454 --- searx/templates/oscar/search.html | 1 + searx/templates/oscar/search_full.html | 1 + 2 files changed, 2 insertions(+) (limited to 'searx/templates') diff --git a/searx/templates/oscar/search.html b/searx/templates/oscar/search.html index cad9eca89..9978801ca 100644 --- a/searx/templates/oscar/search.html +++ b/searx/templates/oscar/search.html @@ -6,6 +6,7 @@ + diff --git a/searx/templates/oscar/search_full.html b/searx/templates/oscar/search_full.html index 656463178..ea821dc45 100644 --- a/searx/templates/oscar/search_full.html +++ b/searx/templates/oscar/search_full.html @@ -9,6 +9,7 @@ +
-- cgit v1.2.3 From 04c687403e21f883f9614e6a24df9ec450cfc111 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Wed, 25 Mar 2020 11:49:33 +0100 Subject: [fix] brands: add variables from build env to jinja templating We have some variables in the build environment which are also needed in the templating process. Theses variables are relavant if one creates a fork with its own branding. We treat these variables under the term 'brands'. Signed-off-by: Markus Heiser --- searx/templates/__common__/about.html | 12 ++++++------ searx/templates/courgette/github_ribbon.html | 4 ++-- searx/templates/legacy/github_ribbon.html | 2 +- searx/templates/oscar/base.html | 8 ++++---- searx/templates/simple/base.html | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) (limited to 'searx/templates') diff --git a/searx/templates/__common__/about.html b/searx/templates/__common__/about.html index ff86ddd28..d8e1335d9 100644 --- a/searx/templates/__common__/about.html +++ b/searx/templates/__common__/about.html @@ -7,7 +7,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

@@ -22,14 +22,14 @@ Searx can be added to your browser's search bar; moreover, it can be set as the

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! +

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

    -
  • github
    • +
  • github
  • ohloh
  • twitter
  • IRC: #searx @ freenode (webclient)
    • @@ -48,13 +48,13 @@ 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!

    Installation/WSGI support?

    -

    See the installation and setup wiki page

    +

    See the installation and uwsgi setup

    How to debug engines?

    Stats page contains some useful data about the engines used.

    diff --git a/searx/templates/courgette/github_ribbon.html b/searx/templates/courgette/github_ribbon.html index 67c6e678f..f6eaa123c 100644 --- a/searx/templates/courgette/github_ribbon.html +++ b/searx/templates/courgette/github_ribbon.html @@ -1,3 +1,3 @@ - + Fork me on GitHub - \ No newline at end of file + diff --git a/searx/templates/legacy/github_ribbon.html b/searx/templates/legacy/github_ribbon.html index bdd9cf180..f6eaa123c 100644 --- a/searx/templates/legacy/github_ribbon.html +++ b/searx/templates/legacy/github_ribbon.html @@ -1,3 +1,3 @@ - + Fork me on GitHub diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html index 9465ca58a..4fe335798 100644 --- a/searx/templates/oscar/base.html +++ b/searx/templates/oscar/base.html @@ -85,10 +85,10 @@ {% endblock %}

    - {{ _('Powered by') }} searx - {{ searx_version }} - {{ _('a privacy-respecting, hackable metasearch engine') }}
    - {{ _('Source code') }} | - {{ _('Issue tracker') }} | - {{ _('Public instances') }} + {{ _('Powered by') }} searx - {{ searx_version }} - {{ _('a privacy-respecting, hackable metasearch engine') }}
    + {{ _('Source code') }} | + {{ _('Issue tracker') }} | + {{ _('Public instances') }}

diff --git a/searx/templates/simple/base.html b/searx/templates/simple/base.html index bba02dbf8..b5b184071 100644 --- a/searx/templates/simple/base.html +++ b/searx/templates/simple/base.html @@ -51,9 +51,9 @@ -- cgit v1.2.3 From 33814719333c2c5b7b13ab47f9c8d4f8a0cecb16 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Wed, 25 Mar 2020 17:48:34 +0100 Subject: brands: add ISSUE_URL Signed-off-by: Markus Heiser --- searx/templates/oscar/base.html | 2 +- searx/templates/simple/base.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'searx/templates') diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html index 4fe335798..5eb4462e4 100644 --- a/searx/templates/oscar/base.html +++ b/searx/templates/oscar/base.html @@ -87,7 +87,7 @@ {{ _('Powered by') }} searx - {{ searx_version }} - {{ _('a privacy-respecting, hackable metasearch engine') }}
{{ _('Source code') }} | - {{ _('Issue tracker') }} | + {{ _('Issue tracker') }} | {{ _('Public instances') }}

diff --git a/searx/templates/simple/base.html b/searx/templates/simple/base.html index b5b184071..71df123ea 100644 --- a/searx/templates/simple/base.html +++ b/searx/templates/simple/base.html @@ -52,7 +52,7 @@

{{ _('Powered by') }} searx - {{ searx_version }} - {{ _('a privacy-respecting, hackable metasearch engine') }}
{{ _('Source code') }} | - {{ _('Issue tracker') }} | + {{ _('Issue tracker') }} | {{ _('Public instances') }}

-- cgit v1.2.3 From 3486613a1960f472b9cf8c85ade72c5aec9473eb Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Thu, 26 Mar 2020 10:58:25 +0100 Subject: brands: hardcode ISSUE_URL and some links on the about-page A *brand* of searx is a fork which might have its own design and some special functions which might bee reasonable in a special context. In this sense, the fork might have its own documentation but not its own issue tracker. The *upstream* of a brand is always https://github.com/asciimoo from where the brand-fork pulls the master branch regularly. A fork which has its own issue tracker is a spin-off and out of the scope of the searx project itself. The conclusion is: - hard code ISSUE_URL (in the Makefile) - always refer to DOCS_URL - links in the about page refer to the *upstream* (searx project) except DOCS_URL - "fork me on github" ribbons refer to the *upstream* Signed-off-by: Markus Heiser --- searx/templates/__common__/about.html | 11 +++++------ searx/templates/courgette/github_ribbon.html | 2 +- searx/templates/legacy/github_ribbon.html | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) (limited to 'searx/templates') diff --git a/searx/templates/__common__/about.html b/searx/templates/__common__/about.html index d8e1335d9..3f702e63f 100644 --- a/searx/templates/__common__/about.html +++ b/searx/templates/__common__/about.html @@ -7,7 +7,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

@@ -22,15 +22,14 @@ Searx can be added to your browser's search bar; moreover, it can be set as the

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! +

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

    -
  • github
    • -
  • ohloh
    • +
  • github
  • twitter
  • IRC: #searx @ freenode (webclient)
  • transifex
    • @@ -48,8 +47,8 @@ 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!

    diff --git a/searx/templates/courgette/github_ribbon.html b/searx/templates/courgette/github_ribbon.html index f6eaa123c..bdd9cf180 100644 --- a/searx/templates/courgette/github_ribbon.html +++ b/searx/templates/courgette/github_ribbon.html @@ -1,3 +1,3 @@ - + Fork me on GitHub diff --git a/searx/templates/legacy/github_ribbon.html b/searx/templates/legacy/github_ribbon.html index f6eaa123c..bdd9cf180 100644 --- a/searx/templates/legacy/github_ribbon.html +++ b/searx/templates/legacy/github_ribbon.html @@ -1,3 +1,3 @@ - + Fork me on GitHub -- cgit v1.2.3 From 5d087ee466750e51dfc9ff95a88402055ad71741 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Thu, 26 Mar 2020 13:09:29 +0100 Subject: Rewrite of the HTL *about* page The *about* page should only address higher-level issues that are important to each user. Signed-off-by: Markus Heiser --- searx/templates/__common__/about.html | 136 +++++++++++++++++++++------------- 1 file changed, 85 insertions(+), 51 deletions(-) (limited to 'searx/templates') diff --git a/searx/templates/__common__/about.html b/searx/templates/__common__/about.html index 3f702e63f..c912a8bd2 100644 --- a/searx/templates/__common__/about.html +++ b/searx/templates/__common__/about.html @@ -1,62 +1,96 @@ -

    About searx

    +

    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

    +

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

    -

    Technical details - How does it work?

    +

    More about searx ...

    -

    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 uwsgi setup

      - -

      How to debug engines?

      -

      Stats page contains some useful data about the engines used.

      +
    + +
    + +

    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. +

    + +

    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 +

    + +

    Can it be set as the default search engine?

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

    How to debug engines?

    + +

    + Stats page contains some useful data about the engines used. +

    + +

    How can I make it my own?

    + +

    + Searx appreciates your concern regarding logs, so take the + code from the orgin searx projekct and + run it yourself! +

    +

    + Add your searx instance to this list + of public searx instances to help other people reclaim their privacy and + make the Internet freer! The more decentralized the Internet is, the more + freedom we have! +

    + +

    Where are the docs & code of this instance?

    + +

    + See the {{ brand.DOCS_URL }} + and {{ brand.GIT_URL }} +

    {% include "__common__/aboutextend.html" ignore missing %} -- cgit v1.2.3 From 971752198156e6a2a4ade127032d35c54ea3563b Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Thu, 26 Mar 2020 13:45:37 +0100 Subject: Minor improvements of the HTML *about* page Signed-off-by: Markus Heiser --- searx/templates/__common__/about.html | 39 ++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 19 deletions(-) (limited to 'searx/templates') diff --git a/searx/templates/__common__/about.html b/searx/templates/__common__/about.html index c912a8bd2..5c91c3394 100644 --- a/searx/templates/__common__/about.html +++ b/searx/templates/__common__/about.html @@ -18,22 +18,6 @@
    -

    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. -

    -

    Why use searx?

      @@ -50,13 +34,30 @@ 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

    -

    Can it be set as the default search engine?

    +

    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 to set as the default search engine?

    Firefox
    @@ -65,7 +66,7 @@ searx as a search engine on any version of Firefox! (javascript required) -

    How to debug engines?

    +

    Where to find anonymous usage statistics of this instance ?

    Stats page contains some useful data about the engines used. @@ -75,7 +76,7 @@

    Searx appreciates your concern regarding logs, so take the - code from the orgin searx projekct and + code from the orgin searx project and run it yourself!

    -- cgit v1.2.3 From 4bb35e7ef53e1c3e738a185f89e6660211e3837a Mon Sep 17 00:00:00 2001 From: Dalf Date: Tue, 31 Mar 2020 16:52:52 +0200 Subject: [fix] template: fix typo in about.html --- searx/templates/__common__/about.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'searx/templates') diff --git a/searx/templates/__common__/about.html b/searx/templates/__common__/about.html index 5c91c3394..d3e8d06a6 100644 --- a/searx/templates/__common__/about.html +++ b/searx/templates/__common__/about.html @@ -76,7 +76,7 @@

    Searx appreciates your concern regarding logs, so take the - code from the orgin searx project and + code from the original searx project and run it yourself!

    -- cgit v1.2.3