free
/
searx
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 11 Wiki Activity
Browse Source

Merge pull request #664 from kvch/uncapitalize-searx 

uncapitalize searx in templates
Adam Tauber 8 years ago
parent
13bed1f872 4bd44cd98f
commit
f693a54ad7
11 changed files with 31 additions and 31 deletions
Unified View Show Diff Stats
  1. 6
    6
      searx/templates/courgette/about.html
  2. 1
    1
      searx/templates/courgette/base.html
  3. 6
    6
      searx/templates/default/about.html
  4. 1
    1
      searx/templates/default/base.html
  5. 6
    6
      searx/templates/oscar/about.html
  6. 1
    1
      searx/templates/oscar/base.html
  7. 6
    6
      searx/templates/pix-art/about.html
  8. 1
    1
      searx/templates/pix-art/base.html
  9. 1
    1
      searx/templates/pix-art/index.html
  10. 1
    1
      searx/templates/pix-art/results.html
  11. 1
    1
      tests/robot/test_basic.robot

+ 6
- 6
searx/templates/courgette/about.html View File

6
6
7 
     <p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>, aggregating the results of other <a href="{{ url_for('preferences') }}">search engines</a> while not storing information about its users.
 7 
     <p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>, aggregating the results of other <a href="{{ url_for('preferences') }}">search engines</a> while not storing information about its users.
8 
     </p>
 8 
     </p>
9 
-    <h2>Why use Searx?</h2>
9 
+    <h2>Why use searx?</h2>
10 
     <ul>
 10 
     <ul>
11 
-        <li>Searx may not offer you as personalised results as Google, but it doesn't generate a profile about you</li>
12 
-        <li>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</li>
13 
-        <li>Searx is free software, the code is 100% open and you can help to make it better. See more on <a href="https://github.com/asciimoo/searx">github</a></li>
11 
+        <li>searx may not offer you as personalised results as Google, but it doesn't generate a profile about you</li>
12 
+        <li>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</li>
13 
+        <li>searx is free software, the code is 100% open and you can help to make it better. See more on <a href="https://github.com/asciimoo/searx">github</a></li>
14 
     </ul>
 14 
     </ul>
15 
     <p>If you do care about privacy, want to be a conscious user, or otherwise believe
 15 
     <p>If you do care about privacy, want to be a conscious user, or otherwise believe
16 
-    in digital freedom, make Searx your default search engine or run it on your own server</p>
16 
+    in digital freedom, make searx your default search engine or run it on your own server</p>
17
17
18 
 <h2>Technical details - How does it work?</h2>
 18 
 <h2>Technical details - How does it work?</h2>
19
19
20 
 <p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>,
 20 
 <p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>,
21 
 inspired by the <a href="http://seeks-project.info/">seeks project</a>.<br />
 21 
 inspired by the <a href="http://seeks-project.info/">seeks project</a>.<br />
22 
-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.<br />
22 
+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.<br />
23 
 Searx can be added to your browser's search bar; moreover, it can be set as the default search engine.
 23 
 Searx can be added to your browser's search bar; moreover, it can be set as the default search engine.
24 
 </p>
 24 
 </p>
25
25

+ 1
- 1
searx/templates/courgette/base.html View File

2 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"{% if rtl %} dir="rtl"{% endif %}>
 2 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"{% if rtl %} dir="rtl"{% endif %}>
3 
     <head>
 3 
     <head>
4 
         <meta charset="UTF-8" />
 4 
         <meta charset="UTF-8" />
5 
-        <meta name="description" content="Searx - a privacy-respecting, hackable metasearch engine" />
5 
+        <meta name="description" content="searx - a privacy-respecting, hackable metasearch engine" />
6 
         <meta name="keywords" content="searx, search, search engine, metasearch, meta search" />
 6 
         <meta name="keywords" content="searx, search, search engine, metasearch, meta search" />
7 
         <meta name="generator" content="searx/{{ searx_version }}">
 7 
         <meta name="generator" content="searx/{{ searx_version }}">
