ZaclysIndustries
/
searxngRebrandZaclys
forked from zaclys/searxng
2
0
Fork 0
Code Issues Pull Requests Activity

[themes] /preferences, reliablity: warning icons & error logs link 

When there is at least one errors or one failed checker test:
* the warning icon is displayed in the reliability column
* the link "View error logs and submit a bug report" is displayed on engine name tooltip.

Before:
* the warning icon was displayed only when one or more checker test(s) failed.
* the link "View error logs and submit a bug report" was not shown when a checker test failed but there were no error.
This commit is contained in:
Alexandre Flament 2021-04-30 11:49:39 +02:00
parent e5bcc3cbbe
commit e83862c22f
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
searx/templates/oscar/preferences.html
View File

@ -12,7 +12,7 @@
{%- if stats[search_engine.name]['result_count'] -%} {%- if stats[search_engine.name]['result_count'] -%}
<p>{{ _('Number of results') }}: {{ stats[search_engine.name]['result_count'] }} ( {{ _('Avg.') }} )</p>{{- "" -}} <p>{{ _('Number of results') }}: {{ stats[search_engine.name]['result_count'] }} ( {{ _('Avg.') }} )</p>{{- "" -}}
{%- endif -%} {%- endif -%}
{%- if reliabilities[search_engine.name].errors -%} {%- if reliabilities.get(search_engine.name, {}).errors or reliabilities.get(search_engine.name, {}).checker -%}
<a href="{{ url_for('stats', engine=search_engine.name|e) }}" title="{{ _('View error logs and submit a bug report') }}"> <a href="{{ url_for('stats', engine=search_engine.name|e) }}" title="{{ _('View error logs and submit a bug report') }}">
{{ _('View error logs and submit a bug report') }} {{ _('View error logs and submit a bug report') }}
</a> </a>
@ -56,11 +56,11 @@
{% if checker_result or errors %} {% if checker_result or errors %}
<td class="{{ css_align_class }} {{ label }}">{{- "" -}} <td class="{{ css_align_class }} {{ label }}">{{- "" -}}
<a href="{{ url_for('stats', engine=engine_name|e) }}">{{- "" -}} <a href="{{ url_for('stats', engine=engine_name|e) }}">{{- "" -}}
<span aria-labelledby="{{engine_name}}_reliablity"> <span aria-labelledby="{{engine_name}}_reliability">
{%- if reliabilities[engine_name].checker %}{{ icon('exclamation-sign', 'The checker fails on the some tests') }}{% endif %} {{ r -}}</a> {{ icon('exclamation-sign', 'The engine is not reliabled') }} {{ r -}}
</span>{{- "" -}} </span>{{- "" -}}
</a>{{- "" -}} </a>{{- "" -}}
<div class="engine-tooltip text-left" role="tooltip" id="{{engine_name}}_reliablity"> <div class="engine-tooltip text-left" role="tooltip" id="{{engine_name}}_reliability">
{%- if checker_result -%} {%- if checker_result -%}
<p>{{ _("Failed checker test(s): ") }} {{ ', '.join(checker_result) }}</p> <p>{{ _("Failed checker test(s): ") }} {{ ', '.join(checker_result) }}</p>
{%- endif -%} {%- endif -%}

12
searx/templates/simple/preferences.html
View File

@ -25,7 +25,7 @@
<p><a href="{{about.website}}" rel="noreferrer">{{about.website}}</a></p> <p><a href="{{about.website}}" rel="noreferrer">{{about.website}}</a></p>
{%- if about.wikidata_id -%}<p><a href="https://www.wikidata.org/wiki/{{about.wikidata_id}}" rel="noreferrer">wikidata.org/wiki/{{about.wikidata_id}}</a></p>{%- endif -%} {%- if about.wikidata_id -%}<p><a href="https://www.wikidata.org/wiki/{{about.wikidata_id}}" rel="noreferrer">wikidata.org/wiki/{{about.wikidata_id}}</a></p>{%- endif -%}
{%- if search_engine.enable_http %}<p>{{ icon('exclamation-sign', 'No HTTPS') }}{{ _('No HTTPS')}}</p>{% endif -%} {%- if search_engine.enable_http %}<p>{{ icon('exclamation-sign', 'No HTTPS') }}{{ _('No HTTPS')}}</p>{% endif -%}
{%- if reliabilities[search_engine.name].errors -%} {%- if reliabilities.get(search_engine.name, {}).errors or reliabilities.get(search_engine.name, {}).checker -%}
<a href="{{ url_for('stats', engine=search_engine.name|e) }}" title="{{ _('View error logs and submit a bug report') }}"> <a href="{{ url_for('stats', engine=search_engine.name|e) }}" title="{{ _('View error logs and submit a bug report') }}">
{{ _('View error logs and submit a bug report') }} {{ _('View error logs and submit a bug report') }}
</a> </a>
@ -70,13 +70,13 @@
{% if checker_result or errors %} {% if checker_result or errors %}
<td class="{{ label }}">{{- "" -}} <td class="{{ label }}">{{- "" -}}
<a href="{{ url_for('stats', engine=engine_name|e) }}">{{- "" -}} <a href="{{ url_for('stats', engine=engine_name|e) }}">{{- "" -}}
<span aria-labelledby="{{engine_name}}_reliablity"> <span aria-labelledby="{{engine_name}}_reliability">
{%- if reliabilities[engine_name].checker %}{{ icon('warning', 'The checker fails on the some tests') }}{% endif %} {{ r -}} {{ icon('warning', 'The engine is not reliabled') }} {{ r -}}
</span>{{- "" -}} </span>{{- "" -}}
</a>{{- "" -}} </a>{{- "" -}}
<div class="engine-tooltip" style="right: 12rem;" role="tooltip" id="{{engine_name}}_reliablity"> <div class="engine-tooltip" style="right: 12rem;" role="tooltip" id="{{engine_name}}_reliability">
{%- if checker_result -%} {%- if checker_result -%}
<p>{{ _("The checker fails on this tests: ") }} {{ ', '.join(checker_result) }}</p> <p>{{ _("Failed checker test(s): ") }} {{ ', '.join(checker_result) }}</p>
{%- endif -%} {%- endif -%}
{%- if errors %}<p>{{ _('Errors:') }}</p>{% endif -%} {%- if errors %}<p>{{ _('Errors:') }}</p>{% endif -%}
{%- for error in errors -%} {%- for error in errors -%}
@ -85,7 +85,7 @@
</div>{{- "" -}} </div>{{- "" -}}
</td> </td>
{%- else -%} {%- else -%}
<td class="{{ css_align_class }} {{ label }}"><span>{{ r }}</span></td> <td class="{{ label }}"><span>{{ r }}</span></td>
{%- endif -%} {%- endif -%}
{%- endmacro -%} {%- endmacro -%}