diff options
| -rw-r--r-- | searx/templates/simple/base.html | 6 | ||||
| -rw-r--r-- | searx/templates/simple/preferences.html | 8 | ||||
| -rw-r--r-- | searx/templates/simple/stats.html | 5 | ||||
| -rwxr-xr-x | searx/webapp.py | 3 |
4 files changed, 10 insertions, 12 deletions
diff --git a/searx/templates/simple/base.html b/searx/templates/simple/base.html index a2464a1a5..66c1b7434 100644 --- a/searx/templates/simple/base.html +++ b/searx/templates/simple/base.html @@ -62,9 +62,9 @@ <footer> <p> {{ _('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="{{ searx_git_url }}">{{ _('Source code') }}</a> + | <a href="{{ get_setting('brand.issue_url') }}">{{ _('Issue tracker') }}</a> + {% if enable_metrics %}| <a href="{{ url_for('stats') }}">{{ _('Engine stats') }}</a>{% endif %} {% if get_setting('brand.public_instances') %} | <a href="{{ get_setting('brand.public_instances') }}">{{ _('Public instances') }}</a> {% endif %} diff --git a/searx/templates/simple/preferences.html b/searx/templates/simple/preferences.html index 7f9be5693..b6fba439c 100644 --- a/searx/templates/simple/preferences.html +++ b/searx/templates/simple/preferences.html @@ -310,9 +310,9 @@ <th>{{ _("Supports selected language") }}</th>{{- "" -}} <th>{{ _("SafeSearch") }}</th>{{- "" -}} <th>{{ _("Time range") }}</th>{{- "" -}} - <th>{{ _("Response time") }}</th>{{- "" -}} + {%- if enable_metrics %}<th>{{ _("Response time") }}</th>{% endif -%} <th>{{ _("Max time") }}</th>{{- "" -}} - <th>{{ _("Reliability") }}</th>{{- "" -}} + {%- if enable_metrics %}<th>{{ _("Reliability") }}</th>{% endif -%} </tr> {% for group, engines in engines_by_category[categ] | group_engines_in_tab %} {% if loop.length > 1 %} @@ -336,9 +336,9 @@ <td>{{ checkbox(None, supports[search_engine.name]['supports_selected_language'], true) }}</td>{{- "" -}} <td>{{ checkbox(None, supports[search_engine.name]['safesearch'], true) }}</td>{{- "" -}} <td>{{ checkbox(None, supports[search_engine.name]['time_range_support'], true) }}</td>{{- "" -}} - {{- engine_time(search_engine.name) -}} + {%- if enable_metrics %}{{- engine_time(search_engine.name) -}}{% endif -%} <td class="{{ 'danger' if stats[search_engine.name]['warn_timeout'] else '' }}">{{ search_engine.timeout }}</td>{{- "" -}} - {{ engine_reliability(search_engine.name) -}} + {%- if enable_metrics %}{{ engine_reliability(search_engine.name) -}}{% endif -%} </tr> {% endif %} {% endfor %} diff --git a/searx/templates/simple/stats.html b/searx/templates/simple/stats.html index 378fedd43..d2d5ae2b1 100644 --- a/searx/templates/simple/stats.html +++ b/searx/templates/simple/stats.html @@ -33,10 +33,7 @@ <td class="engine-name"><a href="{{ url_for('stats', engine=engine_stat.name|e) }}">{{ engine_stat.name }}</a></td> <td class="engine-score"> {% if engine_stat.score %} - <span aria-labelledby="{{engine_stat.name}}_score" >{{ engine_stat.score|round(1) }}</span> - <div class="engine-tooltip" role="tooltip" id="{{engine_stat.name}}_score">{{- "" -}} - <p>{{ _('Scores per result') }}: {{ engine_stat.score_per_result | round(3) }}</p> - </div> + <span>{{ engine_stat.score_per_result|round(1) }}</span> {% endif %} </td> <td class="engine-result-count"> diff --git a/searx/webapp.py b/searx/webapp.py index 369b2d2db..bd76cc534 100755 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -145,7 +145,7 @@ result_templates = get_result_templates(templates_path) STATS_SORT_PARAMETERS = { 'name': (False, 'name', ''), - 'score': (True, 'score', 0), + 'score': (True, 'score_per_result', 0), 'result_count': (True, 'result_count', 0), 'time': (False, 'total', 0), 'reliability': (False, 'reliability', 100), @@ -450,6 +450,7 @@ def render(template_name: str, **kwargs): kwargs['instance_name'] = get_setting('general.instance_name') kwargs['searx_version'] = VERSION_STRING kwargs['searx_git_url'] = GIT_URL + kwargs['enable_metrics'] = get_setting('general.enable_metrics') kwargs['get_setting'] = get_setting kwargs['get_pretty_url'] = get_pretty_url |