8 
         <meta name="referrer" content="no-referrer">
 8 
         <meta name="referrer" content="no-referrer">

+ 6
- 6
searx/templates/default/about.html View File

6
6
7 
     <p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>, aggregating the results of other <a href="{{ url_for('preferences') }}">search engines</a> while not storing information about its users.
 7 
     <p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>, aggregating the results of other <a href="{{ url_for('preferences') }}">search engines</a> while not storing information about its users.
8 
     </p>
 8 
     </p>
9 
-    <h2>Why use Searx?</h2>
9 
+    <h2>Why use searx?</h2>
10 
     <ul>
 10 
     <ul>
11 
-        <li>Searx may not offer you as personalised results as Google, but it doesn't generate a profile about you</li>
12 
-        <li>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</li>
13 
-        <li>Searx is free software, the code is 100% open and you can help to make it better. See more on <a href="https://github.com/asciimoo/searx">github</a></li>
11 
+        <li>searx may not offer you as personalised results as Google, but it doesn't generate a profile about you</li>
12 
+        <li>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</li>
13 
+        <li>searx is free software, the code is 100% open and you can help to make it better. See more on <a href="https://github.com/asciimoo/searx">github</a></li>
14 
     </ul>
 14 
     </ul>
15 
     <p>If you do care about privacy, want to be a conscious user, or otherwise believe
 15 
     <p>If you do care about privacy, want to be a conscious user, or otherwise believe
16 
-    in digital freedom, make Searx your default search engine or run it on your own server</p>
16 
+    in digital freedom, make searx your default search engine or run it on your own server</p>
17
17
18 
 <h2>Technical details - How does it work?</h2>
 18 
 <h2>Technical details - How does it work?</h2>
19
19
20 
 <p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>,
 20 
 <p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>,
21 
 inspired by the <a href="http://seeks-project.info/">seeks project</a>.<br />
 21 
 inspired by the <a href="http://seeks-project.info/">seeks project</a>.<br />
22 
-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, if Searx used from the search bar it performs GET requests.<br />
22 
+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, if searx used from the search bar it performs GET requests.<br />
23 
 Searx can be added to your browser's search bar; moreover, it can be set as the default search engine.
 23 
 Searx can be added to your browser's search bar; moreover, it can be set as the default search engine.
24 
 </p>
 24 
 </p>
25
25

+ 1
- 1
searx/templates/default/base.html View File

2 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"{% if rtl %} dir="rtl"{% endif %}>
 2 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"{% if rtl %} dir="rtl"{% endif %}>
3 
     <head>
 3 
     <head>
4 
         <meta charset="UTF-8" />
 4 
         <meta charset="UTF-8" />
5 
-        <meta name="description" content="Searx - a privacy-respecting, hackable metasearch engine" />
5 
+        <meta name="description" content="searx - a privacy-respecting, hackable metasearch engine" />
6 
         <meta name="keywords" content="searx, search, search engine, metasearch, meta search" />
 6 
         <meta name="keywords" content="searx, search, search engine, metasearch, meta search" />
7 
         <meta name="generator" content="searx/{{ searx_version }}">
 7 
         <meta name="generator" content="searx/{{ searx_version }}">
8 
         <meta name="referrer" content="no-referrer">
 8 
         <meta name="referrer" content="no-referrer">

+ 6
- 6
searx/templates/oscar/about.html View File

7
7
8 
     <p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>, aggregating the results of other <a href="{{ url_for('preferences') }}">search engines</a> while not storing information about its users.
 8 
     <p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>, aggregating the results of other <a href="{{ url_for('preferences') }}">search engines</a> while not storing information about its users.
9 
     </p>
 9 
     </p>
10 
-    <h2>Why use Searx?</h2>
10 
+    <h2>Why use searx?</h2>
11 
     <ul>
 11 
     <ul>
