commit: 2fc1de54da6c81ab99240b2f69319dfc62d6dd2e parent 14447a0761220ec352c889c9bc3d4ba22ee3494e Author: Cqoicebordel <Cqoicebordel@users.noreply.github.com> Date: Fri, 16 Jan 2015 00:56:54 +0100 Lots of courgette modificationDiffstat:
15 files changed, 206 insertions(+), 176 deletions(-)diff --git a/searx/templates/courgette/about.html b/searx/templates/courgette/about.html@@ -1,6 +1,6 @@ -{% extends 'default/base.html' %} +{% extends 'courgette/base.html' %} {% block content %} -{% include 'default/github_ribbon.html' %} +{% include 'courgette/github_ribbon.html' %} <div class="row"> <h1>About <a href="{{ url_for('index') }}">searx</a></h1>diff --git a/searx/templates/courgette/base.html b/searx/templates/courgette/base.html@@ -1,33 +1,34 @@ <!DOCTYPE html> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> -<head> - <meta charset="UTF-8" /> - <meta name="description" content="Searx - a privacy-respecting, hackable metasearch engine" /> - <meta name="keywords" content="searx, search, search engine, metasearch, meta search" /> - <meta name="generator" content="searx/{{ searx_version }}"> - <meta name="viewport" content="width=device-width, maximum-scale=1.0, user-scalable=1" /> - <title>{% block title %}{% endblock %}searx</title> - <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}" type="text/css" media="screen" /> - <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}?v=2" /> - {% block styles %} - {% endblock %} - {% block head %} - <link title="searx" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/> - {% endblock %} - <script type="text/javascript"> - searx = {}; - searx.autocompleter = {% if autocomplete %}true{% else %}false{% endif %}; - </script> -</head> -<body> -<div id="container"> -{% block content %} -{% endblock %} -{% if autocomplete %} -<script src="{{ url_for('static', filename='js/mootools-core-1.4.5-min.js') }}" ></script> -<script src="{{ url_for('static', filename='js/mootools-autocompleter-1.1.2-min.js') }}" ></script> -{% endif %} -<script src="{{ url_for('static', filename='js/searx.js') }}" ></script> -</div> -</body> -</html> + <head> + <meta charset="UTF-8" /> + <meta name="description" content="Searx - a privacy-respecting, hackable metasearch engine" /> + <meta name="keywords" content="searx, search, search engine, metasearch, meta search" /> + <meta name="generator" content="searx/{{ searx_version }}"> + <meta name="viewport" content="width=device-width, maximum-scale=1.0, user-scalable=1" /> + <title>{% block title %}{% endblock %}searx</title> + <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}" type="text/css" media="screen" /> + <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}?v=2" /> + {% block styles %} + {% endblock %} + {% block meta %}{% endblock %} + {% block head %} + <link title="searx" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/> + {% endblock %} + <script type="text/javascript"> + searx = {}; + searx.autocompleter = {% if autocomplete %}true{% else %}false{% endif %}; + </script> + </head> + <body> + <div id="container"> + {% block content %} + {% endblock %} + {% if autocomplete %} + <script src="{{ url_for('static', filename='js/mootools-core-1.4.5-min.js') }}" ></script> + <script src="{{ url_for('static', filename='js/mootools-autocompleter-1.1.2-min.js') }}" ></script> + {% endif %} + <script src="{{ url_for('static', filename='js/searx.js') }}" ></script> + </div> + </body> +</html> +\ No newline at end of filediff --git a/searx/templates/courgette/categories.html b/searx/templates/courgette/categories.html@@ -1,7 +1,9 @@ <div id="categories"> -{% for category in categories %} - <div class="checkbox_container"> - <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> + <div id="categories_container"> + {% for category in categories %} + <div class="checkbox_container"> + <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> + </div> + {% endfor %} </div> -{% endfor %} -</div> +</div> +\ No newline at end of filediff --git a/searx/templates/courgette/github_ribbon.html b/searx/templates/courgette/github_ribbon.html@@ -1,3 +1,3 @@ <a href="https://github.com/asciimoo/searx" class="github"> <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"/> -</a> +</a> +\ No newline at end of filediff --git a/searx/templates/courgette/index.html b/searx/templates/courgette/index.html@@ -1,12 +1,12 @@ -{% extends "default/base.html" %} +{% extends "courgette/base.html" %} {% block content %} -{% include 'default/github_ribbon.html' %} +{% include 'courgette/github_ribbon.html' %} <div class="center"> <div class="title"><h1>searx</h1></div> - {% include 'default/search.html' %} + {% include 'courgette/search.html' %} <p class="top_margin"> <a href="{{ url_for('about') }}" class="hmarg">{{ _('about') }}</a> <a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a> </p> </div> -{% endblock %} +{% endblock %} +\ No newline at end of filediff --git a/searx/templates/courgette/preferences.html b/searx/templates/courgette/preferences.html@@ -1,4 +1,4 @@ -{% extends "default/base.html" %} +{% extends "courgette/base.html" %} {% block head %} {% endblock %} {% block content %} <div class="row"> @@ -7,95 +7,93 @@ <form method="post" action="{{ url_for('preferences') }}" id="search_form"> <fieldset> <legend>{{ _('Default categories') }}</legend> - <p> - {% include 'default/categories.html' %} - </p> + {% include 'courgette/categories.html' %} </fieldset> <fieldset> <legend>{{ _('Search language') }}</legend> <p> - <select name='language'> - <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Automatic') }}</option> - {% for lang_id,lang_name,country_name in language_codes %} - <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>{{ lang_name }} ({{ country_name }}) - {{ lang_id }}</option> - {% endfor %} - </select> + <select name='language'> + <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Automatic') }}</option> + {% for lang_id,lang_name,country_name in language_codes %} + <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>{{ lang_name }} ({{ country_name }}) - {{ lang_id }}</option> + {% endfor %} + </select> </p> </fieldset> <fieldset> <legend>{{ _('Interface language') }}</legend> <p> - <select name='locale'> - {% for locale_id,locale_name in locales.items() %} - <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option> - {% endfor %} - </select> + <select name='locale'> + {% for locale_id,locale_name in locales.items() %} + <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option> + {% endfor %} + </select> </p> </fieldset> <fieldset> <legend>{{ _('Autocomplete') }}</legend> <p> - <select name="autocomplete"> - <option value=""> - </option> - {% for backend in autocomplete_backends %} - <option value="{{ backend }}" {% if backend == autocomplete %}selected="selected"{% endif %}>{{ backend }}</option> - {% endfor %} - </select> + <select name="autocomplete"> + <option value=""> - </option> + {% for backend in autocomplete_backends %} + <option value="{{ backend }}" {% if backend == autocomplete %}selected="selected"{% endif %}>{{ backend }}</option> + {% endfor %} + </select> </p> </fieldset> <fieldset> <legend>{{ _('Method') }}</legend> <p> - <select name='method'> - <option value="POST" {% if method == 'POST' %}selected="selected"{% endif %}>POST</option> - <option value="GET" {% if method == 'GET' %}selected="selected"{% endif %}>GET</option> - </select> + <select name='method'> + <option value="POST" {% if method == 'POST' %}selected="selected"{% endif %}>POST</option> + <option value="GET" {% if method == 'GET' %}selected="selected"{% endif %}>GET</option> + </select> </p> </fieldset> <fieldset> <legend>{{ _('Themes') }}</legend> <p> - <select name="theme"> - {% for name in themes %} - <option value="{{ name }}" {% if name == theme %}selected="selected"{% endif %}>{{ name }}</option> - {% endfor %} - </select> + <select name="theme"> + {% for name in themes %} + <option value="{{ name }}" {% if name == theme %}selected="selected"{% endif %}>{{ name }}</option> + {% endfor %} + </select> </p> </fieldset> <fieldset> - <legend>{{ _('Currently used search engines') }}</legend> - - <table> - <tr> - <th>{{ _('Engine name') }}</th> - <th>{{ _('Category') }}</th> - <th>{{ _('Allow') }} / {{ _('Block') }}</th> - </tr> - {% for (categ,search_engines) in categs %} - {% for search_engine in search_engines %} + <legend>{{ _('Currently used search engines') }}</legend> - {% if not search_engine.private %} + <table> <tr> - <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})</td> - <td>{{ _(categ) }}</td> - <td class="engine_checkbox"> - <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 %} /> - <label class="allow" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label> - <label class="deny" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label> - </td> + <th>{{ _('Engine name') }}</th> + <th>{{ _('Category') }}</th> + <th>{{ _('Allow') }} / {{ _('Block') }}</th> </tr> - {% endif %} + {% for (categ,search_engines) in categs %} + {% for search_engine in search_engines %} + + {% if not search_engine.private %} + <tr> + <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})</td> + <td>{{ _(categ) }}</td> + <td class="engine_checkbox"> + <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 %} /> + <label class="allow" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label> + <label class="deny" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label> + </td> + </tr> + {% endif %} + {% endfor %} {% endfor %} - {% endfor %} - </table> + </table> </fieldset> <p class="small_font">{{ _('These settings are stored in your cookies, this allows us not to store this data about you.') }} - <br /> - {{ _("These cookies serve your sole convenience, we don't use these cookies to track you.") }} + <br /> + {{ _("These cookies serve your sole convenience, we don't use these cookies to track you.") }} </p> <input type="submit" value="{{ _('save') }}" /> - <div class="right preferences_back"><a href="{{ url_for('index') }}">{{ _('back') }}</a></div> + <div class="right preferences_back"><a href="{{ url_for('index') }}">{{ _('back') }}</a></div> </form> </div> -{% endblock %} +{% endblock %} +\ No newline at end of filediff --git a/searx/templates/courgette/result_templates/code.html b/searx/templates/courgette/result_templates/code.html@@ -1,9 +1,9 @@ <div class="result {{ result.class }}"> - <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> - <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">cached</a></p> - {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %} + <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> + {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %} <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> - {% if result.repository %}<p class="result-content"><a href="{{ result.repository|safe }}">{{ result.repository }}</a></p>{% endif %} - + {% if result.repository %}<p class="content"><a href="{{ result.repository|safe }}">{{ result.repository }}</a></p>{% endif %} {{ result.codelines|code_highlighter(result.code_language)|safe }} -</div> + + <p class="url">{{ result.pretty_url }}</p> +</div> +\ No newline at end of filediff --git a/searx/templates/courgette/result_templates/default.html b/searx/templates/courgette/result_templates/default.html@@ -1,13 +1,13 @@ <div class="result {{ result.class }}"> - {% if "icon_"~result.engine~".ico" in favicons %} + {% if "icon_"~result.engine~".ico" in favicons %} <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" /> - {% endif %} + {% endif %} - <div> - <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3> - {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %} - <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p> - <p class="url">{{ result.pretty_url }}</p> - </div> -</div> + <div> + <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3> + {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %} + <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p> + <p class="url">{{ result.pretty_url }}</p> + </div> +</div> +\ No newline at end of filediff --git a/searx/templates/courgette/result_templates/images.html b/searx/templates/courgette/result_templates/images.html@@ -1,6 +1,6 @@ <div class="image_result"> <p> <a href="{{ result.img_src }}"><img src="{{ result.img_src }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a> - <span class="url"><a href="{{ result.url }}" class="small_font">original context</a></span> + <span class="url"><a href="{{ result.url }}" class="small_font">{{ _('original context') }}</a></span> </p> -</div> +</div> +\ No newline at end of filediff --git a/searx/templates/courgette/result_templates/map.html b/searx/templates/courgette/result_templates/map.html@@ -1,13 +1,13 @@ <div class="result {{ result.class }}"> - {% if "icon_"~result.engine~".ico" in favicons %} - <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" /> - {% endif %} + {% if "icon_"~result.engine~".ico" in favicons %} + <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" /> + {% endif %} - <div> - <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3> - {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %} - <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p> - <p class="url">{{ result.pretty_url }}</p> - </div> -</div> + <div> + <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3> + {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %} + <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p> + <p class="url">{{ result.pretty_url }}</p> + </div> +</div> +\ No newline at end of filediff --git a/searx/templates/courgette/result_templates/torrent.html b/searx/templates/courgette/result_templates/torrent.html@@ -1,7 +1,13 @@ <div class="result torrent_result"> + {% if "icon_"~result.engine~".ico" in favicons %} + <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" /> + {% endif %} <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3> - {% if result.content %}<p class="content">{{ result.content|safe }}</p>{% endif %} - <p class="stats">Seed: {{ result.seed }}, Leech: {{ result.leech }}</p> - <p><a href="{{ result.magnetlink }}" class="magnetlink">magnet link</a></p> + {% if result.content %}<span class="content">{{ result.content|safe }}</span><br />{% endif %} + <span class="stats">{{ _('Seeder') }} : {{ result.seed }}, {{ _('Leecher') }} : {{ result.leech }}</span><br /> + <span> + {% if result.magnetlink %}<a href="{{ result.magnetlink }}" class="magnetlink">{{ _('magnet link') }}</a>{% endif %} + {% if result.torrentfile %}<a href="{{ result.torrentfile }}" class="torrentfile">{{ _('torrent file') }}</a>{% endif %} + </span> <p class="url">{{ result.pretty_url }}</p> -</div> +</div> +\ No newline at end of filediff --git a/searx/templates/courgette/result_templates/videos.html b/searx/templates/courgette/result_templates/videos.html@@ -1,10 +1,10 @@ <div class="result"> - {% if "icon_"~result.engine~".ico" in favicons %} - <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" /> - {% endif %} + {% if "icon_"~result.engine~".ico" in favicons %} + <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" /> + {% endif %} - <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3> - {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %} - <a href="{{ result.url }}"><img width="400" src="{{ result.thumbnail }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a> - <p class="url">{{ result.url }}</p> -</div> + <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3> + {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span><br />{% endif %} + <a href="{{ result.url }}"><img width="400" src="{{ result.thumbnail }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a> + <p class="url">{{ result.pretty_url }}</p> +</div> +\ No newline at end of filediff --git a/searx/templates/courgette/results.html b/searx/templates/courgette/results.html@@ -1,9 +1,10 @@ -{% extends "default/base.html" %} +{% extends "courgette/base.html" %} {% block title %}{{ q }} - {% endblock %} +{% block meta %}<link rel="alternate" type="application/rss+xml" title="Searx search: {{ q }}" href="{{ url_for('index') }}?q={{ q|urlencode }}&format=rss&{% for category in selected_categories %}category_{{ category }}=1&{% endfor %}pageno={{ pageno }}">{% endblock %} {% block content %} -<div class="right"><a href="{{ url_for('preferences') }}" id="preferences"><span>preferences</span></a></div> +<div class="right"><a href="{{ url_for('preferences') }}" id="preferences"><span>{{ _('preferences') }}</span></a></div> <div class="small search center"> - {% include 'default/search.html' %} + {% include 'courgette/search.html' %} </div> <div id="results"> <div id="sidebar"> @@ -13,22 +14,30 @@ <input type="text" value="{{ base_url }}?q={{ q|urlencode }}&pageno={{ pageno }}{% if selected_categories %}&category_{{ selected_categories|join("&category_")|replace(' ','+') }}{% endif %}" readonly /> </div> <div id="apis"> - {{ _('Download results') }} - {% for output_type in ('csv', 'json', 'rss') %} - <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}"> - <div class="left"> - <input type="hidden" name="q" value="{{ q }}" /> - <input type="hidden" name="format" value="{{ output_type }}" /> - {% for category in selected_categories %} - <input type="hidden" name="category_{{ category }}" value="1"/> + {{ _('Download results') }} + {% for output_type in ('csv', 'json', 'rss') %} + <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}"> + <div class="left"> + <input type="hidden" name="q" value="{{ q }}" /> + <input type="hidden" name="format" value="{{ output_type }}" /> + {% for category in selected_categories %} + <input type="hidden" name="category_{{ category }}" value="1"/> + {% endfor %} + <input type="hidden" name="pageno" value="{{ pageno }}" /> + <input type="submit" value="{{ output_type }}" /> + </div> + </form> {% endfor %} - <input type="hidden" name="pageno" value="{{ pageno }}" /> - <input type="submit" value="{{ output_type }}" /> - </div> - </form> - {% endfor %} </div> </div> + + {% if answers %} + <div id="answers" class=""><span>{{ _('Answers') }}</span> + {% for answer in answers %} + <span>{{ answer }}</span> + {% endfor %} + </div> + {% endif %} {% if suggestions %} <div id="suggestions"><span>{{ _('Suggestions') }}</span> @@ -54,26 +63,26 @@ {% if pageno > 1 %} <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}"> <div class="left"> - <input type="hidden" name="q" value="{{ q }}" /> - {% for category in selected_categories %} - <input type="hidden" name="category_{{ category }}" value="1"/> - {% endfor %} - <input type="hidden" name="pageno" value="{{ pageno-1 }}" /> - <input type="submit" value="<< {{ _('previous page') }}" /> + <input type="hidden" name="q" value="{{ q }}" /> + {% for category in selected_categories %} + <input type="hidden" name="category_{{ category }}" value="1"/> + {% endfor %} + <input type="hidden" name="pageno" value="{{ pageno-1 }}" /> + <input type="submit" value="<< {{ _('previous page') }}" /> </div> </form> {% endif %} <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}"> <div class="left"> - {% for category in selected_categories %} - <input type="hidden" name="category_{{ category }}" value="1"/> - {% endfor %} - <input type="hidden" name="q" value="{{ q }}" /> - <input type="hidden" name="pageno" value="{{ pageno+1 }}" /> - <input type="submit" value="{{ _('next page') }} >>" /> + {% for category in selected_categories %} + <input type="hidden" name="category_{{ category }}" value="1"/> + {% endfor %} + <input type="hidden" name="q" value="{{ q }}" /> + <input type="hidden" name="pageno" value="{{ pageno+1 }}" /> + <input type="submit" value="{{ _('next page') }} >>" /> </div> </form> </div> {% endif %} </div> -{% endblock %} +{% endblock %} +\ No newline at end of filediff --git a/searx/templates/courgette/search.html b/searx/templates/courgette/search.html@@ -1,7 +1,7 @@ <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" id="search_form"> - <div id="search_wrapper"> - <input type="text" placeholder="{{ _('Search for...') }}" id="q" class="q" name="q" tabindex="1" autocomplete="off" {% if q %}value="{{ q }}"{% endif %}/> - <input type="submit" value="search" id="search_submit" /> - </div> - {% include 'default/categories.html' %} -</form> + <div id="search_wrapper"> + <input type="text" placeholder="{{ _('Search for...') }}" id="q" class="q" name="q" tabindex="1" autocomplete="off" {% if q %}value="{{ q }}"{% endif %}/> + <input type="submit" value="search" id="search_submit" /> + </div> + {% include 'courgette/categories.html' %} +</form> +\ No newline at end of filediff --git a/searx/templates/courgette/stats.html b/searx/templates/courgette/stats.html@@ -1,4 +1,4 @@ -{% extends "default/base.html" %} +{% extends "courgette/base.html" %} {% block head %} {% endblock %} {% block content %} <h2>{{ _('Engine stats') }}</h2> @@ -6,8 +6,8 @@ {% for stat_name,stat_category in stats %} <div class="left"> <table> - <tr colspan="3"> - <th>{{ stat_name }}</th> + <tr> + <th colspan="3">{{ stat_name }}</th> </tr> {% for engine in stat_category %} <tr> @@ -19,4 +19,4 @@ </table> </div> {% endfor %} -{% endblock %} +{% endblock %} +\ No newline at end of file