diff options
Diffstat (limited to 'searx/templates')
| -rw-r--r-- | searx/templates/simple/base.html | 33 | ||||
| -rw-r--r-- | searx/templates/simple/icons.html | 2 | ||||
| -rw-r--r-- | searx/templates/simple/index.html | 3 | ||||
| -rw-r--r-- | searx/templates/simple/info.html | 2 | ||||
| -rw-r--r-- | searx/templates/simple/new_issue.html | 12 | ||||
| -rw-r--r-- | searx/templates/simple/preferences.html | 14 | ||||
| -rw-r--r-- | searx/templates/simple/result_templates/code.html | 2 | ||||
| -rw-r--r-- | searx/templates/simple/result_templates/default.html | 2 | ||||
| -rw-r--r-- | searx/templates/simple/result_templates/map.html | 4 | ||||
| -rw-r--r-- | searx/templates/simple/result_templates/products.html | 2 | ||||
| -rw-r--r-- | searx/templates/simple/result_templates/torrent.html | 2 | ||||
| -rw-r--r-- | searx/templates/simple/result_templates/videos.html | 2 | ||||
| -rw-r--r-- | searx/templates/simple/stats.html | 10 |
13 files changed, 64 insertions, 26 deletions
diff --git a/searx/templates/simple/base.html b/searx/templates/simple/base.html index d8eaaa02b..a2464a1a5 100644 --- a/searx/templates/simple/base.html +++ b/searx/templates/simple/base.html @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html class="no-js theme-{{ preferences.get_value('simple_style') or 'auto' }}" lang="{{ locale_rfc5646 }}" {% if rtl %} dir="rtl"{% endif %}> +<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"> @@ -40,10 +40,20 @@ </div> {% endif %} - {% block linkto_preferences %} - {% from 'simple/icons.html' import icon_big %} - <nav id="linkto_preferences"><a href="{{ url_for('preferences') }}" aria-label="{{ _('preferences') }}">{{ icon_big('menu-outline') }}</a></nav> - {% endblock %} + <nav id="links_on_top"> + {%- from 'simple/icons.html' import icon_big -%} + {%- block linkto_about -%} + <a href="{{ url_for('info', pagename='about') }}" class="link_on_top_about">{{ icon_big('information-circle-outline') }}<span>{{ _('About') }}</span></a> + {%- endblock -%} + {%- block linkto_donate -%} + {%- if donation_url -%} + <a href="{{ donation_url }}" class="link_on_top_donate">{{ icon_big('heart-outline') }}<span>{{ _('Donate') }}</span></a> + {%- endif -%} + {%- endblock -%} + {%- block linkto_preferences -%} + <a href="{{ url_for('preferences') }}" class="link_on_top_preferences">{{ icon_big('menu-outline') }}<span>{{ _('Preferences') }}</span></a> + {%- endblock -%} + </nav> {% block header %} {% endblock %} {% block content %} @@ -54,9 +64,16 @@ {{ _('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> | - <a href="{{ get_setting('brand.public_instances') }}">{{ _('Public instances') }}</a>{% if get_setting('general.contact_url') %} | - <a href="{{ get_setting('general.contact_url') }}">{{ _('Contact instance maintainer') }}</a>{% endif %} + <a href="{{ url_for('stats') }}">{{ _('Engine stats') }}</a> + {% if get_setting('brand.public_instances') %} + | <a href="{{ get_setting('brand.public_instances') }}">{{ _('Public instances') }}</a> + {% endif %} + {% if get_setting('general.privacypolicy_url') %} + | <a href="{{ get_setting('general.privacypolicy_url') }}">{{ _('Privacy policy') }}</a> + {% endif %} + {% if get_setting('general.contact_url') %} + | <a href="{{ get_setting('general.contact_url') }}">{{ _('Contact instance maintainer') }}</a> + {% endif %} </p> </footer> <!--[if gte IE 9]>--> diff --git a/searx/templates/simple/icons.html b/searx/templates/simple/icons.html index c23c32ee7..7ff4dfc16 100644 --- a/searx/templates/simple/icons.html +++ b/searx/templates/simple/icons.html @@ -19,6 +19,8 @@ 'school-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32" d="M32 192L256 64l224 128-224 128L32 192z"/><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32" d="M112 240v128l144 80 144-80V240M480 368V192M256 320v128"/></svg>', 'file-tray-full-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path d="M384 80H128c-26 0-43 14-48 40L48 272v112a48.14 48.14 0 0048 48h320a48.14 48.14 0 0048-48V272l-32-152c-5-27-23-40-48-40z" fill="none" stroke="currentColor" stroke-linejoin="round" stroke-width="32"/><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32" d="M48 272h144M320 272h144M192 272a64 64 0 00128 0M144 144h224M128 208h256"/></svg>', 'people-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path d="M402 168c-2.93 40.67-33.1 72-66 72s-63.12-31.32-66-72c-3-42.31 26.37-72 66-72s69 30.46 66 72z" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/><path d="M336 304c-65.17 0-127.84 32.37-143.54 95.41-2.08 8.34 3.15 16.59 11.72 16.59h263.65c8.57 0 13.77-8.25 11.72-16.59C463.85 335.36 401.18 304 336 304z" fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="32"/><path d="M200 185.94c-2.34 32.48-26.72 58.06-53 58.06s-50.7-25.57-53-58.06C91.61 152.15 115.34 128 147 128s55.39 24.77 53 57.94z" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/><path d="M206 306c-18.05-8.27-37.93-11.45-59-11.45-52 0-102.1 25.85-114.65 76.2-1.65 6.66 2.53 13.25 9.37 13.25H154" fill="none" stroke="currentColor" stroke-linecap="round" stroke-miterlimit="10" stroke-width="32"/></svg>', + 'heart-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path d="M352.92 80C288 80 256 144 256 144s-32-64-96.92-64c-52.76 0-94.54 44.14-95.08 96.81-1.1 109.33 86.73 187.08 183 252.42a16 16 0 0018 0c96.26-65.34 184.09-143.09 183-252.42-.54-52.67-42.32-96.81-95.08-96.81z" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/></svg>', + 'information-circle-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path d="M248 64C146.39 64 64 146.39 64 248s82.39 184 184 184 184-82.39 184-184S349.61 64 248 64z" fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="32"/><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32" d="M220 220h32v116"/><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-miterlimit="10" stroke-width="32" d="M208 340h88"/><path fill="currentColor" stroke="currentColor" stroke-linecap="round" d="M248 130a26 26 0 1026 26 26 26 0 00-26-26z"/></svg>', } -%} diff --git a/searx/templates/simple/index.html b/searx/templates/simple/index.html index 5a83e10a0..5c207bbd9 100644 --- a/searx/templates/simple/index.html +++ b/searx/templates/simple/index.html @@ -1,8 +1,5 @@ {% extends "simple/base.html" %} {% from 'simple/icons.html' import icon_big %} -{% block meta %} - <link rel="preload" href="{{ url_for('static', filename='img/searxng.png') }}" as="image" /> -{% endblock %} {% block content %} <div class="index"> <div class="title"><h1>SearXNG</h1></div> diff --git a/searx/templates/simple/info.html b/searx/templates/simple/info.html index b94ad0037..52b29b0ad 100644 --- a/searx/templates/simple/info.html +++ b/searx/templates/simple/info.html @@ -1,5 +1,7 @@ {% extends 'simple/page_with_header.html' %} {% block title %}{{ active_page.title }} - {% endblock %} +{% block linkto_about %}{% endblock %} +{% block linkto_donate %}{% endblock %} {% block content %} <ul class="tabs"> {% for pagename, locale, page in all_pages %} diff --git a/searx/templates/simple/new_issue.html b/searx/templates/simple/new_issue.html index 55dbefe60..a143cc7df 100644 --- a/searx/templates/simple/new_issue.html +++ b/searx/templates/simple/new_issue.html @@ -60,6 +60,16 @@ or manually by executing the searx/webapp.py file? --> {{-'\n '}}* {{ test_name }}: {% for result in results%}`{{ result }}`,{% endfor -%} {%- endfor -%} </textarea> - <button type="submit" class="github-issue-button" title="{{ get_setting('brand.new_issue_url') }}">{{ _('Submit a new issue on Github including the above information') }}</button> + <input type="checkbox" id="step1"> + <label for="step1">{{ _('Start submiting a new issue on GitHub') }}</label> + <div class="step1 step_content"> + <p><a href="{{ get_setting('brand.issue_url') }}?q=is%3Aissue+Bug:%20{{ engine_name }}" target="_blank" rel="noreferrer noreferrer">{{ _('Please check for existing bugs about this engine on GitHub') }}</a></p> + </div> + <input class="step1 step1_delay" type="checkbox" id="step2"> + <label class="step1 step1_delay" for="step2" >{{ _('I confirm there is no existing bug about the issue I encounter') }}</label> + <div class="step2 step_content"> + <p>{{ _('If this is a public instance, please specify the URL in the bug report') }}</p> + <button type="submit" class="github-issue-button" title="{{ get_setting('brand.new_issue_url') }}">{{ _('Submit a new issue on Github including the above information') }}</button> + </div> </form> {% endmacro %} diff --git a/searx/templates/simple/preferences.html b/searx/templates/simple/preferences.html index 4dde6fec2..7f9be5693 100644 --- a/searx/templates/simple/preferences.html +++ b/searx/templates/simple/preferences.html @@ -213,6 +213,16 @@ </p> <div class="description">{{ _('Choose auto to follow your browser settings') }}</div> </fieldset> + <fieldset> + <legend id="pref_center_alignment">{{ _('Center Alignment') }}</legend> + <p class="value"> + <select name="center_alignment" aria-labelledby="pref_center_alignment"> + <option value="1" {% if preferences.get_value('center_alignment') %}selected="selected"{% endif %}>{{ _('On') }}</option> + <option value="0" {% if not preferences.get_value('center_alignment') %}selected="selected"{% endif %}>{{ _('Off')}}</option> + </select> + </p> + <div class="description">{{ _('Displays results in the center of the page (Oscar layout).') }}</div> + </fieldset> {% endif %} {% if 'results_on_new_tab' not in locked_preferences %} <fieldset> @@ -260,7 +270,7 @@ <p class="value"> <select name='image_proxy' aria-labelledby="pref_image_proxy"> <option value="1" {% if image_proxy %}selected="selected"{% endif %}>{{ _('Enabled') }}</option> - <option value="" {% if not image_proxy %}selected="selected"{% endif %}>{{ _('Disabled') }}</option> + <option value="0" {% if not image_proxy %}selected="selected"{% endif %}>{{ _('Disabled') }}</option> </select> </p> <div class="description">{{ _('Proxying image results through SearXNG') }}</div> @@ -272,7 +282,7 @@ <p class="value"> <select name='query_in_title' aria-labelledby="pref_query_in_title"> <option value="1" {% if query_in_title %}selected="selected"{% endif %}>{{ _('Enabled') }}</option> - <option value="" {% if not query_in_title %}selected="selected"{% endif %}>{{ _('Disabled') }}</option> + <option value="0" {% if not query_in_title %}selected="selected"{% endif %}>{{ _('Disabled') }}</option> </select> </p> <div class="description">{{ _("When enabled, the result page's title contains your query. Your browser can record this title") }}</div> diff --git a/searx/templates/simple/result_templates/code.html b/searx/templates/simple/result_templates/code.html index 54bee0fbf..3fe429caa 100644 --- a/searx/templates/simple/result_templates/code.html +++ b/searx/templates/simple/result_templates/code.html @@ -1,4 +1,4 @@ -{% from 'simple/macros.html' import result_header, result_sub_header, result_sub_footer, result_footer, result_footer_rtl with context %} +{% from 'simple/macros.html' import result_header, result_sub_header, result_sub_footer, result_footer with context %} {{ result_header(result, favicons, image_proxify) -}} {{- result_sub_header(result) -}} diff --git a/searx/templates/simple/result_templates/default.html b/searx/templates/simple/result_templates/default.html index 1f2074ef4..263c19a36 100644 --- a/searx/templates/simple/result_templates/default.html +++ b/searx/templates/simple/result_templates/default.html @@ -1,4 +1,4 @@ -{% from 'simple/macros.html' import result_header, result_sub_header, result_sub_footer, result_footer, result_footer_rtl with context %} +{% from 'simple/macros.html' import result_header, result_sub_header, result_sub_footer, result_footer with context %} {{ result_header(result, favicons, image_proxify) -}} {{- result_sub_header(result) -}} diff --git a/searx/templates/simple/result_templates/map.html b/searx/templates/simple/result_templates/map.html index 3492d5d5f..3bdc378d6 100644 --- a/searx/templates/simple/result_templates/map.html +++ b/searx/templates/simple/result_templates/map.html @@ -1,4 +1,4 @@ -{% from 'simple/macros.html' import result_header, result_sub_header, result_sub_footer, result_footer, result_footer_rtl with context %} +{% from 'simple/macros.html' import result_header, result_sub_header, result_sub_footer, result_footer with context %} {% from 'simple/icons.html' import icon_small %} {{ result_header(result, favicons, image_proxify) -}} @@ -35,7 +35,7 @@ <tr><th scope="row">{{ info.label }}</th><td>{{ info.value|safe }}</td></tr> {%- endfor -%} {%- for link in result.links -%} - <tr><th scope="row">{{ link.label }}</th><td><a class="text-info cursor-pointer" href="{{ link.url }}">{{ link.url|safe }}</a></td></tr> + <tr><th scope="row">{{ link.label }}</th><td><a class="text-info cursor-pointer" href="{{ link.url }}">{{ link.url_label|safe }}</a></td></tr> {%- endfor -%} </table> diff --git a/searx/templates/simple/result_templates/products.html b/searx/templates/simple/result_templates/products.html index c49f29ecb..0a9bbf03a 100644 --- a/searx/templates/simple/result_templates/products.html +++ b/searx/templates/simple/result_templates/products.html @@ -1,4 +1,4 @@ -{% from 'simple/macros.html' import result_header, result_sub_header, result_sub_footer, result_footer, result_footer_rtl with context %} +{% from 'simple/macros.html' import result_header, result_sub_header, result_sub_footer, result_footer with context %} {{ result_header(result, favicons, image_proxify) -}} {{- result_sub_header(result) -}} diff --git a/searx/templates/simple/result_templates/torrent.html b/searx/templates/simple/result_templates/torrent.html index ecca0fdec..46cde2a65 100644 --- a/searx/templates/simple/result_templates/torrent.html +++ b/searx/templates/simple/result_templates/torrent.html @@ -1,4 +1,4 @@ -{% from 'simple/macros.html' import result_header, result_sub_header, result_sub_footer, result_footer, result_footer_rtl, result_link with context %} +{% from 'simple/macros.html' import result_header, result_sub_header, result_sub_footer, result_footer, result_link with context %} {{ result_header(result, favicons, image_proxify) -}} {{- result_sub_header(result) -}} diff --git a/searx/templates/simple/result_templates/videos.html b/searx/templates/simple/result_templates/videos.html index bfff48d2d..969f87a4d 100644 --- a/searx/templates/simple/result_templates/videos.html +++ b/searx/templates/simple/result_templates/videos.html @@ -1,4 +1,4 @@ -{% from 'simple/macros.html' import result_header, result_sub_header, result_sub_footer, result_footer, result_footer_rtl with context %} +{% from 'simple/macros.html' import result_header, result_sub_header, result_sub_footer, result_footer with context %} {{ result_header(result, favicons, image_proxify) }} {{ result_sub_header(result) }} diff --git a/searx/templates/simple/stats.html b/searx/templates/simple/stats.html index 9cc035cfd..378fedd43 100644 --- a/searx/templates/simple/stats.html +++ b/searx/templates/simple/stats.html @@ -91,15 +91,15 @@ </table> {% endif %} -<div> - {% if selected_engine_name %} +{% if selected_engine_name %} + <div class="engine-errors"> {% for secondary in [False, True] %} {% set ns = namespace(first=true) %} {% for error in engine_reliabilities[selected_engine_name].errors %} {% if secondary == error.secondary %} {% if ns.first %} {% set ns.first = false %} - <h3>{% if secondary %}{{ _('Warnings') }}{% else %}{{ _('Errors and exceptions') }}{% endif %}</h3> + <h2>{% if secondary %}{{ _('Warnings') }}{% else %}{{ _('Errors and exceptions') }}{% endif %}</h2> {% endif %} <table class="engine-error"> <tbody> @@ -145,7 +145,7 @@ </table> {% endif %} {{ new_issue(selected_engine_name, engine_reliabilities[selected_engine_name]) }} - {% endif %} -</div> + </div> +{% endif %} {% endblock %} |