12 
-        <li>Searx may not offer you as personalised results as Google, but it doesn't generate a profile about you</li>
13 
-        <li>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</li>
14 
-        <li>Searx is free software, the code is 100% open and you can help to make it better. See more on <a href="https://github.com/asciimoo/searx">github</a></li>
12 
+        <li>searx may not offer you as personalised results as Google, but it doesn't generate a profile about you</li>
13 
+        <li>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</li>
14 
+        <li>searx is free software, the code is 100% open and you can help to make it better. See more on <a href="https://github.com/asciimoo/searx">github</a></li>
15 
     </ul>
 15 
     </ul>
16 
     <p>If you do care about privacy, want to be a conscious user, or otherwise believe
 16 
     <p>If you do care about privacy, want to be a conscious user, or otherwise believe
17 
-    in digital freedom, make Searx your default search engine or run it on your own server</p>
17 
+    in digital freedom, make searx your default search engine or run it on your own server</p>
18
18
19 
 <h2>Technical details - How does it work?</h2>
 19 
 <h2>Technical details - How does it work?</h2>
20
20
21 
 <p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>,
 21 
 <p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>,
22 
 inspired by the <a href="http://seeks-project.info/">seeks project</a>.<br />
 22 
 inspired by the <a href="http://seeks-project.info/">seeks project</a>.<br />
23 
-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.<br />
23 
+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.<br />
24 
 Searx can be added to your browser's search bar; moreover, it can be set as the default search engine.
 24 
 Searx can be added to your browser's search bar; moreover, it can be set as the default search engine.
25 
 </p>
 25 
 </p>
26
26

+ 1
- 1
searx/templates/oscar/base.html View File

2 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"{% if rtl %} dir="rtl"{% endif %}>
 2 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"{% if rtl %} dir="rtl"{% endif %}>
3 
 <head>
 3 
 <head>
4 
     <meta charset="UTF-8" />
 4 
     <meta charset="UTF-8" />
5 
-    <meta name="description" content="Searx - a privacy-respecting, hackable metasearch engine" />
5 
+    <meta name="description" content="searx - a privacy-respecting, hackable metasearch engine" />
6 
     <meta name="keywords" content="searx, search, search engine, metasearch, meta search" />
 6 
     <meta name="keywords" content="searx, search, search engine, metasearch, meta search" />
7 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 7 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
8 
     <meta name="generator" content="searx/{{ searx_version }}">
 8 
     <meta name="generator" content="searx/{{ searx_version }}">

+ 6
- 6
searx/templates/pix-art/about.html View File

5
5
6 
     <p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>, aggregating the results of other <a href="{{ url_for('preferences') }}">search engines</a> while not storing information about its users.
 6 
     <p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>, aggregating the results of other <a href="{{ url_for('preferences') }}">search engines</a> while not storing information about its users.
7 
     </p>
 7 
     </p>
8 
-    <h2>Why use Searx?</h2>
8 
+    <h2>Why use searx?</h2>
9 
     <ul>
 9 
     <ul>
10 
-        <li>Searx may not offer you as personalised results as Google, but it doesn't generate a profile about you</li>
11 
-        <li>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</li>
12 
-        <li>Searx is free software, the code is 100% open and you can help to make it better. See more on <a href="https://github.com/asciimoo/searx">github</a></li>
10 
+        <li>searx may not offer you as personalised results as Google, but it doesn't generate a profile about you</li>
11 
+        <li>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</li>
12 
+        <li>searx is free software, the code is 100% open and you can help to make it better. See more on <a href="https://github.com/asciimoo/searx">github</a></li>
13 
     </ul>
 13 
     </ul>
14 
     <p>If you do care about privacy, want to be a conscious user, or otherwise believe
 14 
     <p>If you do care about privacy, want to be a conscious user, or otherwise believe
15 
-    in digital freedom, make Searx your default search engine or run it on your own server</p>
15 
+    in digital freedom, make searx your default search engine or run it on your own server</p>
16
16
17 
 <h2>Technical details - How does it work?</h2>
 17 
 <h2>Technical details - How does it work?</h2>
18
18
19 
 <p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>,
 19 
 <p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>,
