on master help sign in
Lots of courgette modification
commit2fc1de54da6c81ab99240b2f69319dfc62d6dd2e authorCqoicebordel <Cqoicebordel@users.noreply.github.com> dateFri 16 Jan 2015, 00:56 (12 years ago) parent14447a0
15 files changed+192−176
searx/templates/courgette/about.html+2−2 searx/templates/courgette/base.html+32−31 searx/templates/courgette/categories.html+7−5 searx/templates/courgette/github_ribbon.html+1−1 searx/templates/courgette/index.html+4−4 searx/templates/courgette/preferences.html+53−55 searx/templates/courgette/result_templates/code.html+6−6 searx/templates/courgette/result_templates/default.html+9−9 searx/templates/courgette/result_templates/images.html+2−2 searx/templates/courgette/result_templates/map.html+10−10 searx/templates/courgette/result_templates/torrent.html+10−4 searx/templates/courgette/result_templates/videos.html+8−8 searx/templates/courgette/results.html+38−29 searx/templates/courgette/search.html+6−6 searx/templates/courgette/stats.html+4−4
searx/templates/courgette/about.html+2−2
@@ -1,6 +1,6 @@
1−{% extends 'default/base.html' %}
1+{% extends 'courgette/base.html' %}
22{% block content %}
3−{% include 'default/github_ribbon.html' %}
3+{% include 'courgette/github_ribbon.html' %}
44<div class="row">
55 <h1>About <a href="{{ url_for('index') }}">searx</a></h1>
66
searx/templates/courgette/base.html+32−31
@@ -1,33 +1,34 @@
11<!DOCTYPE html>
22<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
3−<head>
4− <meta charset="UTF-8" />
5− <meta name="description" content="Searx - a privacy-respecting, hackable metasearch engine" />
6− <meta name="keywords" content="searx, search, search engine, metasearch, meta search" />
7− <meta name="generator" content="searx/{{ searx_version }}">
8− <meta name="viewport" content="width=device-width, maximum-scale=1.0, user-scalable=1" />
9− <title>{% block title %}{% endblock %}searx</title>
10− <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}" type="text/css" media="screen" />
11− <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}?v=2" />
12− {% block styles %}
13− {% endblock %}
14− {% block head %}
15− <link title="searx" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/>
16− {% endblock %}
17− <script type="text/javascript">
18− searx = {};
19− searx.autocompleter = {% if autocomplete %}true{% else %}false{% endif %};
20− </script>
21−</head>
22−<body>
23−<div id="container">
24−{% block content %}
25−{% endblock %}
26−{% if autocomplete %}
27−<script src="{{ url_for('static', filename='js/mootools-core-1.4.5-min.js') }}" ></script>
28−<script src="{{ url_for('static', filename='js/mootools-autocompleter-1.1.2-min.js') }}" ></script>
29−{% endif %}
30−<script src="{{ url_for('static', filename='js/searx.js') }}" ></script>
31−</div>
32−</body>
33−</html>
3+ <head>
4+ <meta charset="UTF-8" />
5+ <meta name="description" content="Searx - a privacy-respecting, hackable metasearch engine" />
6+ <meta name="keywords" content="searx, search, search engine, metasearch, meta search" />
7+ <meta name="generator" content="searx/{{ searx_version }}">
8+ <meta name="viewport" content="width=device-width, maximum-scale=1.0, user-scalable=1" />
9+ <title>{% block title %}{% endblock %}searx</title>
10+ <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}" type="text/css" media="screen" />
11+ <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}?v=2" />
12+ {% block styles %}
13+ {% endblock %}
14+ {% block meta %}{% endblock %}
15+ {% block head %}
16+ <link title="searx" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/>
17+ {% endblock %}
18+ <script type="text/javascript">
19+ searx = {};
20+ searx.autocompleter = {% if autocomplete %}true{% else %}false{% endif %};
21+ </script>
22+ </head>
23+ <body>
24+ <div id="container">
25+ {% block content %}
26+ {% endblock %}
27+ {% if autocomplete %}
28+ <script src="{{ url_for('static', filename='js/mootools-core-1.4.5-min.js') }}" ></script>
29+ <script src="{{ url_for('static', filename='js/mootools-autocompleter-1.1.2-min.js') }}" ></script>
30+ {% endif %}
31+ <script src="{{ url_for('static', filename='js/searx.js') }}" ></script>
32+ </div>
33+ </body>
34+</html>
searx/templates/courgette/categories.html+7−5
@@ -1,7 +1,9 @@
11<div id="categories">
2−{% for category in categories %}
3− <div class="checkbox_container">
4− <input type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} /><label for="checkbox_{{ category|replace(' ', '_') }}">{{ _(category) }}</label>
2+ <div id="categories_container">
3+ {% for category in categories %}
4+ <div class="checkbox_container">
5+ <input type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} /><label for="checkbox_{{ category|replace(' ', '_') }}">{{ _(category) }}</label>
6+ </div>
7+ {% endfor %}
58 </div>
6−{% endfor %}
7−</div>
9+</div>
searx/templates/courgette/github_ribbon.html+1−1
@@ -1,3 +1,3 @@
11<a href="https://github.com/asciimoo/searx" class="github">
22 <img style="position: absolute; top: 0; right: 0; border: 0;" src="{{ url_for('static', filename='img/github_ribbon.png') }}" alt="Fork me on GitHub" class="github"/>
3−</a>
3+</a>
searx/templates/courgette/index.html+4−4
@@ -1,12 +1,12 @@
1−{% extends "default/base.html" %}
1+{% extends "courgette/base.html" %}
22{% block content %}
3−{% include 'default/github_ribbon.html' %}
3+{% include 'courgette/github_ribbon.html' %}
44<div class="center">
55 <div class="title"><h1>searx</h1></div>
6− {% include 'default/search.html' %}
6+ {% include 'courgette/search.html' %}
77 <p class="top_margin">
88 <a href="{{ url_for('about') }}" class="hmarg">{{ _('about') }}</a>
99 <a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a>
1010 </p>
1111</div>
12−{% endblock %}
12+{% endblock %}
searx/templates/courgette/preferences.html+53−55
@@ -1,4 +1,4 @@
1−{% extends "default/base.html" %}
1+{% extends "courgette/base.html" %}
22{% block head %} {% endblock %}
33{% block content %}
44<div class="row">
@@ -7,95 +7,93 @@
77 <form method="post" action="{{ url_for('preferences') }}" id="search_form">
88 <fieldset>
99 <legend>{{ _('Default categories') }}</legend>
10− <p>
11− {% include 'default/categories.html' %}
12− </p>
10+ {% include 'courgette/categories.html' %}
1311 </fieldset>
1412 <fieldset>
1513 <legend>{{ _('Search language') }}</legend>
1614 <p>
17− <select name='language'>
18− <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Automatic') }}</option>
19− {% for lang_id,lang_name,country_name in language_codes %}
20− <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>{{ lang_name }} ({{ country_name }}) - {{ lang_id }}</option>
21− {% endfor %}
22− </select>
15+ <select name='language'>
16+ <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Automatic') }}</option>
17+ {% for lang_id,lang_name,country_name in language_codes %}
18+ <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>{{ lang_name }} ({{ country_name }}) - {{ lang_id }}</option>
19+ {% endfor %}
20+ </select>
2321 </p>
2422 </fieldset>
2523 <fieldset>
2624 <legend>{{ _('Interface language') }}</legend>
2725 <p>
28− <select name='locale'>
29− {% for locale_id,locale_name in locales.items() %}
30− <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option>
31− {% endfor %}
32− </select>
26+ <select name='locale'>
27+ {% for locale_id,locale_name in locales.items() %}
28+ <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option>
29+ {% endfor %}
30+ </select>
3331 </p>
3432 </fieldset>
3533 <fieldset>
3634 <legend>{{ _('Autocomplete') }}</legend>
3735 <p>
38− <select name="autocomplete">
39− <option value=""> - </option>
40− {% for backend in autocomplete_backends %}
41− <option value="{{ backend }}" {% if backend == autocomplete %}selected="selected"{% endif %}>{{ backend }}</option>
42− {% endfor %}
43− </select>
36+ <select name="autocomplete">
37+ <option value=""> - </option>
38+ {% for backend in autocomplete_backends %}
39+ <option value="{{ backend }}" {% if backend == autocomplete %}selected="selected"{% endif %}>{{ backend }}</option>
40+ {% endfor %}
41+ </select>
4442 </p>
4543 </fieldset>
4644 <fieldset>
4745 <legend>{{ _('Method') }}</legend>
4846 <p>
49− <select name='method'>
50− <option value="POST" {% if method == 'POST' %}selected="selected"{% endif %}>POST</option>
51− <option value="GET" {% if method == 'GET' %}selected="selected"{% endif %}>GET</option>
52− </select>
47+ <select name='method'>
48+ <option value="POST" {% if method == 'POST' %}selected="selected"{% endif %}>POST</option>
49+ <option value="GET" {% if method == 'GET' %}selected="selected"{% endif %}>GET</option>
50+ </select>
5351 </p>
5452 </fieldset>
5553 <fieldset>
5654 <legend>{{ _('Themes') }}</legend>
5755 <p>
58− <select name="theme">
59− {% for name in themes %}
60− <option value="{{ name }}" {% if name == theme %}selected="selected"{% endif %}>{{ name }}</option>
61− {% endfor %}
62− </select>
56+ <select name="theme">
57+ {% for name in themes %}
58+ <option value="{{ name }}" {% if name == theme %}selected="selected"{% endif %}>{{ name }}</option>
59+ {% endfor %}
60+ </select>
6361 </p>
6462 </fieldset>
6563 <fieldset>
66− <legend>{{ _('Currently used search engines') }}</legend>
67−
68− <table>
69− <tr>
70− <th>{{ _('Engine name') }}</th>
71− <th>{{ _('Category') }}</th>
72− <th>{{ _('Allow') }} / {{ _('Block') }}</th>
73− </tr>
74− {% for (categ,search_engines) in categs %}
75− {% for search_engine in search_engines %}
64+ <legend>{{ _('Currently used search engines') }}</legend>
7665
77− {% if not search_engine.private %}
66+ <table>
7867 <tr>
79− <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})</td>
80− <td>{{ _(categ) }}</td>
81− <td class="engine_checkbox">
82− <input type="checkbox" id="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}"{% if search_engine.name in blocked_engines %} checked="checked"{% endif %} />
83− <label class="allow" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
84− <label class="deny" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
85− </td>
68+ <th>{{ _('Engine name') }}</th>
69+ <th>{{ _('Category') }}</th>
70+ <th>{{ _('Allow') }} / {{ _('Block') }}</th>
8671 </tr>
87− {% endif %}
72+ {% for (categ,search_engines) in categs %}
73+ {% for search_engine in search_engines %}
74+
75+ {% if not search_engine.private %}
76+ <tr>
77+ <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})</td>
78+ <td>{{ _(categ) }}</td>
79+ <td class="engine_checkbox">
80+ <input type="checkbox" id="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}"{% if search_engine.name in blocked_engines %} checked="checked"{% endif %} />
81+ <label class="allow" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
82+ <label class="deny" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
83+ </td>
84+ </tr>
85+ {% endif %}
86+ {% endfor %}
8887 {% endfor %}
89− {% endfor %}
90− </table>
88+ </table>
9189 </fieldset>
9290 <p class="small_font">{{ _('These settings are stored in your cookies, this allows us not to store this data about you.') }}
93− <br />
94− {{ _("These cookies serve your sole convenience, we don't use these cookies to track you.") }}
91+ <br />
92+ {{ _("These cookies serve your sole convenience, we don't use these cookies to track you.") }}
9593 </p>
9694
9795 <input type="submit" value="{{ _('save') }}" />
98− <div class="right preferences_back"><a href="{{ url_for('index') }}">{{ _('back') }}</a></div>
96+ <div class="right preferences_back"><a href="{{ url_for('index') }}">{{ _('back') }}</a></div>
9997 </form>
10098</div>
101−{% endblock %}
99+{% endblock %}
searx/templates/courgette/result_templates/code.html+6−6
@@ -1,9 +1,9 @@
11<div class="result {{ result.class }}">
2− <h3 class="result_title"> {% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
3− <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">cached</a></p>
4− {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
2+ <h3 class="result_title">{% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
3+ {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}
54 <p class="content">{% if result.img_src %}<img src="{{ result.img_src }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>
6− {% if result.repository %}<p class="result-content"><a href="{{ result.repository|safe }}">{{ result.repository }}</a></p>{% endif %}
7−
5+ {% if result.repository %}<p class="content"><a href="{{ result.repository|safe }}">{{ result.repository }}</a></p>{% endif %}
86 {{ result.codelines|code_highlighter(result.code_language)|safe }}
9−</div>
7+
8+ <p class="url">{{ result.pretty_url }}</p>
9+</div>
searx/templates/courgette/result_templates/default.html+9−9
@@ -1,13 +1,13 @@
11<div class="result {{ result.class }}">
22
3− {% if "icon_"~result.engine~".ico" in favicons %}
3+ {% if "icon_"~result.engine~".ico" in favicons %}
44 <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />
5− {% endif %}
5+ {% endif %}
66
7− <div>
8− <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
9− {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
10− <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p>
11− <p class="url">{{ result.pretty_url }}</p>
12− </div>
13−</div>
7+ <div>
8+ <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
9+ {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}
10+ <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p>
11+ <p class="url">{{ result.pretty_url }}</p>
12+ </div>
13+</div>
searx/templates/courgette/result_templates/images.html+2−2
@@ -1,6 +1,6 @@
11<div class="image_result">
22 <p>
33 <a href="{{ result.img_src }}"><img src="{{ result.img_src }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>
4− <span class="url"><a href="{{ result.url }}" class="small_font">original context</a></span>
4+ <span class="url"><a href="{{ result.url }}" class="small_font">{{ _('original context') }}</a></span>
55 </p>
6−</div>
6+</div>
searx/templates/courgette/result_templates/map.html+10−10
@@ -1,13 +1,13 @@
11<div class="result {{ result.class }}">
22
3− {% if "icon_"~result.engine~".ico" in favicons %}
4− <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />
5− {% endif %}
3+ {% if "icon_"~result.engine~".ico" in favicons %}
4+ <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />
5+ {% endif %}
66
7− <div>
8− <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
9− {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
10− <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p>
11− <p class="url">{{ result.pretty_url }}</p>
12− </div>
13−</div>
7+ <div>
8+ <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
9+ {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}
10+ <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p>
11+ <p class="url">{{ result.pretty_url }}</p>
12+ </div>
13+</div>
searx/templates/courgette/result_templates/torrent.html+10−4
@@ -1,7 +1,13 @@
11<div class="result torrent_result">
2+ {% if "icon_"~result.engine~".ico" in favicons %}
3+ <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />
4+ {% endif %}
25 <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
3− {% if result.content %}<p class="content">{{ result.content|safe }}</p>{% endif %}
4− <p class="stats">Seed: {{ result.seed }}, Leech: {{ result.leech }}</p>
5− <p><a href="{{ result.magnetlink }}" class="magnetlink">magnet link</a></p>
6+ {% if result.content %}<span class="content">{{ result.content|safe }}</span><br />{% endif %}
7+ <span class="stats">{{ _('Seeder') }} : {{ result.seed }}, {{ _('Leecher') }} : {{ result.leech }}</span><br />
8+ <span>
9+ {% if result.magnetlink %}<a href="{{ result.magnetlink }}" class="magnetlink">{{ _('magnet link') }}</a>{% endif %}
10+ {% if result.torrentfile %}<a href="{{ result.torrentfile }}" class="torrentfile">{{ _('torrent file') }}</a>{% endif %}
11+ </span>
612 <p class="url">{{ result.pretty_url }}</p>
7−</div>
13+</div>
searx/templates/courgette/result_templates/videos.html+8−8
@@ -1,10 +1,10 @@
11<div class="result">
2− {% if "icon_"~result.engine~".ico" in favicons %}
3− <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />
4− {% endif %}
2+ {% if "icon_"~result.engine~".ico" in favicons %}
3+ <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />
4+ {% endif %}
55
6− <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
7− {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
8− <a href="{{ result.url }}"><img width="400" src="{{ result.thumbnail }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>
9− <p class="url">{{ result.url }}</p>
10−</div>
6+ <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
7+ {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span><br />{% endif %}
8+ <a href="{{ result.url }}"><img width="400" src="{{ result.thumbnail }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>
9+ <p class="url">{{ result.pretty_url }}</p>
10+</div>
searx/templates/courgette/results.html+38−29
@@ -1,9 +1,10 @@
1−{% extends "default/base.html" %}
1+{% extends "courgette/base.html" %}
22{% block title %}{{ q }} - {% endblock %}
3+{% block meta %}<link rel="alternate" type="application/rss+xml" title="Searx search: {{ q }}" href="{{ url_for('index') }}?q={{ q|urlencode }}&amp;format=rss&amp;{% for category in selected_categories %}category_{{ category }}=1&amp;{% endfor %}pageno={{ pageno }}">{% endblock %}
34{% block content %}
4−<div class="right"><a href="{{ url_for('preferences') }}" id="preferences"><span>preferences</span></a></div>
5+<div class="right"><a href="{{ url_for('preferences') }}" id="preferences"><span>{{ _('preferences') }}</span></a></div>
56<div class="small search center">
6− {% include 'default/search.html' %}
7+ {% include 'courgette/search.html' %}
78</div>
89<div id="results">
910 <div id="sidebar">
@@ -13,22 +14,30 @@
1314 <input type="text" value="{{ base_url }}?q={{ q|urlencode }}&amp;pageno={{ pageno }}{% if selected_categories %}&amp;category_{{ selected_categories|join("&category_")|replace(' ','+') }}{% endif %}" readonly />
1415 </div>
1516 <div id="apis">
16− {{ _('Download results') }}
17− {% for output_type in ('csv', 'json', 'rss') %}
18− <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
19− <div class="left">
20− <input type="hidden" name="q" value="{{ q }}" />
21− <input type="hidden" name="format" value="{{ output_type }}" />
22− {% for category in selected_categories %}
23− <input type="hidden" name="category_{{ category }}" value="1"/>
17+ {{ _('Download results') }}
18+ {% for output_type in ('csv', 'json', 'rss') %}
19+ <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
20+ <div class="left">
21+ <input type="hidden" name="q" value="{{ q }}" />
22+ <input type="hidden" name="format" value="{{ output_type }}" />
23+ {% for category in selected_categories %}
24+ <input type="hidden" name="category_{{ category }}" value="1"/>
25+ {% endfor %}
26+ <input type="hidden" name="pageno" value="{{ pageno }}" />
27+ <input type="submit" value="{{ output_type }}" />
28+ </div>
29+ </form>
2430 {% endfor %}
25− <input type="hidden" name="pageno" value="{{ pageno }}" />
26− <input type="submit" value="{{ output_type }}" />
27− </div>
28− </form>
29− {% endfor %}
3031 </div>
3132 </div>
33+
34+ {% if answers %}
35+ <div id="answers" class=""><span>{{ _('Answers') }}</span>
36+ {% for answer in answers %}
37+ <span>{{ answer }}</span>
38+ {% endfor %}
39+ </div>
40+ {% endif %}
3241
3342 {% if suggestions %}
3443 <div id="suggestions"><span>{{ _('Suggestions') }}</span>
@@ -54,26 +63,26 @@
5463 {% if pageno > 1 %}
5564 <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
5665 <div class="left">
57− <input type="hidden" name="q" value="{{ q }}" />
58− {% for category in selected_categories %}
59− <input type="hidden" name="category_{{ category }}" value="1"/>
60− {% endfor %}
61− <input type="hidden" name="pageno" value="{{ pageno-1 }}" />
62− <input type="submit" value="<< {{ _('previous page') }}" />
66+ <input type="hidden" name="q" value="{{ q }}" />
67+ {% for category in selected_categories %}
68+ <input type="hidden" name="category_{{ category }}" value="1"/>
69+ {% endfor %}
70+ <input type="hidden" name="pageno" value="{{ pageno-1 }}" />
71+ <input type="submit" value="<< {{ _('previous page') }}" />
6372 </div>
6473 </form>
6574 {% endif %}
6675 <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
6776 <div class="left">
68− {% for category in selected_categories %}
69− <input type="hidden" name="category_{{ category }}" value="1"/>
70− {% endfor %}
71− <input type="hidden" name="q" value="{{ q }}" />
72− <input type="hidden" name="pageno" value="{{ pageno+1 }}" />
73− <input type="submit" value="{{ _('next page') }} >>" />
77+ {% for category in selected_categories %}
78+ <input type="hidden" name="category_{{ category }}" value="1"/>
79+ {% endfor %}
80+ <input type="hidden" name="q" value="{{ q }}" />
81+ <input type="hidden" name="pageno" value="{{ pageno+1 }}" />
82+ <input type="submit" value="{{ _('next page') }} >>" />
7483 </div>
7584 </form>
7685 </div>
7786 {% endif %}
7887</div>
79−{% endblock %}
88+{% endblock %}
searx/templates/courgette/search.html+6−6
@@ -1,7 +1,7 @@
11<form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" id="search_form">
2− <div id="search_wrapper">
3− <input type="text" placeholder="{{ _('Search for...') }}" id="q" class="q" name="q" tabindex="1" autocomplete="off" {% if q %}value="{{ q }}"{% endif %}/>
4− <input type="submit" value="search" id="search_submit" />
5− </div>
6− {% include 'default/categories.html' %}
7−</form>
2+ <div id="search_wrapper">
3+ <input type="text" placeholder="{{ _('Search for...') }}" id="q" class="q" name="q" tabindex="1" autocomplete="off" {% if q %}value="{{ q }}"{% endif %}/>
4+ <input type="submit" value="search" id="search_submit" />
5+ </div>
6+ {% include 'courgette/categories.html' %}
7+</form>
searx/templates/courgette/stats.html+4−4
@@ -1,4 +1,4 @@
1−{% extends "default/base.html" %}
1+{% extends "courgette/base.html" %}
22{% block head %} {% endblock %}
33{% block content %}
44<h2>{{ _('Engine stats') }}</h2>
@@ -6,8 +6,8 @@
66{% for stat_name,stat_category in stats %}
77<div class="left">
88 <table>
9− <tr colspan="3">
10− <th>{{ stat_name }}</th>
9+ <tr>
10+ <th colspan="3">{{ stat_name }}</th>
1111 </tr>
1212 {% for engine in stat_category %}
1313 <tr>
@@ -19,4 +19,4 @@
1919 </table>
2020</div>
2121{% endfor %}
22−{% endblock %}
22+{% endblock %}