mirror of
https://github.com/searxng/searxng
synced 2024-01-01 19:24:07 +01:00
Merge remote-tracking branch 'upstream/master' into pulling
This commit is contained in:
commit
72e8b5c354
223 changed files with 24674 additions and 20896 deletions
|
|
@ -17,7 +17,7 @@
|
|||
{% else %}
|
||||
<link rel="stylesheet" href="{{ url_for('static', filename='css/searxng.min.css') }}" type="text/css" media="screen" />
|
||||
{% endif %}
|
||||
{% if get_setting('server.limiter') %}
|
||||
{% if get_setting('server.limiter') or get_setting('server.public_instance') %}
|
||||
<link rel="stylesheet" href="{{ url_for('client_token', token=link_token) }}" type="text/css" />
|
||||
{% endif %}
|
||||
{% block styles %}{% endblock %}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<div id="search_url" role="complementary" aria-labelledby="search_url-title">
|
||||
<details class="sidebar-collapsable">
|
||||
<summary class="title" id="search_url-title">{{ _('Search URL') }}</summary>
|
||||
<button id="copy_url" type="submit" data-copied-text="{{ _('Copied') }}">{{ _('Copy') }}</button>
|
||||
<div class="selectable_url">
|
||||
<pre>{{ url_for('search', _external=True) }}?q={{ q|urlencode }}&language={{ current_language }}&time_range={{ time_range }}&safesearch={{ safesearch }}
|
||||
{%- if pageno > 1 -%}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,28 @@
|
|||
{% from 'simple/icons.html' import icon_big %}
|
||||
<div class="dialog-error-block" role="alert">
|
||||
<p><strong>{{ _('Sorry!') }}</strong></p>
|
||||
<p>{{ _("No results were found. You can try to:") }}</p>
|
||||
<div class="dialog-error-block" role="alert">{{- '' -}}
|
||||
<p>{{- '' -}}
|
||||
<strong>
|
||||
{%- if pageno == 1 -%}
|
||||
{{ _('Sorry!') }}
|
||||
{%- endif -%}
|
||||
</strong>{{- '' -}}
|
||||
</p>{{- '' -}}
|
||||
<p>
|
||||
{%- if pageno == 1 -%}
|
||||
{{ _("No results were found. You can try to:") }}
|
||||
{%- else -%}
|
||||
{{ _("There are no more results. You can try to:") }}
|
||||
{%- endif -%}
|
||||
</p>{{- '' -}}
|
||||
<ul>
|
||||
<li>{{ _("Refresh the page.") }}</li>
|
||||
<li>{{ _("Search for another query or select another category (above).") }}</li>
|
||||
<li>{{ _("Change the search engine used in the preferences:") }} <a href="/preferences">/preferences</a></li>
|
||||
<li>{{ _("Switch to another instance:") }} <a href="https://searx.space">https://searx.space</a></li>
|
||||
{%- if pageno == 1 -%}
|
||||
<li>{{ _("Refresh the page.") }}</li>{{- '' -}}
|
||||
<li>{{ _("Search for another query or select another category (above).") }}</li>{{- '' -}}
|
||||
<li>{{ _("Change the search engine used in the preferences:") }} <a href="/preferences">/preferences</a></li>{{- '' -}}
|
||||
<li>{{ _("Switch to another instance:") }} <a href="https://searx.space">https://searx.space</a></li>{{- '' -}}
|
||||
{%- else -%}
|
||||
<li>{{ _("Search for another query or select another category.") }}</li>{{- '' -}}
|
||||
<li>{{ _("Go back to the previous page using the previous page button.") }}</li>{{- '' -}}
|
||||
{%- endif -%}
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,34 +1,34 @@
|
|||
<fieldset>{{- '' -}}
|
||||
<legend id="pref_theme">{{- _('Theme') -}}</legend>{{- '' -}}
|
||||
<div class="value">{{- '' -}}
|
||||
<select name="theme" aria-labelledby="pref_theme">{{- '' -}}
|
||||
{%- for name in themes -%}
|
||||
<option value="{{ name }}" {%- if name==theme %} selected="selected" {%- endif -%}>
|
||||
{{- name -}}
|
||||
</option>
|
||||
{%- endfor -%}
|
||||
</select>{{- '' -}}
|
||||
</div>{{- '' -}}
|
||||
<div class="description">
|
||||
{{- _('Change Auto gen test') -}}
|
||||
</div>{{- '' -}}
|
||||
<legend id="pref_theme">{{- _('Theme') -}}</legend>{{- '' -}}
|
||||
<div class="value">{{- '' -}}
|
||||
<select name="theme" aria-labelledby="pref_theme">{{- '' -}}
|
||||
{%- for name in themes -%}
|
||||
<option value="{{ name }}" {%- if name==theme %} selected="selected" {%- endif -%}>
|
||||
{{- name | capitalize -}}
|
||||
</option>
|
||||
{%- endfor -%}
|
||||
</select>{{- '' -}}
|
||||
</div>{{- '' -}}
|
||||
<div class="description">
|
||||
{{- _('Change SearXNG layout') -}}
|
||||
</div>{{- '' -}}
|
||||
</fieldset>{{- '' -}}
|
||||
|
||||
<fieldset>{{- '' -}}
|
||||
<legend id="pref_simple_style">{{- _('Theme style') -}}</legend>{{- '' -}}
|
||||
<div class="value">{{- '' -}}
|
||||
<select name="simple_style" aria-labelledby="pref_simple_style">
|
||||
{%- for name in ['auto', 'light', 'dark'] -%}
|
||||
<option value="{{ name }}" {%- if name==preferences.get_value('simple_style') %} selected="selected" {%-
|
||||
endif -%}>
|
||||
{{- _(name) -}}
|
||||
</option>
|
||||
{%- endfor -%}
|
||||
</select>{{- '' -}}
|
||||
</div>{{- '' -}}
|
||||
<div class="description">
|
||||
{{- _('Choose auto to follow your browser settings') -}}
|
||||
</div>{{- '' -}}
|
||||
<legend id="pref_simple_style">{{- _('Theme style') -}}</legend>{{- '' -}}
|
||||
<div class="value">{{- '' -}}
|
||||
<select name="simple_style" aria-labelledby="pref_simple_style">
|
||||
{%- for name in ['auto', 'light', 'dark'] -%}
|
||||
<option value="{{ name }}" {%- if name==preferences.get_value('simple_style') %} selected="selected" {%-
|
||||
endif -%}>
|
||||
{{- _(name) | capitalize -}}
|
||||
</option>
|
||||
{%- endfor -%}
|
||||
</select>{{- '' -}}
|
||||
</div>{{- '' -}}
|
||||
<div class="description">
|
||||
{{- _('Choose auto to follow your browser settings') -}}
|
||||
</div>{{- '' -}}
|
||||
</fieldset>{{- '' -}}
|
||||
|
||||
{%- include 'simple/preferences/center_alignment.html' -%}
|
||||
|
|
@ -124,22 +124,24 @@
|
|||
</div>
|
||||
</form>
|
||||
{% endif %}
|
||||
<form method="{{ method or 'POST' }}" action="{{ url_for('search') }}" class="next_page">
|
||||
<div class="{% if rtl %}left{% else %}right{% endif %}">
|
||||
<input type="hidden" name="q" value="{{ q|e }}" >
|
||||
{% for category in selected_categories %}
|
||||
<input type="hidden" name="category_{{ category }}" value="1" >
|
||||
{% endfor %}
|
||||
<input type="hidden" name="pageno" value="{{ pageno+1 }}" >
|
||||
<input type="hidden" name="language" value="{{ current_language }}" >
|
||||
<input type="hidden" name="time_range" value="{{ time_range }}" >
|
||||
<input type="hidden" name="safesearch" value="{{ safesearch }}" >
|
||||
<input type="hidden" name="theme" value="{{ theme }}" >
|
||||
{% if timeout_limit %}<input type="hidden" name="timeout_limit" value="{{ timeout_limit|e }}" >{% endif %}
|
||||
{{- engine_data_form(engine_data) -}}
|
||||
<button role="link" type="submit">{{ _('Next page') }} {{ icon_small('chevron-right') }}</button>
|
||||
</div>
|
||||
</form>
|
||||
{%- if results | count > 0 -%}
|
||||
<form method="{{ method or 'POST' }}" action="{{ url_for('search') }}" class="next_page">
|
||||
<div class="{% if rtl %}left{% else %}right{% endif %}">
|
||||
<input type="hidden" name="q" value="{{ q|e }}" >
|
||||
{% for category in selected_categories %}
|
||||
<input type="hidden" name="category_{{ category }}" value="1" >
|
||||
{% endfor %}
|
||||
<input type="hidden" name="pageno" value="{{ pageno+1 }}" >
|
||||
<input type="hidden" name="language" value="{{ current_language }}" >
|
||||
<input type="hidden" name="time_range" value="{{ time_range }}" >
|
||||
<input type="hidden" name="safesearch" value="{{ safesearch }}" >
|
||||
<input type="hidden" name="theme" value="{{ theme }}" >
|
||||
{% if timeout_limit %}<input type="hidden" name="timeout_limit" value="{{ timeout_limit|e }}" >{% endif %}
|
||||
{{- engine_data_form(engine_data) -}}
|
||||
<button role="link" type="submit">{{ _('Next page') }} {{ icon_small('chevron-right') }}</button>
|
||||
</div>
|
||||
</form>
|
||||
{%- endif -%}
|
||||
{% set pstart = 1 %}
|
||||
{% set pend = 11 %}
|
||||
{% if pageno > 5 %}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue