diff options
Diffstat (limited to 'searx/templates')
| -rw-r--r-- | searx/templates/simple/base.html | 10 | ||||
| -rw-r--r-- | searx/templates/simple/macros.html | 2 | ||||
| -rw-r--r-- | searx/templates/simple/opensearch.xml | 27 | ||||
| -rw-r--r-- | searx/templates/simple/preferences.html | 8 | ||||
| -rw-r--r-- | searx/templates/simple/stats.html | 5 |
5 files changed, 24 insertions, 28 deletions
diff --git a/searx/templates/simple/base.html b/searx/templates/simple/base.html index a2464a1a5..a31ff07ee 100644 --- a/searx/templates/simple/base.html +++ b/searx/templates/simple/base.html @@ -2,7 +2,7 @@ <html class="no-js theme-{{ preferences.get_value('simple_style') or 'auto' }} center-aligment-{{ preferences.get_value('center_alignment') and 'yes' or 'no' }}" lang="{{ locale_rfc5646 }}" {% if rtl %} dir="rtl"{% endif %}> <head> <meta charset="UTF-8" /> - <meta name="description" content="SearXNG — a privacy-respecting, hackable metasearch engine"> + <meta name="description" content="SearXNG — a privacy-respecting, open metasearch engine"> <meta name="keywords" content="SearXNG, search, search engine, metasearch, meta search"> <meta name="generator" content="searxng/{{ searx_version }}"> <meta name="referrer" content="no-referrer"> @@ -61,10 +61,10 @@ </main> <footer> <p> - {{ _('Powered by') }} <a href="{{ url_for('info', pagename='about') }}">searxng</a> - {{ searx_version }} — {{ _('a privacy-respecting, hackable metasearch engine') }}<br/> - <a href="{{ searx_git_url }}">{{ _('Source code') }}</a> | - <a href="{{ get_setting('brand.issue_url') }}">{{ _('Issue tracker') }}</a> | - <a href="{{ url_for('stats') }}">{{ _('Engine stats') }}</a> + {{ _('Powered by') }} <a href="{{ url_for('info', pagename='about') }}">searxng</a> - {{ searx_version }} — {{ _('a privacy-respecting, open metasearch engine') }}<br/> + <a href="{{ searx_git_url }}">{{ _('Source code') }}</a> + | <a href="{{ get_setting('brand.issue_url') }}">{{ _('Issue tracker') }}</a> + {% if enable_metrics %}| <a href="{{ url_for('stats') }}">{{ _('Engine stats') }}</a>{% endif %} {% if get_setting('brand.public_instances') %} | <a href="{{ get_setting('brand.public_instances') }}">{{ _('Public instances') }}</a> {% endif %} diff --git a/searx/templates/simple/macros.html b/searx/templates/simple/macros.html index e06157867..d9af3fbbb 100644 --- a/searx/templates/simple/macros.html +++ b/searx/templates/simple/macros.html @@ -42,7 +42,7 @@ {%- macro result_sub_footer(result, proxify) -%} <div class="engines"> {% for engine in result.engines %}<span>{{ engine }}</span>{% endfor %} - {{ result_link("https://web.archive.org/web/" + result.url, icon_small('ellipsis-vertical-outline') + _('cached'), "cache_link") }}‎ {% if proxify and proxify_results %} {{ result_link(proxify(result.url), icon('link') + _('proxied'), "proxyfied_link") }} {% endif %} + {{ result_link(cache_url + result.url, icon_small('ellipsis-vertical-outline') + _('cached'), "cache_link") }}‎ {% if proxify and proxify_results %} {{ result_link(proxify(result.url), icon('link') + _('proxied'), "proxyfied_link") }} {% endif %} </div>{{- '' -}} <div class="break"></div>{{- '' -}} {%- endmacro -%} diff --git a/searx/templates/simple/opensearch.xml b/searx/templates/simple/opensearch.xml index 230f327a5..212cecc80 100644 --- a/searx/templates/simple/opensearch.xml +++ b/searx/templates/simple/opensearch.xml @@ -1,22 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> -<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> +<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/"> <ShortName>{{ instance_name }}</ShortName> - <Description>a privacy-respecting, hackable metasearch engine</Description> + <LongName>SearXNG metasearch</LongName> + <Description>SearXNG is a metasearch engine that respects your privacy.</Description> <InputEncoding>UTF-8</InputEncoding> - <Image>{{ url_for('static', filename='img/favicon.png', _external=True) }}</Image> - <LongName>searx metasearch</LongName> - {% if opensearch_method == 'get' %} - <Url rel="results" type="text/html" method="get" template="{{ url_for('search', _external=True) }}?q={searchTerms}"/> + <Image type="image/png">{{ url_for('static', filename='img/favicon.png', _external=True) }}</Image> + {% if opensearch_method == 'GET' %} + <Url rel="results" type="text/html" method="{{ opensearch_method }}" template="{{ url_for('search', _external=True) }}?q={searchTerms}"/> {% else %} - <Url rel="results" type="text/html" method="post" template="{{ url_for('search', _external=True) }}"> - <Param name="q" value="{searchTerms}" /> - </Url> + <Url rel="results" type="text/html" method="{{ opensearch_method }}" template="{{ url_for('search', _external=True) }}"> + <Param name="q" value="{searchTerms}" /> + </Url> {% endif %} {% if autocomplete %} - <Url rel="suggestions" type="application/x-suggestions+json" template="{{ url_for('autocompleter', _external=True) }}?q={searchTerms}"/> + <Url rel="suggestions" type="application/x-suggestions+json" method="{{ opensearch_method }}" template="{{ url_for('autocompleter', _external=True) }}?q={searchTerms}"/> {% endif %} - - <Url type="application/opensearchdescription+xml" - rel="self" - template="{{ opensearch_url }}" /> + <Url rel="self" type="application/opensearchdescription+xml" method="{{ opensearch_method }}" template="{{ opensearch_url }}" /> + <Query role="example" searchTerms="SearXNG" /> + <moz:SearchForm>{{ url_for('search', _external=True) }}</moz:SearchForm> </OpenSearchDescription> diff --git a/searx/templates/simple/preferences.html b/searx/templates/simple/preferences.html index 7f9be5693..b6fba439c 100644 --- a/searx/templates/simple/preferences.html +++ b/searx/templates/simple/preferences.html @@ -310,9 +310,9 @@ <th>{{ _("Supports selected language") }}</th>{{- "" -}} <th>{{ _("SafeSearch") }}</th>{{- "" -}} <th>{{ _("Time range") }}</th>{{- "" -}} - <th>{{ _("Response time") }}</th>{{- "" -}} + {%- if enable_metrics %}<th>{{ _("Response time") }}</th>{% endif -%} <th>{{ _("Max time") }}</th>{{- "" -}} - <th>{{ _("Reliability") }}</th>{{- "" -}} + {%- if enable_metrics %}<th>{{ _("Reliability") }}</th>{% endif -%} </tr> {% for group, engines in engines_by_category[categ] | group_engines_in_tab %} {% if loop.length > 1 %} @@ -336,9 +336,9 @@ <td>{{ checkbox(None, supports[search_engine.name]['supports_selected_language'], true) }}</td>{{- "" -}} <td>{{ checkbox(None, supports[search_engine.name]['safesearch'], true) }}</td>{{- "" -}} <td>{{ checkbox(None, supports[search_engine.name]['time_range_support'], true) }}</td>{{- "" -}} - {{- engine_time(search_engine.name) -}} + {%- if enable_metrics %}{{- engine_time(search_engine.name) -}}{% endif -%} <td class="{{ 'danger' if stats[search_engine.name]['warn_timeout'] else '' }}">{{ search_engine.timeout }}</td>{{- "" -}} - {{ engine_reliability(search_engine.name) -}} + {%- if enable_metrics %}{{ engine_reliability(search_engine.name) -}}{% endif -%} </tr> {% endif %} {% endfor %} diff --git a/searx/templates/simple/stats.html b/searx/templates/simple/stats.html index 378fedd43..d2d5ae2b1 100644 --- a/searx/templates/simple/stats.html +++ b/searx/templates/simple/stats.html @@ -33,10 +33,7 @@ <td class="engine-name"><a href="{{ url_for('stats', engine=engine_stat.name|e) }}">{{ engine_stat.name }}</a></td> <td class="engine-score"> {% if engine_stat.score %} - <span aria-labelledby="{{engine_stat.name}}_score" >{{ engine_stat.score|round(1) }}</span> - <div class="engine-tooltip" role="tooltip" id="{{engine_stat.name}}_score">{{- "" -}} - <p>{{ _('Scores per result') }}: {{ engine_stat.score_per_result | round(3) }}</p> - </div> + <span>{{ engine_stat.score_per_result|round(1) }}</span> {% endif %} </td> <td class="engine-result-count"> |