20 
 inspired by the <a href="http://seeks-project.info/">seeks project</a>.<br />
 20 
 inspired by the <a href="http://seeks-project.info/">seeks project</a>.<br />
21 
-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, if Searx used from the search bar it performs GET requests.<br />
21 
+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, if searx used from the search bar it performs GET requests.<br />
22 
 Searx can be added to your browser's search bar; moreover, it can be set as the default search engine.
 22 
 Searx can be added to your browser's search bar; moreover, it can be set as the default search engine.
23 
 </p>
 23 
 </p>
24
24

+ 1
- 1
searx/templates/pix-art/base.html View File

2 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"{% if rtl %} dir="rtl"{% endif %}>
 2 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"{% if rtl %} dir="rtl"{% endif %}>
3 
     <head>
 3 
     <head>
4 
         <meta charset="UTF-8" />
 4 
         <meta charset="UTF-8" />
5 
-        <meta name="description" content="Searx - a privacy-respecting, hackable metasearch engine" />
5 
+        <meta name="description" content="searx - a privacy-respecting, hackable metasearch engine" />
6 
         <meta name="keywords" content="searx, search, search engine, metasearch, meta search" />
 6 
         <meta name="keywords" content="searx, search, search engine, metasearch, meta search" />
7 
         <meta name="generator" content="searx/{{ searx_version }}">
 7 
         <meta name="generator" content="searx/{{ searx_version }}">
8 
         <meta name="referrer" content="no-referrer">
 8 
         <meta name="referrer" content="no-referrer">

+ 1
- 1
searx/templates/pix-art/index.html View File

1 
 {% extends "pix-art/base.html" %}
 1 
 {% extends "pix-art/base.html" %}
2 
 {% block content %}
 2 
 {% block content %}
3 
 <div class="center">
 3 
 <div class="center">
4 
-    <div class="title"><h1><img src="{{ url_for('static', filename='img/searx-pixel.png') }}" alt="Searx Logo"/></h1></div>
4 
+    <div class="title"><h1><img src="{{ url_for('static', filename='img/searx-pixel.png') }}" alt="searx Logo"/></h1></div>
5 
     {% include 'pix-art/search.html' %}
 5 
     {% include 'pix-art/search.html' %}
6 
     <p class="top_margin">
 6 
     <p class="top_margin">
7 
         <a href="{{ url_for('about') }}" class="hmarg">{{ _('about') }}</a>
 7 
         <a href="{{ url_for('about') }}" class="hmarg">{{ _('about') }}</a>

+ 1
- 1
searx/templates/pix-art/results.html View File

8 
 {% block title %}{{ q }} - {% endblock %}
 8 
 {% block title %}{{ q }} - {% endblock %}
9 
 {% block meta %}{% endblock %}
 9 
 {% block meta %}{% endblock %}
10 
 {% block content %}
 10 
 {% block content %}
11 
-<div id="logo"><a href="./"><img src="{{ url_for('static', filename='img/searx-pixel-small.png') }}" alt="Searx Logo"/></a></div>
11 
+<div id="logo"><a href="./"><img src="{{ url_for('static', filename='img/searx-pixel-small.png') }}" alt="searx Logo"/></a></div>
12 
 <div class="preferences_container right"><a href="{{ url_for('preferences') }}" id="preferences"><span>preferences</span></a></div>
 12 
 <div class="preferences_container right"><a href="{{ url_for('preferences') }}" id="preferences"><span>preferences</span></a></div>
13 
 <div class="small search center">
 13 
 <div class="small search center">
14 
     {% include 'pix-art/search.html' %}
 14 
     {% include 'pix-art/search.html' %}

+ 1
- 1
tests/robot/test_basic.robot View File

11
11
12 
 About page
 12 
 About page
13 
     Click Element  link=about
 13 
     Click Element  link=about
14 
-    Page Should Contain  Why use Searx?
14 
+    Page Should Contain  Why use searx?
15 
     Page Should Contain Element  link=search engines
 15 
     Page Should Contain Element  link=search engines
16
16
17 
 Preferences page
 17 
 Preferences page