diff options
| author | Martin Fischer <martin@push-f.com> | 2022-01-30 09:39:21 +0100 |
|---|---|---|
| committer | Martin Fischer <martin@push-f.com> | 2022-01-30 17:29:21 +0100 |
| commit | 6f0ec7e58f9c7c9d188561296546ec139e1f9118 (patch) | |
| tree | 86c03106e50bd690a6fe50657ddae1706e29ff21 /searx/templates | |
| parent | 2a6d84dab5fa22a98718afa7450c7a35b987e9c1 (diff) | |
| download | searxng-6f0ec7e58f9c7c9d188561296546ec139e1f9118.tar.gz searxng-6f0ec7e58f9c7c9d188561296546ec139e1f9118.zip | |
[simple] introduce page_with_header.html template
Previously the preferences & stats templates contained the markup:
<a href="{{ url_for('index') }}"><h1><span>SearXNG</span></h1></a>
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.
Diffstat (limited to 'searx/templates')
| -rw-r--r-- | searx/templates/simple/about.html | 2 | ||||
| -rw-r--r-- | searx/templates/simple/base.html | 4 | ||||
| -rw-r--r-- | searx/templates/simple/page_with_header.html | 5 | ||||
| -rw-r--r-- | searx/templates/simple/preferences.html | 7 | ||||
| -rw-r--r-- | searx/templates/simple/stats.html | 7 |
5 files changed, 13 insertions, 12 deletions
diff --git a/searx/templates/simple/about.html b/searx/templates/simple/about.html index 9f6a10ced..f6a0a96a9 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 bb1f51cad..548710310 100644 --- a/searx/templates/simple/base.html +++ b/searx/templates/simple/base.html @@ -35,7 +35,7 @@ <link rel="icon" href="{{ url_for('static', filename='img/favicon.svg') }}" type="image/svg+xml"> </head> <body class="{{ endpoint }}_endpoint" > - <main id="main_{{ self._TemplateReference__context.name|replace("simple/", "")|replace(".html", "") }}"> + <main id="main_{{ self._TemplateReference__context.name|replace("simple/", "")|replace(".html", "") }}" class="{{body_class}}"> {% if errors %} <div class="dialog-error" role="alert"> <a href="#" class="close" aria-label="close" title="close">×</a> @@ -47,6 +47,8 @@ </div> {% endif %} + {% block header %} + {% endblock %} {% block content %} {% endblock %} </main> diff --git a/searx/templates/simple/page_with_header.html b/searx/templates/simple/page_with_header.html new file mode 100644 index 000000000..d4466b612 --- /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 %} +<a href="{{ url_for('index') }}"><img class="logo" src="{{ url_for('static', filename='img/searxng.png') }}" alt="SearXNG"></a> +{% endblock %} diff --git a/searx/templates/simple/preferences.html b/searx/templates/simple/preferences.html index 898221166..6b21afee4 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 %} - -<a href="{{ url_for('index') }}"><h1><span>SearXNG</span></h1></a> - -<h2>{{ _('Preferences') }}</h2> +<h1>{{ _('Preferences') }}</h1> <form id="search_form" method="post" action="{{ url_for('preferences') }}"> diff --git a/searx/templates/simple/stats.html b/searx/templates/simple/stats.html index 1e905790a..f45f5b260 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 %} - -<a href="{{ url_for('index') }}"><h1><span>SearXNG</span></h1></a> - -<h2>{% if selected_engine_name %}<a href="{{ url_for('stats') }}">{% endif %}{{ _('Engine stats') }}{% if selected_engine_name %}</a> - {{ selected_engine_name }}{% endif %}</h2> +<h1>{% if selected_engine_name %}<a href="{{ url_for('stats') }}">{% endif %}{{ _('Engine stats') }}{% if selected_engine_name %}</a> - {{ selected_engine_name }}{% endif %}</h1> {% if not engine_stats.get('time') %} {{ _('There is currently no data available. ') }} |