diff options
| -rw-r--r-- | searx/templates/oscar/messages/no_results.html | 9 | ||||
| -rw-r--r-- | searx/templates/oscar/preferences.html | 25 | ||||
| -rw-r--r-- | searx/templates/oscar/results.html | 7 | ||||
| -rw-r--r-- | searx/templates/simple/messages/no_results.html | 12 | ||||
| -rw-r--r-- | searx/templates/simple/preferences.html | 14 | ||||
| -rw-r--r-- | searx/templates/simple/results.html | 10 |
6 files changed, 54 insertions, 23 deletions
diff --git a/searx/templates/oscar/messages/no_results.html b/searx/templates/oscar/messages/no_results.html index 82bf2f77a..7ad6423c5 100644 --- a/searx/templates/oscar/messages/no_results.html +++ b/searx/templates/oscar/messages/no_results.html @@ -2,11 +2,14 @@ {% if unresponsive_engines %} <div class="alert alert-danger fade in" role="alert"> <p><strong class="lead">{{ icon('remove-sign') }} {{ _('Error!') }}</strong> {{ _('Engines cannot retrieve results.') }}</p> + {%- for engine_name, error_type in unresponsive_engines -%} <p> - {% for engine_name, error_type in unresponsive_engines %} - {{ engine_name }} ({{ error_type }}){% if not loop.last %}, {% endif %} - {% endfor %} + {{- engine_name }} ( + <a href="{{ url_for('stats', engine=engine_name|e) }}" title="{{ _('View error logs and submit a bug report') }}"> + {{- error_type -}} + </a> ){{- '' -}} </p> + {%- endfor -%} <p><small>{{ _('Please, try again later or find another searx instance.') }} (<a href="{{ brand.PUBLIC_INSTANCES }}">{{ _('Public instances') }}</a>)</small></p> </div> {% else %} diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html index e8cae1ca5..3f113afec 100644 --- a/searx/templates/oscar/preferences.html +++ b/searx/templates/oscar/preferences.html @@ -12,6 +12,11 @@ {%- if stats[search_engine.name]['result_count'] -%} <p>{{ _('Number of results') }}: {{ stats[search_engine.name]['result_count'] }} ( {{ _('Avg.') }} )</p>{{- "" -}} {%- endif -%} + {%- if reliabilities[search_engine.name].errors -%} + <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') }} + </a> + {%- endif -%} </div> {%- endif -%} {%- endmacro %} @@ -50,9 +55,11 @@ {% endif %} {% if checker_result or errors %} <td class="{{ css_align_class }} {{ label }}">{{- "" -}} - <span aria-labelledby="{{engine_name}}_reliablity"> - {%- if reliabilities[engine_name].checker %}{{ icon('exclamation-sign', 'The checker fails on the some tests') }}{% endif %} {{ r -}} - </span>{{- "" -}} + <a href="{{ url_for('stats', engine=engine_name|e) }}">{{- "" -}} + <span aria-labelledby="{{engine_name}}_reliablity"> + {%- if reliabilities[engine_name].checker %}{{ icon('exclamation-sign', 'The checker fails on the some tests') }}{% endif %} {{ r -}}</a> + </span>{{- "" -}} + </a>{{- "" -}} <div class="engine-tooltip text-left" role="tooltip" id="{{engine_name}}_reliablity"> {%- if checker_result -%} <p>{{ _("Failed checker test(s): ") }} {{ ', '.join(checker_result) }}</p> @@ -418,22 +425,22 @@ </div> </div> - <p class="text-muted"> - {{ _('These settings are stored in your cookies, this allows us not to store this data about you.') }} + <p class="text-muted"> + {{ _('These settings are stored in your cookies, this allows us not to store this data about you.') }} {{ _("These cookies serve your sole convenience, we don't use these cookies to track you.") }} </p> <p> - {{ _('Search URL of the currently saved preferences') }} - <small class="text-muted">({{ _('Note: specifying custom settings in the search URL can reduce privacy by leaking data to the clicked result sites.') }})</small>: + {{ _('Search URL of the currently saved preferences') }} + <small class="text-muted">({{ _('Note: specifying custom settings in the search URL can reduce privacy by leaking data to the clicked result sites.') }})</small>: </p> - <div class="tab-pane"> + <div class="tab-pane"> <input readonly="" class="form-control select-all-on-click cursor-text" type="url" value="{{ url_for('index', _external=True) }}?preferences={{ preferences_url_params|e }}{% raw %}&q=%s{% endraw %}"> <input type="submit" class="btn btn-primary" value="{{ _('save') }}" /> <a href="{{ url_for('index') }}"><div class="btn btn-default">{{ _('back') }}</div></a> <a href="{{ url_for('clear_cookies') }}"><div class="btn btn-default">{{ _('Reset defaults') }}</div></a> - </div> + </div> </form> </div> {% endblock %} diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html index df2d42430..ec84e489b 100644 --- a/searx/templates/oscar/results.html +++ b/searx/templates/oscar/results.html @@ -31,7 +31,12 @@ <div class="alert alert-danger fade in" role="alert"> <p>{{ _('Engines cannot retrieve results') }}:</p> {%- for engine_name, error_type in unresponsive_engines -%} - {{- engine_name }} ({{ error_type }}){% if not loop.last %}, {% endif %}{{- "" -}} + <p>{{- '' -}} + {{- engine_name }} ( + <a href="{{ url_for('stats', engine=engine_name|e) }}" title="{{ _('View error logs and submit a bug report') }}"> + {{- error_type -}} + </a> ){{- '' -}} + </p> {%- endfor -%} </div> {%- endif %} diff --git a/searx/templates/simple/messages/no_results.html b/searx/templates/simple/messages/no_results.html index df75ef228..b7f02167e 100644 --- a/searx/templates/simple/messages/no_results.html +++ b/searx/templates/simple/messages/no_results.html @@ -2,11 +2,15 @@ {% if unresponsive_engines %} <div class="dialog-error" role="alert"> <p><strong>{{ _('Error!') }}</strong> {{ _('Engines cannot retrieve results.') }}</p> - <p> - {% for engine_name, error_type in unresponsive_engines %} - {{ engine_name }} ({{ error_type }}){% if not loop.last %}, {% endif %} - {% endfor %} + {% for engine_name, error_type in unresponsive_engines %} + <p>{{- '' -}} + {{- engine_name }} ( + <a href="{{ url_for('stats', engine=engine_name|e) }}" title="{{ _('View error logs and submit a bug report') }}"> + {{- error_type -}} + </a> ){{- '' -}} </p> + {%- endfor %} + <p><small>{{ _('Please, try again later or find another searx instance.') }} (<a href="{{ brand.PUBLIC_INSTANCES }}">{{ _('Public instances') }}</a>) </small></p> </div> {% else %} diff --git a/searx/templates/simple/preferences.html b/searx/templates/simple/preferences.html index c7c379618..3e0f6d4cd 100644 --- a/searx/templates/simple/preferences.html +++ b/searx/templates/simple/preferences.html @@ -25,6 +25,12 @@ <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 search_engine.enable_http %}<p>{{ icon('exclamation-sign', 'No HTTPS') }}{{ _('No HTTPS')}}</p>{% endif -%} + {%- if reliabilities[search_engine.name].errors -%} + <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') }} + </a> + {%- endif -%} + </div> {%- endif -%} {%- endmacro %} @@ -63,9 +69,11 @@ {% endif %} {% if checker_result or errors %} <td class="{{ label }}">{{- "" -}} - <span aria-labelledby="{{engine_name}}_reliablity"> - {%- if reliabilities[engine_name].checker %}{{ icon('warning', 'The checker fails on the some tests') }}{% endif %} {{ r -}} - </span>{{- "" -}} + <a href="{{ url_for('stats', engine=engine_name|e) }}">{{- "" -}} + <span aria-labelledby="{{engine_name}}_reliablity"> + {%- if reliabilities[engine_name].checker %}{{ icon('warning', 'The checker fails on the some tests') }}{% endif %} {{ r -}} + </span>{{- "" -}} + </a>{{- "" -}} <div class="engine-tooltip" style="right: 12rem;" role="tooltip" id="{{engine_name}}_reliablity"> {%- if checker_result -%} <p>{{ _("The checker fails on this tests: ") }} {{ ', '.join(checker_result) }}</p> diff --git a/searx/templates/simple/results.html b/searx/templates/simple/results.html index 7ece6c7ad..c53529edd 100644 --- a/searx/templates/simple/results.html +++ b/searx/templates/simple/results.html @@ -43,9 +43,13 @@ {% if unresponsive_engines and results|length >= 1 %} <div class="dialog-error" role="alert"> <p><strong>{{ _('Error!') }}</strong> {{ _('Engines cannot retrieve results') }}:</p> - <p>{% for engine_name, error_type in unresponsive_engines %} - {{- engine_name }} ({{- error_type -}}){% if not loop.last %}, {% endif %} - {% endfor %}</p> + {%- for engine_name, error_type in unresponsive_engines -%} + <p>{{- engine_name }} ( + <a href="{{ url_for('stats', engine=engine_name|e) }}" title="{{ _('View error logs and submit a bug report') }}"> + {{- error_type -}} + </a> ){{- '' -}} + </p> + {% endfor %} </div> {% endif %} |