diff options
Diffstat (limited to 'searx/templates')
51 files changed, 263 insertions, 191 deletions
diff --git a/searx/templates/__common__/about.html b/searx/templates/__common__/about.html index d3e8d06a6..9741b5162 100644 --- a/searx/templates/__common__/about.html +++ b/searx/templates/__common__/about.html @@ -59,12 +59,16 @@ <h2 id='add to browser'>How to set as the default search engine?</h2> - <dt>Firefox</dt> + <p> + Searx supports <a href="https://github.com/dewitt/opensearch/blob/master/opensearch-1-1-draft-6.md">OpenSearch</a>. + For more information on changing your default search engine, see your browser's documentation: + </p> - <dd> - <a href="#" onclick="window.external.AddSearchProvider(window.location.protocol + '//' + window.location.host + '{{ url_for('opensearch') }}');">Install</a> - searx as a search engine on any version of Firefox! (javascript required) - </dd> + <ul> + <li><a href="https://support.mozilla.org/en-US/kb/add-or-remove-search-engine-firefox">Firefox</a></li> + <li><a href="https://support.microsoft.com/en-us/help/4028574/microsoft-edge-change-the-default-search-engine" >Microsoft Egde</a></li> + <li>Chrome based browsers <a href="https://www.chromium.org/tab-to-search">only add websites that the user navigates to without a path.</a> + </ul> <h2>Where to find anonymous usage statistics of this instance ?</h2> diff --git a/searx/templates/__common__/opensearch.xml b/searx/templates/__common__/opensearch.xml index 15d3eb792..244e10132 100644 --- a/searx/templates/__common__/opensearch.xml +++ b/searx/templates/__common__/opensearch.xml @@ -6,23 +6,13 @@ <Image>{{ urljoin(host, url_for('static', filename='img/favicon.png')) }}</Image> <LongName>searx metasearch</LongName> {% if opensearch_method == 'get' %} - <Url type="text/html" method="get" template="{{ host }}search?q={searchTerms}"/> - {% if autocomplete %} - <Url type="application/x-suggestions+json" method="get" template="{{ host }}autocompleter"> - <Param name="format" value="x-suggestions" /> - <Param name="q" value="{searchTerms}" /> - </Url> - {% endif %} + <Url rel="results" type="text/html" method="get" template="{{ host }}?q={searchTerms}"/> {% else %} - <Url type="text/html" method="post" template="{{ host }}"> + <Url rel="results" type="text/html" method="post" template="{{ host }}"> <Param name="q" value="{searchTerms}" /> </Url> - {% if autocomplete %} - <!-- TODO, POST REQUEST doesn't work --> - <Url type="application/x-suggestions+json" method="get" template="{{ host }}autocompleter"> - <Param name="format" value="x-suggestions" /> - <Param name="q" value="{searchTerms}" /> - </Url> - {% endif %} + {% endif %} + {% if autocomplete %} + <Url rel="suggestions" type="application/x-suggestions+json" template="{{ host }}autocompleter?q={searchTerms}"/> {% endif %} </OpenSearchDescription> diff --git a/searx/templates/__common__/translations.js.tpl b/searx/templates/__common__/translations.js.tpl new file mode 100644 index 000000000..8453aba69 --- /dev/null +++ b/searx/templates/__common__/translations.js.tpl @@ -0,0 +1 @@ +var could_not_load = '{{ _('could not load data') }}!'; diff --git a/searx/templates/courgette/404.html b/searx/templates/courgette/404.html index 9e3b8ac29..7a317f023 100644 --- a/searx/templates/courgette/404.html +++ b/searx/templates/courgette/404.html @@ -3,7 +3,7 @@ <div class="center"> <h1>{{ _('Page not found') }}</h1> {% autoescape false %} - <p>{{ _('Go to %(search_page)s.', search_page=unicode('<a href="{}">{}</a>').format(url_for('index'), _('search page'))) }}</p> + <p>{{ _('Go to %(search_page)s.', search_page='<a href="{}">{}</a>'.format(url_for('index'), _('search page'))) }}</p> {% endautoescape %} </div> {% endblock %} diff --git a/searx/templates/courgette/base.html b/searx/templates/courgette/base.html index 8e272585c..f4c61dac2 100644 --- a/searx/templates/courgette/base.html +++ b/searx/templates/courgette/base.html @@ -29,7 +29,7 @@ searx.autocompleter = {% if autocomplete %}true{% else %}false{% endif %}; </script> </head> - <body> + <body class="{{ endpoint }}_endpoint" > <div id="container"> {% block content %} {% endblock %} diff --git a/searx/templates/courgette/preferences.html b/searx/templates/courgette/preferences.html index 56a6e0202..c67f7662b 100644 --- a/searx/templates/courgette/preferences.html +++ b/searx/templates/courgette/preferences.html @@ -98,6 +98,7 @@ <table class="engine-table"> <tr> <th>{{ _('Engine name') }}</th> + <th>{{ _('Shortcut') }}</th> <th>{{ _('Category') }}</th> <th>{{ _('Allow') }} / {{ _('Block') }}</th> </tr> @@ -106,7 +107,8 @@ {% if not search_engine.private %} <tr> - <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})‎</td> + <td>{{ search_engine.name }}</td> + <td>{{ 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 }}__{{ categ }}"{% if (search_engine.name, categ) in disabled_engines %} checked="checked"{% endif %} /> diff --git a/searx/templates/courgette/result_templates/code.html b/searx/templates/courgette/result_templates/code.html index d6dbd5ed7..b83116ec2 100644 --- a/searx/templates/courgette/result_templates/code.html +++ b/searx/templates/courgette/result_templates/code.html @@ -1,4 +1,4 @@ -<div class="result {{ result.class }}"> +<div class="result {{ result.class }}{% for e in result.engines %} {{ e }}{% endfor %}"> <h3 class="result_title"><a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ 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="{{ image_proxify(result.img_src) }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p> diff --git a/searx/templates/courgette/result_templates/default.html b/searx/templates/courgette/result_templates/default.html index 5f2ead63f..1cbedc32b 100644 --- a/searx/templates/courgette/result_templates/default.html +++ b/searx/templates/courgette/result_templates/default.html @@ -1,4 +1,4 @@ -<div class="result {{ result.class }}"> +<div class="result {{ result.class }}{% for e in result.engines %} {{ e }}{% endfor %}"> {% 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}}" /> diff --git a/searx/templates/courgette/result_templates/images.html b/searx/templates/courgette/result_templates/images.html index 49acb3b61..e8ac5072b 100644 --- a/searx/templates/courgette/result_templates/images.html +++ b/searx/templates/courgette/result_templates/images.html @@ -1,4 +1,4 @@ -<div class="image_result"> +<div class="image_result{% for e in result.engines %} {{ e }}{% endfor %}"> <p> <a href="{{ result.img_src }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}><img src="{% if result.thumbnail_src %}{{ image_proxify(result.thumbnail_src) }}{% else %}{{ image_proxify(result.img_src) }}{% endif %}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a> <span class="url"><a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} class="small_font">{{ _('original context') }}</a></span> diff --git a/searx/templates/courgette/result_templates/key-value.html b/searx/templates/courgette/result_templates/key-value.html index 789e8de92..e9382b8d8 100644 --- a/searx/templates/courgette/result_templates/key-value.html +++ b/searx/templates/courgette/result_templates/key-value.html @@ -1,4 +1,4 @@ -<div class="result"> +<div class="result{% for e in result.engines %} {{ e }}{% endfor %}"> <table> {% for key, value in result.items() %} {% if key in ['engine', 'engines', 'template', 'score', 'category', 'positions'] %} diff --git a/searx/templates/courgette/result_templates/map.html b/searx/templates/courgette/result_templates/map.html index 5f2ead63f..1cbedc32b 100644 --- a/searx/templates/courgette/result_templates/map.html +++ b/searx/templates/courgette/result_templates/map.html @@ -1,4 +1,4 @@ -<div class="result {{ result.class }}"> +<div class="result {{ result.class }}{% for e in result.engines %} {{ e }}{% endfor %}"> {% 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}}" /> diff --git a/searx/templates/courgette/result_templates/torrent.html b/searx/templates/courgette/result_templates/torrent.html index 7f94a221e..8b9a68fa9 100644 --- a/searx/templates/courgette/result_templates/torrent.html +++ b/searx/templates/courgette/result_templates/torrent.html @@ -1,4 +1,4 @@ -<div class="result torrent_result"> +<div class="result torrent_result{% for e in result.engines %} {{ e }}{% endfor %}"> {% 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 %} diff --git a/searx/templates/courgette/result_templates/videos.html b/searx/templates/courgette/result_templates/videos.html index b3e19e024..576c483eb 100644 --- a/searx/templates/courgette/result_templates/videos.html +++ b/searx/templates/courgette/result_templates/videos.html @@ -1,4 +1,4 @@ -<div class="result"> +<div class="result{% for e in result.engines %} {{ e }}{% endfor %}"> {% 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 %} diff --git a/searx/templates/courgette/search.html b/searx/templates/courgette/search.html index bd4efd42f..fe70fde05 100644 --- a/searx/templates/courgette/search.html +++ b/searx/templates/courgette/search.html @@ -1,6 +1,6 @@ <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="text" autofocus 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' %} diff --git a/searx/templates/legacy/404.html b/searx/templates/legacy/404.html index 3e889dd21..c0fa62b00 100644 --- a/searx/templates/legacy/404.html +++ b/searx/templates/legacy/404.html @@ -3,7 +3,7 @@ <div class="center"> <h1>{{ _('Page not found') }}</h1> {% autoescape false %} - <p>{{ _('Go to %(search_page)s.', search_page=unicode('<a href="{}">{}</a>').format(url_for('index'), _('search page'))) }}</p> + <p>{{ _('Go to %(search_page)s.', search_page='<a href="{}">{}</a>'.format(url_for('index'), _('search page'))) }}</p> {% endautoescape %} </div> {% endblock %} diff --git a/searx/templates/legacy/base.html b/searx/templates/legacy/base.html index da19741cb..152cd77f3 100644 --- a/searx/templates/legacy/base.html +++ b/searx/templates/legacy/base.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"{% if rtl %} dir="rtl"{% endif %}> <head> <meta charset="UTF-8" /> - <meta name="description" content="searx - a privacy-respecting, hackable metasearch engine" /> + <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="referrer" content="no-referrer"> @@ -20,7 +20,7 @@ <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/> {% endblock %} </head> - <body> + <body class="{{ endpoint }}_endpoint" > <div id="container"> {% block content %} {% endblock %} diff --git a/searx/templates/legacy/preferences.html b/searx/templates/legacy/preferences.html index f418dcd5b..414b3f6c0 100644 --- a/searx/templates/legacy/preferences.html +++ b/searx/templates/legacy/preferences.html @@ -95,6 +95,7 @@ <table> <tr> <th>{{ _('Engine name') }}</th> + <th>{{ _('Shortcut') }}</th> <th>{{ _('Category') }}</th> <th>{{ _('Allow') }} / {{ _('Block') }}</th> </tr> @@ -103,7 +104,8 @@ {% if not search_engine.private %} <tr> - <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})‎</td> + <td>{{ search_engine.name }}</td> + <td>{{ 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 }}__{{ categ }}"{% if (search_engine.name, categ) in disabled_engines %} checked="checked"{% endif %} /> diff --git a/searx/templates/legacy/result_templates/code.html b/searx/templates/legacy/result_templates/code.html index fee6c8221..ea89563ef 100644 --- a/searx/templates/legacy/result_templates/code.html +++ b/searx/templates/legacy/result_templates/code.html @@ -1,4 +1,4 @@ -<div class="result {{ result.class }}"> +<div class="result {{ result.class }}{% for e in result.engines %} {{ e }}{% endfor %}"> <h3 class="result_title"><a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ result.title|safe }}</a></h3> <p class="url">{{ result.pretty_url }}‎ <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ _('cached') }}</a></p> {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %} diff --git a/searx/templates/legacy/result_templates/default.html b/searx/templates/legacy/result_templates/default.html index da091174d..13e2d2913 100644 --- a/searx/templates/legacy/result_templates/default.html +++ b/searx/templates/legacy/result_templates/default.html @@ -1,4 +1,4 @@ -<div class="result {{ result.class }}"> +<div class="result {{ result.class }}{% for e in result.engines %} {{ e }}{% endfor %}"> <h3 class="result_title">{% 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 %}<a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ result.title|safe }}</a></h3> <p class="url">{{ result.pretty_url }}‎ <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ _('cached') }}</a> {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}</p> diff --git a/searx/templates/legacy/result_templates/images.html b/searx/templates/legacy/result_templates/images.html index 00f62abcc..514cdf8bc 100644 --- a/searx/templates/legacy/result_templates/images.html +++ b/searx/templates/legacy/result_templates/images.html @@ -1,4 +1,4 @@ -<div class="image_result"> +<div class="image_result{% for e in result.engines %} {{ e }}{% endfor %}"> <p> <a href="{{ result.img_src }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}><img src="{% if result.thumbnail_src %}{{ image_proxify(result.thumbnail_src) }}{% else %}{{ image_proxify(result.img_src) }}{% endif %}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}" /></a> <span class="url"><a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} class="small_font">{{ _('original context') }}</a></span> diff --git a/searx/templates/legacy/result_templates/key-value.html b/searx/templates/legacy/result_templates/key-value.html index a5bb509d9..15717a1a8 100644 --- a/searx/templates/legacy/result_templates/key-value.html +++ b/searx/templates/legacy/result_templates/key-value.html @@ -1,4 +1,4 @@ -<table class="result-table"> +<table class="result-table{% for e in result.engines %} {{ e }}{% endfor %}"> {% for key, value in result.items() %} {% if key in ['engine', 'engines', 'template', 'score', 'category', 'positions'] %} {% continue %} diff --git a/searx/templates/legacy/result_templates/map.html b/searx/templates/legacy/result_templates/map.html index 0200e0f6b..6937ba459 100644 --- a/searx/templates/legacy/result_templates/map.html +++ b/searx/templates/legacy/result_templates/map.html @@ -1,4 +1,4 @@ -<div class="result {{ result.class }}"> +<div class="result {{ result.class }}{% for e in result.engines %} {{ e }}{% endfor %}"> {% 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}}" /> diff --git a/searx/templates/legacy/result_templates/torrent.html b/searx/templates/legacy/result_templates/torrent.html index 068e05373..f251496bf 100644 --- a/searx/templates/legacy/result_templates/torrent.html +++ b/searx/templates/legacy/result_templates/torrent.html @@ -1,4 +1,4 @@ -<div class="result torrent_result"> +<div class="result torrent_result{% for e in result.engines %} {{ e }}{% endfor %}"> {% 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 %} diff --git a/searx/templates/legacy/result_templates/videos.html b/searx/templates/legacy/result_templates/videos.html index 727f44c71..50f4d1e98 100644 --- a/searx/templates/legacy/result_templates/videos.html +++ b/searx/templates/legacy/result_templates/videos.html @@ -1,4 +1,4 @@ -<div class="result"> +<div class="result{% for e in result.engines %} {{ e }}{% endfor %}"> <h3 class="result_title">{% 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 %}<a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ result.title|safe }}</a></h3> {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span><br />{% endif %} <a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}><img class="thumbnail" src="{{ image_proxify(result.thumbnail) }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a> diff --git a/searx/templates/legacy/results.html b/searx/templates/legacy/results.html index 2e28bc91f..fd95657a4 100644 --- a/searx/templates/legacy/results.html +++ b/searx/templates/legacy/results.html @@ -33,8 +33,12 @@ {% if answers %} <div id="answers"><span>{{ _('Answers') }}</span> - {% for answer in answers %} - <span>{{ answer }}</span> + {% for answer in answers.values() %} + {% if answer.url %} + <a href="{{ answer.url }}">{{ answer.answer }}</a> + {% else %} + <span>{{ answer.answer }}</span> + {% endif %} {% endfor %} </div> {% endif %} diff --git a/searx/templates/legacy/search.html b/searx/templates/legacy/search.html index 4d37f9ba1..fcd08d6d2 100644 --- a/searx/templates/legacy/search.html +++ b/searx/templates/legacy/search.html @@ -1,6 +1,6 @@ <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" size="100" {% if q %}value="{{ q }}"{% endif %}/> + <input type="text" autofocus placeholder="{{ _('Search for...') }}" id="q" class="q" name="q" tabindex="1" autocomplete="off" size="100" {% if q %}value="{{ q }}"{% endif %}/> <input type="submit" value="search" id="search_submit" /> </div> {% set display_tooltip = true %} diff --git a/searx/templates/oscar/404.html b/searx/templates/oscar/404.html index 5a50880a9..cdb31db73 100644 --- a/searx/templates/oscar/404.html +++ b/searx/templates/oscar/404.html @@ -3,7 +3,7 @@ <div class="text-center"> <h1>{{ _('Page not found') }}</h1> {% autoescape false %} - <p>{{ _('Go to %(search_page)s.', search_page=unicode('<a href="{}">{}</a>').format(url_for('index'), _('search page'))) }}</p> + <p>{{ _('Go to %(search_page)s.', search_page='<a href="{}">{}</a>'.format(url_for('index'), _('search page'))) }}</p> {% endautoescape %} </div> {% endblock %} diff --git a/searx/templates/oscar/advanced.html b/searx/templates/oscar/advanced.html index bf5f86324..0b13d50d6 100644 --- a/searx/templates/oscar/advanced.html +++ b/searx/templates/oscar/advanced.html @@ -1,4 +1,4 @@ -<input type="checkbox" name="advanced_search" id="check-advanced" {% if advanced_search %} checked="checked"{% endif %}> +<input type="checkbox" name="advanced_search" class="visually-hidden" id="check-advanced" {% if advanced_search %} checked="checked"{% endif %}> <label for="check-advanced">{{- "" -}} <span class="glyphicon glyphicon-cog"></span> {{- _('Advanced settings') -}} diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html index 5eb4462e4..a3bfa5249 100644 --- a/searx/templates/oscar/base.html +++ b/searx/templates/oscar/base.html @@ -1,6 +1,6 @@ {% from 'oscar/macros.html' import icon %} <!DOCTYPE html> -<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"{% if rtl %} dir="rtl"{% endif %}> +<html xmlns="http://www.w3.org/1999/xhtml" lang="{{ preferences.get_value('locale') }}" xml:lang="{{ preferences.get_value('locale') }}"{% if rtl %} dir="rtl"{% endif %}> <head> <meta charset="UTF-8" /> <meta name="description" content="searx - a privacy-respecting, hackable metasearch engine" /> @@ -8,9 +8,9 @@ <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="generator" content="searx/{{ searx_version }}"> <meta name="referrer" content="no-referrer"> - <meta name="viewport" content="width=device-width, initial-scale=1 , maximum-scale=1.0, user-scalable=1" /> + <meta name="viewport" content="width=device-width, initial-scale=1 , maximum-scale=2.0, user-scalable=1" /> {% block meta %}{% endblock %} - + <script src="{{ url_for('js_translations') }}"></script> <title>{% block title %}{% endblock %}{{ instance_name }}</title> <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" type="text/css" /> {% if preferences.get_value('oscar-style') -%} @@ -42,12 +42,12 @@ <style type="text/css"> .tab-content > .active_if_nojs, .active_if_nojs {display: block !important; visibility: visible !important;} .margin_top_if_nojs {margin-top: 20px;} - .hide_if_nojs {display: none !important;overflow:none !important;} + .hide_if_nojs {display: none !important;overflow: hidden !important;} .disabled_if_nojs {pointer-events: none; cursor: default; text-decoration: line-through;} </style> </noscript> </head> -<body> +<body class="{{ endpoint }}_endpoint" > {% include 'oscar/navbar.html' %} <div class="container"> diff --git a/searx/templates/oscar/index.html b/searx/templates/oscar/index.html index b941f5f20..48c49d64a 100644 --- a/searx/templates/oscar/index.html +++ b/searx/templates/oscar/index.html @@ -6,10 +6,10 @@ {% if cookies['oscar-style'] == 'pointhi' %} <h1 class="text-hide center-block"><img class="center-block img-responsive" src="{{ url_for('static', filename='img/searx_logo.png') }}" alt="searx logo"/>searx</h1> {% else %} - <h1 class="text-hide center-block" id="main-logo"> + <div class="text-hide center-block" id="main-logo"> <img class="center-block img-responsive" src="{{ url_for('static', filename='img/logo_searx_a.png') }}" alt="searx logo" /> searx - </h1> + </div> {% endif %} </div> </div> diff --git a/searx/templates/oscar/infobox.html b/searx/templates/oscar/infobox.html index 9802f11e2..5ba4aa5f0 100644 --- a/searx/templates/oscar/infobox.html +++ b/searx/templates/oscar/infobox.html @@ -1,10 +1,19 @@ {% from 'oscar/macros.html' import result_link with context %} <div class="panel panel-default infobox"> <div class="panel-heading">{{- "" -}} - <h4 class="panel-title infobox_part"><bdi>{{ infobox.infobox }}</bdi></h4>{{- "" -}} + <div class="infobox_part"> + <div class="{% if not rtl %}pull-right{% endif %}"> + {% for engine in infobox.engines %} + <span class="label label-default">{{ engine }}</span> + {% endfor %} + </div> + <h4 class="panel-title"><bdi>{{ infobox.infobox }}</bdi></h4>{{- "" -}} + {% for u in infobox.urls %}{% if u.official %} <a class="header_url" href="{{ u.url }}">{{ u.url }}</a>{% endif %}{% endfor %} + </div> </div> - <div class="panel-body"> - {% if infobox.img_src %}<img class="img-responsive center-block infobox_part" src="{{ image_proxify(infobox.img_src) }}" alt="{{ infobox.infobox }}" />{% endif %} + <input type="checkbox" class="infobox_checkbox" id="expand_infobox_{{ infobox.engine }}" hidden> + <div class="panel-body infobox_body"> + {% if infobox.img_src %}<img class="img-responsive center-block infobox_part" src="{{ image_proxify(infobox.img_src) }}" />{% endif %} {% if infobox.content %}<bdi><p class="infobox_part">{{ infobox.content | safe }}</p></bdi>{% endif %} @@ -16,7 +25,11 @@ {%- if attribute.image -%} <td><img class="img-responsive" src="{{ image_proxify(attribute.image.src) }}" alt="{{ attribute.image.alt }}" /></td> {%- else -%} - <td><bdi>{{ attribute.value }}</bdi></td> + {% if attribute.label == 'Instance of' %} + <td><bdi><a href="https://wikidata.org/wiki/{{ attribute.value.id }}">{{ attribute.value.id }}</a></bdi></td> + {% else %} + <td><bdi>{{ attribute.value }}</bdi></td> + {%- endif -%} {%- endif -%} </tr> {% endfor -%} @@ -33,4 +46,8 @@ </div> {% endif %} </div> + <label for="expand_infobox_{{ infobox.engine }}" class="infobox_toggle panel-footer"> + <span class="infobox_label_down glyphicon glyphicon-chevron-down"></span> + <span class="infobox_label_up glyphicon glyphicon-chevron-up"></span> + </label> </div> diff --git a/searx/templates/oscar/languages.html b/searx/templates/oscar/languages.html index 5aff9f918..0846caa96 100644 --- a/searx/templates/oscar/languages.html +++ b/searx/templates/oscar/languages.html @@ -1,4 +1,6 @@ -<select class="language custom-select form-control" id="language" name="language" accesskey="l"> +{% from 'oscar/macros.html' import custom_select_class %} +<label class="visually-hidden" for="language">{{ _('Language') }}</label> +<select class="language form-control {{ custom_select_class(rtl) }}" id="language" name="language" accesskey="l"> <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Default language') }}</option> {%- for lang_id,lang_name,country_name,english_name in language_codes | sort(attribute=1) -%} <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}> diff --git a/searx/templates/oscar/macros.html b/searx/templates/oscar/macros.html index d2d1dc643..f52d9713c 100644 --- a/searx/templates/oscar/macros.html +++ b/searx/templates/oscar/macros.html @@ -8,34 +8,34 @@ <img width="32" height="32" class="favicon" src="{{ url_for('static', filename='themes/oscar/img/icons/' + favicon + '.png') }}" alt="{{ favicon }}" /> {%- endmacro %} -{%- macro result_link(url, title, classes='') -%} -<a href="{{ url }}" {% if classes %}class="{{ classes }}" {% endif %}{% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ title }}</a> +{%- macro result_link(url, title, classes='', id='') -%} +<a href="{{ url }}" {% if classes %}class="{{ classes }}" {% endif %}{% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}{% if id %} aria-labelledby="result-{{id}}"{%endif%}>{{ title }}</a> {%- endmacro -%} <!-- Draw result header --> -{% macro result_header(result, favicons) -%} -<h4 class="result_header">{% if result.engine~".png" in favicons %}{{ draw_favicon(result.engine) }} {% endif %}{% if result.url %}{{ result_link(result.url, result.title|safe) }}{% else %}{{ result.title|safe}}{% endif %}</h4> +{% macro result_header(result, favicons, id) -%} +<h4 class="result_header" id="result-{{id}}">{% if result.engine~".png" in favicons %}{{ draw_favicon(result.engine) }} {% endif %}{% if result.url %}{{ result_link(result.url, result.title|safe, id=id) }}{% else %}{{ result.title|safe}}{% endif %}</h4> {%- endmacro %} <!-- Draw result sub header --> -{% macro result_sub_header(result) -%} +{% macro result_sub_header(result, id) -%} {% if result.publishedDate %}<time class="text-muted" datetime="{{ result.pubdate }}" >{{ result.publishedDate }}</time>{% endif %} - {% if result.magnetlink %}<small> • {{ result_link(result.magnetlink, icon('magnet') + _('magnet link'), "magnetlink") }}</small>{% endif %} - {% if result.torrentfile %}<small> • {{ result_link(result.torrentfile, icon('download-alt') + _('torrent file'), "torrentfile") }}</small>{% endif %} + {% if result.magnetlink %}<small> • {{ result_link(result.magnetlink, icon('magnet') + _('magnet link'), "magnetlink", id) }}</small>{% endif %} + {% if result.torrentfile %}<small> • {{ result_link(result.torrentfile, icon('download-alt') + _('torrent file'), "torrentfile", id) }}</small>{% endif %} {%- endmacro %} <!-- Draw result footer --> -{% macro result_footer(result) -%} +{% macro result_footer(result, id) -%} <div class="clearfix"></div>{{- "" -}} <div class="pull-right"> {%- for engine in result.engines -%} <span class="label label-default">{{ engine }}</span> {%- endfor -%} {%- if result.url -%} - <small>{{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "text-info") }}</small> + <small>{{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "text-info", id) }}</small> {%- endif -%} {%- if proxify -%} - <small>{{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info") }}</small> + <small>{{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info", id) }}</small> {%- endif -%} </div> {%- if result.pretty_url -%} @@ -44,31 +44,31 @@ {%- endmacro %} <!-- Draw result footer --> -{% macro result_footer_rtl(result) -%} +{% macro result_footer_rtl(result, id) -%} <div class="clearfix"></div>{{- "" -}} {% for engine in result.engines -%} <span class="label label-default">{{ engine }}</span> {%- endfor %} {%- if result.url -%} - <small>{{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "text-info") }}</small> + <small>{{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "text-info", id) }}</small> {%- endif -%} {% if proxify -%} - <small>{{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info") }}</small> + <small>{{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info", id) }}</small> {%- endif %} {%- if result.pretty_url -%} <div class="external-link">{{ result.pretty_url }}</div> {%- endif %} {%- endmacro %} -{% macro preferences_item_header(info, label, rtl) -%} +{% macro preferences_item_header(info, label, rtl, id) -%} {% if rtl %} <div class="row form-group"> - <label class="col-sm-3 col-md-2 pull-right">{{ label }}</label> + <label class="col-sm-3 col-md-2 pull-right"{% if id %} for="{{id}}"{% endif %}>{{ label }}</label> <span class="col-sm-5 col-md-6 help-block pull-left">{{ info }}</span> <div class="col-sm-4 col-md-4"> {% else %} <div class="row form-group"> - <label class="col-sm-3 col-md-2">{{ label }}</label> + <label class="col-sm-3 col-md-2"{% if id %} for="{{id}}"{% endif %}>{{ label }}</label> <div class="col-sm-4 col-md-4"> {% endif %} {%- endmacro %} @@ -84,6 +84,10 @@ {% endif %} {%- endmacro %} +{% macro custom_select_class(rtl) -%} +custom-select{% if rtl %}-rtl{% endif %} +{%- endmacro %} + {% macro checkbox_toggle(id, blocked) -%} <div class="onoffswitch"> <input type="checkbox" id="{{ id }}" name="{{ id }}"{% if blocked %} checked="checked"{% endif %} class="onoffswitch-checkbox"> @@ -91,6 +95,7 @@ <span class="onoffswitch-inner"></span> <span class="onoffswitch-switch"></span> </label> + <label class="visually-hidden" for="{{ id }}">{{ _('Allow') }}</label> </div> {%- endmacro %} diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html index b03929df3..8f67cbf93 100644 --- a/searx/templates/oscar/preferences.html +++ b/searx/templates/oscar/preferences.html @@ -1,4 +1,4 @@ -{% from 'oscar/macros.html' import preferences_item_header, preferences_item_header_rtl, preferences_item_footer, preferences_item_footer_rtl, checkbox_toggle, support_toggle %} +{% from 'oscar/macros.html' import preferences_item_header, preferences_item_header_rtl, preferences_item_footer, preferences_item_footer_rtl, checkbox_toggle, support_toggle, custom_select_class %} {% extends "oscar/base.html" %} {% block title %}{{ _('preferences') }} - {% endblock %} {% block content %} @@ -9,7 +9,7 @@ <form method="post" action="{{ url_for('preferences') }}" id="search_form"> <!-- Nav tabs --> - <ul class="nav nav-tabs nav-justified hide_if_nojs" role="tablist" style="margin-bottom:20px;"> + <ul class="nav nav-tabs nav-justified hide_if_nojs" role="tablist"> <li class="active"><a href="#tab_general" role="tab" data-toggle="tab">{{ _('General') }}</a></li> <li><a href="#tab_engine" role="tab" data-toggle="tab">{{ _('Engines') }}</a></li> <li><a href="#tab_plugins" role="tab" data-toggle="tab">{{ _('Plugins') }}</a></li> @@ -30,9 +30,9 @@ <div class="col-sm-11 col-md-10"> {% include 'oscar/categories.html' %} </div> - <label class="col-sm-3 col-md-2">{{ _('Default categories') }}</label> + <label class="col-sm-3 col-md-2" for="categories">{{ _('Default categories') }}</label> {% else %} - <label class="col-sm-3 col-md-2">{{ _('Default categories') }}</label> + <label class="col-sm-3 col-md-2" for="categories">{{ _('Default categories') }}</label> <div class="col-sm-11 col-md-10 search-categories"> {% include 'oscar/categories.html' %} </div> @@ -40,14 +40,14 @@ </div> {% set language_label = _('Search language') %} {% set language_info = _('What language do you prefer for search?') %} - {{ preferences_item_header(language_info, language_label, rtl) }} + {{ preferences_item_header(language_info, language_label, rtl, 'language') }} {% include 'oscar/languages.html' %} {{ preferences_item_footer(language_info, language_label, rtl) }} {% set locale_label = _('Interface language') %} {% set locale_info = _('Change the language of the layout') %} - {{ preferences_item_header(locale_info, locale_label, rtl) }} - <select class="form-control" name='locale'> + {{ preferences_item_header(locale_info, locale_label, rtl, 'locale') }} + <select class="form-control {{ custom_select_class(rtl)}}" name="locale" id="locale"> {% for locale_id,locale_name in locales.items() | sort %} <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option> {% endfor %} @@ -56,8 +56,8 @@ {% set autocomplete_label = _('Autocomplete') %} {% set autocomplete_info = _('Find stuff as you type') %} - {{ preferences_item_header(autocomplete_info, autocomplete_label, rtl) }} - <select class="form-control" name="autocomplete"> + {{ preferences_item_header(autocomplete_info, autocomplete_label, rtl, 'autocomplete') }} + <select class="form-control {{ custom_select_class(rtl) }}" name="autocomplete" id="autocomplete"> <option value=""> - </option> {% for backend in autocomplete_backends %} <option value="{{ backend }}" {% if backend == autocomplete %}selected="selected"{% endif %}>{{ backend }}</option> @@ -67,8 +67,8 @@ {% set image_proxy_label = _('Image proxy') %} {% set image_proxy_info = _('Proxying image results through searx') %} - {{ preferences_item_header(image_proxy_info, image_proxy_label, rtl) }} - <select class="form-control" name='image_proxy'> + {{ preferences_item_header(image_proxy_info, image_proxy_label, rtl, 'image_proxy') }} + <select class="form-control {{ custom_select_class(rtl) }}" name="image_proxy" id="image_proxy"> <option value="1" {% if image_proxy %}selected="selected"{% endif %}>{{ _('Enabled') }}</option> <option value="" {% if not image_proxy %}selected="selected"{% endif %}>{{ _('Disabled')}}</option> </select> @@ -76,8 +76,8 @@ {% set method_label = _('Method') %} {% set method_info = _('Change how forms are submited, <a href="http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods" rel="external">learn more about request methods</a>') %} - {{ preferences_item_header(method_info, method_label, rtl) }} - <select class="form-control" name='method'> + {{ preferences_item_header(method_info, method_label, rtl, 'method') }} + <select class="form-control {{ custom_select_class(rtl) }}" name="method" id="method"> <option value="POST" {% if method == 'POST' %}selected="selected"{% endif %}>POST</option> <option value="GET" {% if method == 'GET' %}selected="selected"{% endif %}>GET</option> </select> @@ -85,8 +85,8 @@ {% set safesearch_label = _('SafeSearch') %} {% set safesearch_info = _('Filter content') %} - {{ preferences_item_header(safesearch_info, safesearch_label, rtl) }} - <select class="form-control" name='safesearch'> + {{ preferences_item_header(safesearch_info, safesearch_label, rtl, 'safesearch') }} + <select class="form-control {{ custom_select_class(rtl) }}" name="safesearch" id="safesearch"> <option value="2" {% if safesearch == '2' %}selected="selected"{% endif %}>{{ _('Strict') }}</option> <option value="1" {% if safesearch == '1' %}selected="selected"{% endif %}>{{ _('Moderate') }}</option> <option value="0" {% if safesearch == '0' %}selected="selected"{% endif %}>{{ _('None') }}</option> @@ -95,16 +95,16 @@ {% set theme_label = _('Themes') %} {% set theme_info = _('Change searx layout') %} - {{ preferences_item_header(theme_info, theme_label, rtl) }} - <select class="form-control" name="theme"> + {{ preferences_item_header(theme_info, theme_label, rtl, 'theme') }} + <select class="form-control {{ custom_select_class(rtl) }}" name="theme" id="theme"> {% for name in themes %} <option value="{{ name }}" {% if name == theme %}selected="selected"{% endif %}>{{ name }}</option> {% endfor %} </select> {{ preferences_item_footer(theme_info, theme_label, rtl) }} - {{ preferences_item_header(_('Choose style for this theme'), _('Style'), rtl) }} - <select class="form-control" name='oscar-style'> + {{ preferences_item_header(_('Choose style for this theme'), _('Style'), rtl, 'oscar_style') }} + <select class="form-control {{ custom_select_class(rtl) }}" name="oscar-style" id="oscar_style"> <option value="logicodev" >Logicodev</option> <option value="pointhi" {% if preferences.get_value('oscar-style') == 'pointhi' %}selected="selected"{% endif %}>Pointhi</option> <option value="logicodev-dark" {% if preferences.get_value('oscar-style') == 'logicodev-dark' %}selected="selected"{% endif %}>Logicodev dark</option> @@ -113,8 +113,8 @@ {% set label = _('Results on new tabs') %} {% set info = _('Open result links on new browser tabs') %} - {{ preferences_item_header(info, label, rtl) }} - <select class="form-control" name='results_on_new_tab'> + {{ preferences_item_header(info, label, rtl, 'results_on_new_tab') }} + <select class="form-control {{ custom_select_class(rtl) }}" name="results_on_new_tab" id="results_on_new_tab"> <option value="1" {% if results_on_new_tab %}selected="selected"{% endif %}>{{ _('On') }}</option> <option value="0" {% if not results_on_new_tab %}selected="selected"{% endif %}>{{ _('Off')}}</option> </select> @@ -122,8 +122,8 @@ {% set label = _('Open Access DOI resolver') %} {% set info = _('Redirect to open-access versions of publications when available (plugin required)') %} - {{ preferences_item_header(info, label, rtl) }} - <select class="form-control" id='doi_resolver' name='doi_resolver'> + {{ preferences_item_header(info, label, rtl, 'doi_resolver') }} + <select class="form-control {{ custom_select_class(rtl) }}" name="doi_resolver" id="doi_resolver"> {% for doi_resolver_name,doi_resolver_url in doi_resolvers.items() %} <option value="{{ doi_resolver_name }}" {% if doi_resolver_name == current_doi_resolver %}selected="selected"{% endif %}> {{ doi_resolver_name }} - {{ doi_resolver_url }} @@ -134,8 +134,8 @@ {% set label = _('Engine tokens') %} {% set info = _('Access tokens for private engines') %} - {{ preferences_item_header(info, label, rtl) }} - <input class="form-control" id='tokens' name='tokens' value='{{ preferences.tokens.get_value() }}'/> + {{ preferences_item_header(info, label, rtl, 'tokens') }} + <input class="form-control" id="tokens" name="tokens" value='{{ preferences.tokens.get_value() }}'/> {{ preferences_item_footer(info, label, rtl) }} </div> </fieldset> @@ -143,7 +143,7 @@ <div class="tab-pane active_if_nojs" id="tab_engine"> <!-- Nav tabs --> - <ul class="nav nav-tabs nav-justified hide_if_nojs" role="tablist" style="margin-bottom:20px;"> + <ul class="nav nav-tabs nav-justified hide_if_nojs" role="tablist"> {% for categ in all_categories %} <li{% if loop.first %} class="active"{% endif %}><a href="#tab_engine_{{ categ|replace(' ', '_') }}" role="tab" data-toggle="tab">{{ _(categ) }}</a></li> {% endfor %} @@ -155,6 +155,14 @@ <!-- Tab panes --> <div class="tab-content"> + + <div class="hide_if_nojs"> + <p class="text-{% if rtl %}left{% else %}right{% endif %}"> + <button type="button" class="btn btn-default btn-success" id="allow-all-engines">{{ _("Allow all") }}</button> + <button type="button" class="btn btn-default btn-danger" id="disable-all-engines">{{ _("Disable all") }}</button> + </p> + </div> + {% for categ in all_categories %} <noscript><label>{{ _(categ) }}</label> </noscript> @@ -165,23 +173,23 @@ <table class="table table-hover table-condensed table-striped"> <tr> {% if not rtl %} - <th>{{ _("Allow") }}</th> - <th>{{ _("Engine name") }}</th> - <th>{{ _("Shortcut") }}</th> - <th>{{ _("Selected language") }}</th> - <th>{{ _("SafeSearch") }}</th> - <th>{{ _("Time range") }}</th> - <th>{{ _("Avg. time") }}</th> - <th>{{ _("Max time") }}</th> + <th scope="col">{{ _("Allow") }}</th> + <th scope="col">{{ _("Engine name") }}</th> + <th scope="col">{{ _("Shortcut") }}</th> + <th scope="col">{{ _("Selected language") }}</th> + <th scope="col">{{ _("SafeSearch") }}</th> + <th scope="col">{{ _("Time range") }}</th> + <th scope="col">{{ _("Avg. time") }}</th> + <th scope="col">{{ _("Max time") }}</th> {% else %} - <th>{{ _("Max time") }}</th> - <th>{{ _("Avg. time") }}</th> - <th>{{ _("Time range") }}</th> - <th>{{ _("SafeSearch") }}</th> - <th>{{ _("Selected language") }}</th> - <th>{{ _("Shortcut") }}</th> - <th>{{ _("Engine name") }}</th> - <th>{{ _("Allow") }}</th> + <th scope="col" class="text-right">{{ _("Max time") }}</th> + <th scope="col" class="text-right">{{ _("Avg. time") }}</th> + <th scope="col" class="text-right">{{ _("Time range") }}</th> + <th scope="col" class="text-right">{{ _("SafeSearch") }}</th> + <th scope="col" class="text-right">{{ _("Selected language") }}</th> + <th scope="col" class="text-right">{{ _("Shortcut") }}</th> + <th scope="col" class="text-right">{{ _("Engine name") }}</th> + <th scope="col" class="text-right">{{ _("Allow") }}</th> {% endif %} </tr> {% for search_engine in engines_by_category[categ] %} @@ -191,21 +199,21 @@ <td class="onoff-checkbox"> {{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }} </td> - <th>{{ search_engine.name }}</th> + <th scope="row">{{ search_engine.name }}</th> <td class="name">{{ shortcuts[search_engine.name] }}</td> <td>{{ support_toggle(stats[search_engine.name].supports_selected_language) }}</td> <td>{{ support_toggle(search_engine.safesearch==True) }}</td> <td>{{ support_toggle(search_engine.time_range_support==True) }}</td> - <td class="{{ 'danger' if stats[search_engine.name]['warn_time'] else '' }}">{{ 'N/A' if stats[search_engine.name].time==None else stats[search_engine.name].time }}</td> - <td class="{{ 'danger' if stats[search_engine.name]['warn_timeout'] else '' }}">{{ search_engine.timeout }}</td> - {% else %} - <td class="{{ 'danger' if stats[search_engine.name]['warn_timeout'] else '' }}">{{ search_engine.timeout }}</td> - <td class="{{ 'danger' if stats[search_engine.name]['warn_time'] else '' }}">{{ 'N/A' if stats[search_engine.name].time==None else stats[search_engine.name].time }}</td> + <td class="{{ 'danger' if stats[search_engine.name]['warn_time'] else '' }}">{% if stats[search_engine.name]['warn_time'] %}{{ icon('exclamation-sign')}} {% endif %}{{ 'N/A' if stats[search_engine.name].time==None else stats[search_engine.name].time }}</td> + <td class="{{ 'danger' if stats[search_engine.name]['warn_timeout'] else '' }}">{% if stats[search_engine.name]['warn_timeout'] %}{{ icon('exclamation-sign') }} {% endif %}{{ search_engine.timeout }}</td> + {% else %} + <td class="{{ 'danger' if stats[search_engine.name]['warn_timeout'] else '' }}">{{ search_engine.timeout }}{% if stats[search_engine.name]['warn_time'] %} {{ icon('exclamation-sign')}}{% endif %}</td> + <td class="{{ 'danger' if stats[search_engine.name]['warn_time'] else '' }}">{{ 'N/A' if stats[search_engine.name].time==None else stats[search_engine.name].time }}{% if stats[search_engine.name]['warn_time'] %} {{ icon('exclamation-sign')}}{% endif %}</td> <td>{{ support_toggle(search_engine.time_range_support==True) }}</td> <td>{{ support_toggle(search_engine.safesearch==True) }}</td> <td>{{ support_toggle(stats[search_engine.name].supports_selected_language) }}</td> <td>{{ shortcuts[search_engine.name] }}</td> - <th>{{ search_engine.name }}</th> + <th scope="row">{{ search_engine.name }}</th> <td class="onoff-checkbox"> {{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }} </td> @@ -233,7 +241,7 @@ <h3 class="panel-title">{{ _(plugin.name) }}</h3> </div> <div class="panel-body"> - <div class="col-xs-6 col-sm-4 col-md-6">{{ _(plugin.description) }}</div> + <div class="col-xs-6 col-sm-4 col-md-6"><label for="{{'plugin_' + plugin.id}}">{{ _(plugin.description) }}</label></div> <div class="col-xs-6 col-sm-4 col-md-6"> <div class="onoff-checkbox"> {{ checkbox_toggle('plugin_' + plugin.id, plugin.id not in allowed_plugins) }} @@ -251,23 +259,23 @@ <noscript> <h3>{{ _('Answerers') }}</h3> </noscript> - <p class="text-muted" style="margin:20px 0;"> + <p class="text-muted"> {{ _('This is the list of searx\'s instant answering modules.') }} </p> <table class="table table-striped"> <tr> - <th class="text-muted">{{ _('Name') }}</th> - <th class="text-muted">{{ _('Keywords') }}</th> - <th class="text-muted">{{ _('Description') }}</th> - <th class="text-muted">{{ _('Examples') }}</th> + <th{% if rtl %} class="text-right"{% endif %}>{{ _('Name') }}</th> + <th{% if rtl %} class="text-right"{% endif %}>{{ _('Keywords') }}</th> + <th{% if rtl %} class="text-right"{% endif %}>{{ _('Description') }}</th> + <th{% if rtl %} class="text-right"{% endif %}>{{ _('Examples') }}</th> </tr> {% for answerer in answerers %} <tr> - <td class="text-muted">{{ answerer.info.name }}</td> - <td class="text-muted">{{ answerer.keywords|join(', ') }}</td> - <td class="text-muted">{{ answerer.info.description }}</td> - <td class="text-muted">{{ answerer.info.examples|join(', ') }}</td> + <td>{{ answerer.info.name }}</td> + <td>{{ answerer.keywords|join(', ') }}</td> + <td>{{ answerer.info.description }}</td> + <td>{{ answerer.info.examples|join(', ') }}</td> </tr> {% endfor %} </table> @@ -278,20 +286,20 @@ <noscript> <h3>{{ _('Cookies') }}</h3> </noscript> - <p class="text-muted" style="margin:20px 0;"> + <p class="text-muted"> {{ _('This is the list of cookies and their values searx is storing on your computer.') }}<br /> {{ _('With that list, you can assess searx transparency.') }}<br /> </p> {% if cookies %} <table class="table table-striped"> <tr> - <th class="text-muted" style="padding-right:40px;">{{ _('Cookie name') }}</th> - <th class="text-muted">{{ _('Value') }}</th> + <th class="text-muted{% if rtl %} text-right{% endif %}">{{ _('Cookie name') }}</th> + <th class="text-muted{% if rtl %} text-right{% endif %}">{{ _('Value') }}</th> </tr> {% for cookie in cookies %} <tr> - <td class="text-muted" style="padding-right:40px;">{{ cookie }}</td> + <td class="text-muted">{{ cookie }}</td> <td class="text-muted">{{ cookies[cookie] }}</td> </tr> {% endfor %} @@ -301,17 +309,23 @@ {% endif %} </div> </div> - <p class="text-muted" style="margin:20px 0;">{{ _('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.") }} + + <p class="text-muted"> + {{ _('These settings are stored in your cookies, this allows us not to store this data about you.') }} + {{ _("These cookies serve your sole convenience, we don't use these cookies to track you.") }} </p> - <p style="margin:20px 0;">{{ _('Search URL of the currently saved preferences') }} <small class="text-muted">({{ _('Note: specifying custom settings in the search URL can reduce privacy by leaking data to the clicked result sites.') }})</small>:<br/> - <input readonly="" class="form-control select-all-on-click cursor-text" type="url" value="{{ url_for('index', _external=True) }}?preferences={{ preferences_url_params|e }}{% raw %}&q=%s{% endraw %}"> + + <p> + {{ _('Search URL of the currently saved preferences') }} + <small class="text-muted">({{ _('Note: specifying custom settings in the search URL can reduce privacy by leaking data to the clicked result sites.') }})</small>: </p> - <input type="submit" class="btn btn-primary" value="{{ _('save') }}" /> + <div class="tab-pane"> + <input readonly="" class="form-control select-all-on-click cursor-text" type="url" value="{{ base_url }}?preferences={{ preferences_url_params|e }}{% raw %}&q=%s{% endraw %}"> + <input type="submit" class="btn btn-primary" value="{{ _('save') }}" /> <a href="{{ url_for('index') }}"><div class="btn btn-default">{{ _('back') }}</div></a> <a href="{{ url_for('clear_cookies') }}"><div class="btn btn-default">{{ _('Reset defaults') }}</div></a> + </div> </form> </div> {% endblock %} diff --git a/searx/templates/oscar/result_templates/code.html b/searx/templates/oscar/result_templates/code.html index a1c18a6b7..c7d93e2b3 100644 --- a/searx/templates/oscar/result_templates/code.html +++ b/searx/templates/oscar/result_templates/code.html @@ -1,11 +1,11 @@ -{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon %} +{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon with context%} {{ result_header(result, favicons) }} {{ result_sub_header(result) }} {% if result.content %}<p class="result-content">{{ result.content|safe }}</p>{% endif %} -{% if result.repository %}<p class="result-content">{{ icon('file') }} <a href="{{ result.repository }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ result.repository }}</a></p>{% endif %} +{% if result.repository %}<p class="result-content">{{ icon('file') }} <a href="{{ result.repository }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} aria-labelledby="result-{{loop.index}}">{{ result.repository }}</a></p>{% endif %} <div dir="ltr"> {{ result.codelines|code_highlighter(result.code_language)|safe }} diff --git a/searx/templates/oscar/result_templates/default.html b/searx/templates/oscar/result_templates/default.html index 885cbbfa8..bc71d190d 100644 --- a/searx/templates/oscar/result_templates/default.html +++ b/searx/templates/oscar/result_templates/default.html @@ -1,10 +1,10 @@ {% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon with context %} -{{- result_header(result, favicons) -}} -{{- result_sub_header(result) -}} +{{- result_header(result, favicons, loop.index) -}} +{{- result_sub_header(result, loop.index) -}} {%- if result.embedded -%} - <small> • <a class="text-info btn-collapse collapsed cursor-pointer media-loader disabled_if_nojs" data-toggle="collapse" data-target="#result-media-{{ index }}" data-btn-text-collapsed="{{ _('show media') }}" data-btn-text-not-collapsed="{{ _('hide media') }}">{{ icon('music') }} {{ _('show media') }}</a></small> + <small> • <a class="text-info btn-collapse collapsed cursor-pointer media-loader disabled_if_nojs" data-toggle="collapse" data-target="#result-media-{{ index }}" data-btn-text-collapsed="{{ _('show media') }}" data-btn-text-not-collapsed="{{ _('hide media') }}" aria-labelledby="result-{{loop.index}}">{{ icon('music') }} {{ _('show media') }}</a></small> {%- endif -%} {%- if result.embedded -%} @@ -16,7 +16,7 @@ {%- if result.img_src -%} <div class="container-fluid"> <div class="row"> -<img src="{{ image_proxify(result.img_src) }}" alt="{{ result.title|striptags }}" title="{{ result.title|striptags }}" style="width: auto; max-height: 60px; min-height: 60px;" class="col-xs-2 col-sm-4 col-md-4 result-content"> +<img src="{{ image_proxify(result.img_src) }}" title="{{ result.title|striptags }}" style="width: auto; max-height: 60px; min-height: 60px;" class="col-xs-2 col-sm-4 col-md-4 result-content"> {% if result.content %}<p class="result-content col-xs-8 col-sm-8 col-md-8">{{ result.content|safe }}</p>{% endif -%} </div> </div> @@ -25,7 +25,7 @@ {%- endif -%} {%- if rtl -%} -{{ result_footer_rtl(result) }} +{{ result_footer_rtl(result, loop.index) }} {%- else -%} -{{ result_footer(result) }} +{{ result_footer(result, loop.index) }} {%- endif -%} diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html index d0a3b7b83..96cdd53bb 100644 --- a/searx/templates/oscar/result_templates/images.html +++ b/searx/templates/oscar/result_templates/images.html @@ -1,6 +1,6 @@ -{%- from 'oscar/macros.html' import draw_favicon -%} +{%- from 'oscar/macros.html' import draw_favicon with context -%} -<a href="{{ result.img_src }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} data-toggle="modal" data-target="#modal-{{ index }}-{{pageno}}">{{- "" -}} +<a href="{{ result.img_src }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} data-toggle="modal" data-target="#modal-{{ index }}-{{pageno}}" id="result-{{loop.index}}">{{- "" -}} <img src="{% if result.thumbnail_src %}{{ image_proxify(result.thumbnail_src) }}{% else %}{{ image_proxify(result.img_src) }}{% endif %}" alt="{{ result.title|striptags }}" title="{{ result.title|striptags }}" class="img-thumbnail">{{- "" -}} </a> <div class="modal fade" id="modal-{{ index }}-{{ pageno }}" tabindex="-1" role="dialog" aria-hidden="true">{{- "" -}} diff --git a/searx/templates/oscar/result_templates/key-value.html b/searx/templates/oscar/result_templates/key-value.html index 67c748e7f..d5c56a189 100644 --- a/searx/templates/oscar/result_templates/key-value.html +++ b/searx/templates/oscar/result_templates/key-value.html @@ -6,7 +6,7 @@ {% continue %} {% endif %} <tr> - <td><b>{{ key|upper }}</b>: {{ value }}</td> + <td><b>{{ key|upper }}</b>: {{ value|truncate }}</td> </tr> {% endfor %} </table> diff --git a/searx/templates/oscar/result_templates/map.html b/searx/templates/oscar/result_templates/map.html index 712375d7f..be34d65d0 100644 --- a/searx/templates/oscar/result_templates/map.html +++ b/searx/templates/oscar/result_templates/map.html @@ -1,7 +1,7 @@ {% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon %} -{{ result_header(result, favicons) }} -{{ result_sub_header(result) }} +{{ result_header(result, favicons, loop.index) }} +{{ result_sub_header(result, loop.index) }} {% if (result.latitude and result.longitude) or result.boundingbox %} <small> • <a class="text-info btn-collapse collapsed searx_init_map cursor-pointer disabled_if_nojs" data-toggle="collapse" data-target="#result-map-{{ index }}" data-leaflet-target="osm-map-{{ index }}" data-map-lon="{{ result.longitude }}" data-map-lat="{{ result.latitude }}" {% if result.boundingbox %}data-map-boundingbox='{{ result.boundingbox|tojson|safe }}'{% endif %} {% if result.geojson %}data-map-geojson='{{ result.geojson|tojson|safe }}'{% endif %} data-btn-text-collapsed="{{ _('show map') }}" data-btn-text-not-collapsed="{{ _('hide map') }}">{{ icon('globe') }} {{ _('show map') }}</a></small> @@ -66,7 +66,7 @@ {% endif %} {% if rtl %} -{{ result_footer_rtl(result) }} +{{ result_footer_rtl(result, loop.index) }} {% else %} -{{ result_footer(result) }} +{{ result_footer(result, loop.index) }} {% endif %} diff --git a/searx/templates/oscar/result_templates/torrent.html b/searx/templates/oscar/result_templates/torrent.html index 089367e36..0bba61417 100644 --- a/searx/templates/oscar/result_templates/torrent.html +++ b/searx/templates/oscar/result_templates/torrent.html @@ -1,7 +1,7 @@ {% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon %} -{{ result_header(result, favicons) }} -{{ result_sub_header(result) }} +{{ result_header(result, favicons, loop.index) }} +{{ result_sub_header(result, loop.index) }} {% if result.seed is defined %}<p class="result-content">{{ icon('transfer') }} {{ _('Seeder') }} <span class="badge">{{ result.seed }}</span> • {{ _('Leecher') }} <span class="badge">{{ result.leech }}</span>{% endif %} {% if result.filesize %}<br />{{ icon('floppy-disk') }} {{ _('Filesize') }} @@ -19,7 +19,7 @@ </p> {% if rtl %} -{{ result_footer_rtl(result) }} +{{ result_footer_rtl(result, loop.index) }} {% else %} -{{ result_footer(result) }} +{{ result_footer(result, loop.index) }} {% endif %} diff --git a/searx/templates/oscar/result_templates/videos.html b/searx/templates/oscar/result_templates/videos.html index 3c1913d9d..bf02a553a 100644 --- a/searx/templates/oscar/result_templates/videos.html +++ b/searx/templates/oscar/result_templates/videos.html @@ -1,10 +1,10 @@ {% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon %} -{{ result_header(result, favicons) }} -{{ result_sub_header(result) }} +{{ result_header(result, favicons, loop.index) }} +{{ result_sub_header(result, loop.index) }} {% if result.embedded %} - <small> • <a class="text-info btn-collapse collapsed cursor-pointer media-loader disabled_if_nojs" data-toggle="collapse" data-target="#result-video-{{ index }}" data-btn-text-collapsed="{{ _('show video') }}" data-btn-text-not-collapsed="{{ _('hide video') }}">{{ icon('film') }} {{ _('show video') }}</a></small> + <small> • <a class="text-info btn-collapse collapsed cursor-pointer media-loader disabled_if_nojs" data-toggle="collapse" data-target="#result-video-{{ index }}" data-btn-text-collapsed="{{ _('show video') }}" data-btn-text-not-collapsed="{{ _('hide video') }}" aria-labelledby="result-{{loop.index}}">{{ icon('film') }} {{ _('show video') }}</a></small> {% endif %} {% if result.embedded %} @@ -15,13 +15,15 @@ <div class="container-fluid"> <div class="row"> - <a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}><img class="thumbnail col-xs-6 col-sm-4 col-md-4 result-content" src="{{ image_proxify(result.thumbnail) }}" alt="{{ result.title|striptags }} {{ result.engine }}" /></a> + <a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}><img class="thumbnail col-xs-6 col-sm-4 col-md-4 result-content" src="{{ image_proxify(result.thumbnail) }}" aria-labelledby="result-{{loop.index}}" /></a> + {% if result.author %}<p class="col-xs-12 col-sm-8 col-md-8 result-content"><b>{{ _('Author') }}</b>: {{ result.author }}</p>{% endif %} + {% if result.length %}<p class="col-xs-12 col-sm-8 col-md-8 result-content"><b>{{ _('Length') }}</b>: {{ result.length }}</p>{% endif %} {% if result.content %}<p class="col-xs-12 col-sm-8 col-md-8 result-content">{{ result.content|safe }}</p>{% endif %} </div> </div> {% if rtl %} -{{ result_footer_rtl(result) }} +{{ result_footer_rtl(result, loop.index) }} {% else %} -{{ result_footer(result) }} +{{ result_footer(result, loop.index) }} {% endif %} diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html index 43e3e26d9..a7f96d8d2 100644 --- a/searx/templates/oscar/results.html +++ b/searx/templates/oscar/results.html @@ -43,6 +43,12 @@ <div class="panel-body"> {% for suggestion in suggestions %} <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" role="navigation" class="form-inline pull-{% if rtl %}right{% else %}left{% endif %} suggestion_item"> + {% if current_language != 'all' %} + <input type="hidden" name="language" value="{{ current_language }}"> + {% endif %} + {% if time_range %} + <input type="hidden" name="time_range" value="{{ time_range }}"> + {% endif %} <input type="hidden" name="q" value="{{ suggestion.url }}"> <button type="submit" class="btn btn-default btn-xs">{{ suggestion.title }}</button> </form> @@ -72,6 +78,8 @@ </form> {% endfor %} <div class="clearfix"></div> + <br /><label><a href="{{ search_url() }}&format=rss">{{ _('RSS subscription') }}</a></label> + <div class="clearfix"></div> </div> </div> </div><!-- /#sidebar_results --> @@ -81,26 +89,38 @@ {% if corrections -%} <div class="result"> - <span class="result_header text-muted form-inline pull-left suggestion_item">{{ _('Try searching for:') }}</span> - {% for correction in corrections -%} - <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" role="navigation" class="form-inline pull-left suggestion_item">{{- "" -}} - <input type="hidden" name="q" value="{{ correction.url }}">{{- "" -}} - <button type="submit" class="btn btn-default btn-xs">{{ correction.title }}</button>{{- "" -}} - </form> - {% endfor %} + <div class="clearfix"> + <span class="result_header text-muted form-inline pull-left suggestion_item">{{ _('Try searching for:') }}</span> + {% for correction in corrections -%} + <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" role="navigation" class="form-inline pull-left suggestion_item">{{- "" -}} + {% if current_language != 'all' %} + <input type="hidden" name="language" value="{{ current_language }}"> + {% endif %} + {% if time_range %} + <input type="hidden" name="time_range" value="{{ time_range }}"> + {% endif %} + <input type="hidden" name="q" value="{{ correction.url }}">{{- "" -}} + <button type="submit" class="btn btn-default btn-xs">{{ correction.title }}</button>{{- "" -}} + </form> + {% endfor %} + </div> </div> {%- endif %} {% if answers -%} - {%- for answer in answers %} + {%- for answer in answers.values() %} <div class="result well"> - <span>{{ answer }}</span> + {% if answer.url %} + <a href="{{ answer.url }}">{{ answer.answer }}</a> + {% else %} + <span>{{ answer.answer }}</span> + {% endif %} </div> {%- endfor %} {%- endif %} {% for result in results -%} - <div class="result {% if result['template'] %}result-{{ result.template|replace('.html', '') }}{% else %}result-default{% endif %}"> + <div class="result {% if result['template'] %}result-{{ result.template|replace('.html', '') }}{% else %}result-default{% endif %}{% for e in result.engines %} {{ e }}{% endfor %}"> {%- set index = loop.index -%} {%- if result.template -%} {% include get_result_template('oscar', result['template']) %} diff --git a/searx/templates/oscar/search.html b/searx/templates/oscar/search.html index 9978801ca..666a4df38 100644 --- a/searx/templates/oscar/search.html +++ b/searx/templates/oscar/search.html @@ -3,7 +3,7 @@ <div class="row"> <div class="col-xs-12 col-md-8"> <div class="input-group search-margin"> - <input type="search" name="q" class="form-control" id="q" placeholder="{{ _('Search for...') }}" aria-label="{{ _('Search for...') }}" autocomplete="off" value="{{ q }}" accesskey="s"> + <input type="search" autofocus name="q" class="form-control" id="q" placeholder="{{ _('Search for...') }}" aria-label="{{ _('Search for...') }}" autocomplete="off" value="{{ q }}" accesskey="s"> <span class="input-group-btn"> <button type="submit" class="btn btn-default" aria-label="{{ _('Start search') }}"><span class="hide_if_nojs">{{ icon('search') }}</span><span class="hidden active_if_nojs">{{ _('Start search') }}</span></button> <button type="reset" class="btn btn-default" aria-label="{{ _('Clear search') }}"><span class="hide_if_nojs">{{ icon('remove') }}</span><span class="hidden active_if_nojs">{{ _('Clear') }}</span></button> diff --git a/searx/templates/oscar/search_full.html b/searx/templates/oscar/search_full.html index ea821dc45..1f1c50e50 100644 --- a/searx/templates/oscar/search_full.html +++ b/searx/templates/oscar/search_full.html @@ -6,7 +6,7 @@ {% else %} <div class="input-group col-md-8 col-md-offset-2"> {% endif %} - <input type="search" name="q" class="form-control input-lg autofocus" id="q" placeholder="{{ _('Search for...') }}" aria-label="{{ _('Search for...') }}" autocomplete="off" value="{{ q }}" accesskey="s"> + <input type="search" autofocus name="q" class="form-control input-lg autofocus" id="q" placeholder="{{ _('Search for...') }}" aria-label="{{ _('Search for...') }}" autocomplete="off" value="{{ q }}" accesskey="s"> <span class="input-group-btn"> <button type="submit" class="btn btn-default input-lg" aria-label="{{ _('Start search') }}"><span class="hide_if_nojs">{{ icon('search') }}</span><span class="hidden active_if_nojs">{{ _('Start search') }}</span></button> <button type="reset" class="btn btn-default input-lg" aria-label="{{ _('Clear search') }}"><span class="hide_if_nojs">{{ icon('remove') }}</span><span class="hidden active_if_nojs">{{ _('Clear') }}</span></button> diff --git a/searx/templates/oscar/time-range.html b/searx/templates/oscar/time-range.html index fb1c0754b..6087dd417 100644 --- a/searx/templates/oscar/time-range.html +++ b/searx/templates/oscar/time-range.html @@ -1,4 +1,6 @@ -<select name="time_range" id="time-range" class="custom-select form-control" accesskey="t">{{- "" -}} +{% from 'oscar/macros.html' import custom_select_class %} +<label class="visually-hidden" for="time-range">{{ _('Time range') }}</label> +<select name="time_range" id="time-range" class="{{ custom_select_class(rtl) }} form-control" accesskey="t">{{- "" -}} <option id="time-range-anytime" value="" {{ "selected" if time_range=="" or not time_range else ""}}> {{- _('Anytime') -}} </option>{{- "" -}} diff --git a/searx/templates/pix-art/search.html b/searx/templates/pix-art/search.html index 4d129ec68..bb40559db 100644 --- a/searx/templates/pix-art/search.html +++ b/searx/templates/pix-art/search.html @@ -1,6 +1,6 @@ <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" size="100" {% if q %}value="{{ q }}"{% endif %}/> + <input type="text" autofocus placeholder="{{ _('Search for...') }}" id="q" class="q" name="q" tabindex="1" size="100" {% if q %}value="{{ q }}"{% endif %}/> <input type="submit" value="" id="search_submit" /> {% for category in categories %} <input type="hidden" name="category_{{ category }}" value="1"/> diff --git a/searx/templates/simple/404.html b/searx/templates/simple/404.html index 11d604313..1a10514cc 100644 --- a/searx/templates/simple/404.html +++ b/searx/templates/simple/404.html @@ -3,7 +3,7 @@ <div class="center"> <h1>{{ _('Page not found') }}</h1> {% autoescape false %} - <p>{{ _('Go to %(search_page)s.', search_page=unicode('<a href="{}">{}</a>').format(url_for('index'), _('search page'))) }}</p> + <p>{{ _('Go to %(search_page)s.', search_page='<a href="{}">{}</a>'.format(url_for('index'), _('search page'))) }}</p> {% endautoescape %} </div> {% endblock %} diff --git a/searx/templates/simple/base.html b/searx/templates/simple/base.html index 71df123ea..7a624a4b3 100644 --- a/searx/templates/simple/base.html +++ b/searx/templates/simple/base.html @@ -2,7 +2,7 @@ <html class="no-js" lang="en" {% if rtl %} dir="rtl"{% endif %}> <head> <meta charset="UTF-8" /> - <meta name="description" content="searx - a privacy-respecting, hackable metasearch engine"> + <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="referrer" content="no-referrer"> @@ -12,6 +12,7 @@ <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1"> <title>{% block title %}{% endblock %}{{ instance_name }}</title> {% block meta %}{% endblock %} + <script src="{{ url_for('js_translations') }}"></script> {% if rtl %} <link rel="stylesheet" href="{{ url_for('static', filename='css/searx-rtl.min.css') }}" type="text/css" media="screen" /> {% else %} @@ -32,7 +33,7 @@ {% endblock %} <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}" /> </head> -<body> +<body class="{{ endpoint }}_endpoint" > <main id="main_{{ self._TemplateReference__context.name|replace("simple/", "")|replace(".html", "") }}"> {% if errors %} <div class="dialog-error" role="alert"> @@ -50,7 +51,7 @@ </main> <footer> <p> - {{ _('Powered by') }} <a href="{{ url_for('about') }}">searx</a> - {{ searx_version }} - {{ _('a privacy-respecting, hackable metasearch engine') }}<br/> + {{ _('Powered by') }} <a href="{{ url_for('about') }}">searx</a> - {{ searx_version }} — {{ _('a privacy-respecting, hackable metasearch engine') }}<br/> <a href="{{ brand.GIT_URL }}">{{ _('Source code') }}</a> | <a href="{{ brand.ISSUE_URL }}">{{ _('Issue tracker') }}</a> | <a href="{{ brand.PUBLIC_INSTANCES }}">{{ _('Public instances') }}</a> diff --git a/searx/templates/simple/macros.html b/searx/templates/simple/macros.html index f0b36276c..cacbbec9f 100644 --- a/searx/templates/simple/macros.html +++ b/searx/templates/simple/macros.html @@ -26,7 +26,7 @@ <!-- Draw result header --> {% macro result_header(result, favicons, image_proxify) -%} -<article class="result {% if result['template'] %}result-{{ result.template|replace('.html', '') }}{% else %}result-default{% endif %} {% if result['category'] %}category-{{ result['category'] }}{% endif %}"> +<article class="result {% if result['template'] %}result-{{ result.template|replace('.html', '') }}{% else %}result-default{% endif %} {% if result['category'] %}category-{{ result['category'] }}{% endif %}{% for e in result.engines %} {{ e }}{% endfor %}"> {%- if result.img_src %}{{ result_open_link(result.url) }}<img class="image" src="{{ image_proxify(result.img_src) }}" alt="{{ result.title|striptags }}" title="{{ result.title|striptags }}" class="image" />{{ result_close_link() }}{% endif -%} {%- if result.thumbnail %}{{ result_open_link(result.url) }}<img class="thumbnail" src="{{ image_proxify(result.thumbnail) }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/>{{ result_close_link() }}{% endif -%} <h3>{{ result_link(result.url, result.title|safe) }}</h3> diff --git a/searx/templates/simple/results.html b/searx/templates/simple/results.html index 8885abc30..2e393193f 100644 --- a/searx/templates/simple/results.html +++ b/searx/templates/simple/results.html @@ -15,8 +15,14 @@ <div id="results" class="{{ only_template }}"> {% if answers -%} <div id="answers"><h4 class="title">{{ _('Answers') }} : </h4> - {%- for answer in answers -%} - <div class="answer">{{- answer -}}</div> + {%- for answer in answers.values() -%} + <div class="answer"> + {% if answer.url %} + <a href="{{ answer.url }}">{{ answer.answer }}</a> + {% else %} + <span>{{ answer.answer }}</span> + {% endif %} + </div> {%- endfor -%} </div> {%- endif %} diff --git a/searx/templates/simple/search.html b/searx/templates/simple/search.html index e9023b420..61d52dbc7 100644 --- a/searx/templates/simple/search.html +++ b/searx/templates/simple/search.html @@ -1,7 +1,7 @@ <form id="search" method="{{ method or 'POST' }}" action="{{ url_for('index') }}"> <div id="search_wrapper"> <div class="search_box"> - <input id="q" name="q" type="text" placeholder="{{ _('Search for...') }}" tabindex="1" autocomplete="off" spellcheck="false" dir="auto" {% if q %}value="{{ q }}"{% endif %} > + <input id="q" autofocus name="q" type="text" placeholder="{{ _('Search for...') }}" tabindex="1" autocomplete="off" spellcheck="false" dir="auto" {% if q %}value="{{ q }}"{% endif %} > <button id="clear_search" type="button" tabindex="-1"><span class="hide_if_nojs">{{ icon('close') }}</span><span class="show_if_nojs">{{ _('Clear search') }}</span></button> <button id="send_search" type="submit" tabindex="-1"><span class="hide_if_nojs">{{ icon('search') }}</span><span class="show_if_nojs">{{ _('Start search') }}</span></button> </div> |