From 6f0ec7e58f9c7c9d188561296546ec139e1f9118 Mon Sep 17 00:00:00 2001 From: Martin Fischer Date: Sun, 30 Jan 2022 09:39:21 +0100 Subject: [PATCH] [simple] introduce page_with_header.html template Previously the preferences & stats templates contained the markup:

SearXNG

 There are many things wrong with this: 1. the markup was duplicated 2. the CSS needed to be changed whenever a new page wanted to use this header (since the CSS used page-specific selectors) 3. h1 should be reserved for the actual page title (e.g. Preferences or Engine stats) 4. the image was set via CSS which also set: span { visibility: hidden; } which however removes the alternative text from the accessibility tree (meaning screen readers will ignore it). This commit fixes all these problems. --- .../static/themes/simple/src/less/style.less | 20 ++++--------------- searx/templates/simple/about.html | 2 +- searx/templates/simple/base.html | 4 +++- searx/templates/simple/page_with_header.html | 5 +++++ searx/templates/simple/preferences.html | 7 ++----- searx/templates/simple/stats.html | 7 ++----- 6 files changed, 17 insertions(+), 28 deletions(-) create mode 100644 searx/templates/simple/page_with_header.html diff --git a/searx/static/themes/simple/src/less/style.less b/searx/static/themes/simple/src/less/style.less index 657e0d3a..4011dddb 100644 --- a/searx/static/themes/simple/src/less/style.less +++ b/searx/static/themes/simple/src/less/style.less @@ -79,9 +79,7 @@ main { flex: 1; } -#main_preferences, -#main_about, -#main_stats { +.page_with_header { margin: 2em auto; width: 85em; } @@ -101,16 +99,8 @@ footer { } } -#main_preferences h1, -#main_stats h1 { - background: url('../img/searxng.png') no-repeat; - background-size: contain; - min-height: 40px; - margin: 0 auto; - - span { - visibility: hidden; - } +.page_with_header .logo { + height: 40px; } input[type="submit"], @@ -647,9 +637,7 @@ article[data-vim-selected].category-social { } @media screen and (max-width: @tablet) { - #main_preferences, - #main_about, - #main_stats { + .page_with_header { margin: 2rem 0.5rem; width: auto; } diff --git a/searx/templates/simple/about.html b/searx/templates/simple/about.html index 9f6a10ce..f6a0a96a 100644 --- a/searx/templates/simple/about.html +++ b/searx/templates/simple/about.html @@ -1,4 +1,4 @@ -{% extends 'simple/base.html' %} +{% extends 'simple/page_with_header.html' %} {% block content %} {{ help.about | safe }} {% include "__common__/aboutextend.html" ignore missing %} diff --git a/searx/templates/simple/base.html b/searx/templates/simple/base.html index bb1f51ca..54871031 100644 --- a/searx/templates/simple/base.html +++ b/searx/templates/simple/base.html @@ -35,7 +35,7 @@ -
+
{% if errors %} {% endif %} + {% block header %} + {% endblock %} {% block content %} {% endblock %}
diff --git a/searx/templates/simple/page_with_header.html b/searx/templates/simple/page_with_header.html new file mode 100644 index 00000000..d4466b61 --- /dev/null +++ b/searx/templates/simple/page_with_header.html @@ -0,0 +1,5 @@ +{% set body_class = "page_with_header" %} +{% extends "simple/base.html" %} +{% block header %} + +{% endblock %} diff --git a/searx/templates/simple/preferences.html b/searx/templates/simple/preferences.html index 89822116..6b21afee 100644 --- a/searx/templates/simple/preferences.html +++ b/searx/templates/simple/preferences.html @@ -1,7 +1,7 @@ {% from 'simple/macros.html' import tabs_open, tabs_close, tab_header, tab_footer, checkbox_onoff, checkbox %} {% from 'simple/icons.html' import icon_big %} -{% extends "simple/base.html" %} +{% extends "simple/page_with_header.html" %} {%- macro plugin_preferences(section) -%} {%- for plugin in plugins -%} @@ -95,10 +95,7 @@ {% block head %} {% endblock %} {% block content %} - -

SearXNG

 - -

{{ _('Preferences') }}

+

{{ _('Preferences') }}

diff --git a/searx/templates/simple/stats.html b/searx/templates/simple/stats.html index 1e905790..f45f5b26 100644 --- a/searx/templates/simple/stats.html +++ b/searx/templates/simple/stats.html @@ -1,7 +1,7 @@ {% from 'simple/icons.html' import icon_big %} {% from '__common__/new_issue.html' import new_issue with context %} -{% extends "simple/base.html" %} +{% extends "simple/page_with_header.html" %} {%- macro th_sort(column_order, column_name) -%} {% if selected_engine_name %} @@ -15,10 +15,7 @@ {% block head %} {% endblock %} {% block content %} - -

SearXNG

 - -

{% if selected_engine_name %}{% endif %}{{ _('Engine stats') }}{% if selected_engine_name %} - {{ selected_engine_name }}{% endif %}

+

{% if selected_engine_name %}{% endif %}{{ _('Engine stats') }}{% if selected_engine_name %} - {{ selected_engine_name }}{% endif %}

{% if not engine_stats.get('time') %} {{ _('There is currently no data available. ') }}