From cdfb4b7ff9829cb9048b573f7f1775dc8029f75a Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Sun, 16 May 2021 13:16:44 +0200
Subject: [fix] make /stats more CSP compliant - bar graph

Replace bar graph's *styles* (see below) by CSP compliant implementation in
``searx/static/themes/__common__/less/stats.less`` ::

    ./simple/stats.html:49: <span style="width: calc(max(2px, 100%*{{ (engine_stat.result_count / engine_stats.max_result_count )|round(3) }}))" class="stacked-bar-chart-serie1"></span>{{- "" -}}
    ./simple/stats.html:57: <span style="width: calc(max(2px, 100%*{{ (engine_stat.http / engine_stats.max_time )|round(3) }}))" class="stacked-bar-chart-serie1"></span>{{- "" -}}
    ./simple/stats.html:58: <span style="width: calc(100%*{{ engine_stat.processing / engine_stats.max_time |round(3) }})" class="stacked-bar-chart-serie2"></span>{{- "" -}}
    ./oscar/stats.html:50:  <span style="width: calc(max(2px, 100%*{{ (engine_stat.result_count / engine_stats.max_result_count )|round(3) }}))" class="stacked-bar-chart-serie1"></span>{{- "" -}}
    ./oscar/stats.html:58:  <span style="width: calc(max(2px, 100%*{{ (engine_stat.http / engine_stats.max_time )|round(3) }}))" class="stacked-bar-chart-serie1"></span>{{- "" -}}
    ./oscar/stats.html:59:  <span style="width: calc(100%*{{ engine_stat.processing / engine_stats.max_time |round(3) }})" class="stacked-bar-chart-serie2"></span>{{- "" -}}

Reported-by: https://github.com/searxng/searxng/issues/57
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 searx/templates/oscar/stats.html  | 18 +++++++++---------
 searx/templates/simple/stats.html | 20 +++++++++++---------
 2 files changed, 20 insertions(+), 18 deletions(-)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/stats.html b/searx/templates/oscar/stats.html
index 49c776ea8..8b57e39b6 100644
--- a/searx/templates/oscar/stats.html
+++ b/searx/templates/oscar/stats.html
@@ -45,19 +45,19 @@
                             </td>
                             <td>
                                 {%- if engine_stat.result_count -%}
-                                <span class="stacked-bar-chart-value">{{- engine_stat.result_count | int -}}</span>{{- "" -}}
-                                <span class="stacked-bar-chart" aria-hidden="true">{{- "" -}}
-                                    <span style="width: calc(max(2px, 100%*{{ (engine_stat.result_count / engine_stats.max_result_count )|round(3) }}))" class="stacked-bar-chart-serie1"></span>{{- "" -}}
-                                </span>
+                                <div class="bar-chart-value">{{- engine_stat.result_count | int -}}</div>{{- "" -}}
+				<div class="bar-chart-graph" aria-hidden="true">
+				  <div class="bar-chart-bar bar{{ (100 * engine_stat.result_count / engine_stats.max_result_count)|round }}"></div>{{- "" -}}
+				</div>
                                 {%- endif -%}
                             </td>
                             <td>
                                 {%- if engine_stat.total -%}
-                                <span class="stacked-bar-chart-value">{{- engine_stat.total | round(1) -}}</span>{{- "" -}}
-                                <span class="stacked-bar-chart" aria-labelledby="{{engine_stat.name}}_time" aria-hidden="true">{{- "" -}}
-                                    <span style="width: calc(max(2px, 100%*{{ (engine_stat.http / engine_stats.max_time )|round(3) }}))" class="stacked-bar-chart-serie1"></span>{{- "" -}}
-                                    <span style="width: calc(100%*{{ engine_stat.processing / engine_stats.max_time |round(3) }})" class="stacked-bar-chart-serie2"></span>{{- "" -}}
-                                </span>{{- "" -}}
+                                <div class="bar-chart-value">{{- engine_stat.total | round(1) -}}</div>{{- "" -}}
+				<div class="bar-chart-graph" aria-labelledby="{{engine_stat.name}}_time" aria-hidden="true">
+                                  <div class="bar-chart-serie1 bar{{ (100 * engine_stat.http / engine_stats.max_time)|round }}"></div>{{- "" -}}
+                                  <div class="bar-chart-serie2 bar{{ (100 * engine_stat.processing / engine_stats.max_time)|round }}"></div>{{- "" -}}
+				</div>
                                 <div class="engine-tooltip text-left" role="tooltip" id="{{engine_stat.name}}_time">{{- "" -}}
                                     <table class="table table-striped">
                                         <tr>
diff --git a/searx/templates/simple/stats.html b/searx/templates/simple/stats.html
index 098a54065..c2396f0e5 100644
--- a/searx/templates/simple/stats.html
+++ b/searx/templates/simple/stats.html
@@ -44,19 +44,21 @@
         </td>
         <td>
             {%- if engine_stat.result_count -%}
-            <span class="stacked-bar-chart-value">{{- engine_stat.result_count | int -}}</span>{{- "" -}}
-            <span class="stacked-bar-chart" aria-hidden="true">{{- "" -}}
-                <span style="width: calc(max(2px, 100%*{{ (engine_stat.result_count / engine_stats.max_result_count )|round(3) }}))" class="stacked-bar-chart-serie1"></span>{{- "" -}}
-            </span>
+
+            <div class="bar-chart-value">{{- engine_stat.result_count | int -}}</div>{{- "" -}}
+	    <div class="bar-chart-graph" aria-hidden="true">
+	      <div class="bar-chart-bar bar{{ (100 * engine_stat.result_count / engine_stats.max_result_count)|round }}"></div>{{- "" -}}
+	    </div>
             {%- endif -%}
         </td>
         <td>
             {%- if engine_stat.total -%}
-            <span class="stacked-bar-chart-value">{{- engine_stat.total | round(1) -}}</span>{{- "" -}}
-            <span class="stacked-bar-chart" aria-labelledby="{{engine_stat.name}}_time" aria-hidden="true">{{- "" -}}
-                <span style="width: calc(max(2px, 100%*{{ (engine_stat.http / engine_stats.max_time )|round(3) }}))" class="stacked-bar-chart-serie1"></span>{{- "" -}}
-                <span style="width: calc(100%*{{ engine_stat.processing / engine_stats.max_time |round(3) }})" class="stacked-bar-chart-serie2"></span>{{- "" -}}
-            </span>{{- "" -}}
+
+            <div class="bar-chart-value">{{- engine_stat.total | round(1) -}}</div>{{- "" -}}
+	    <div class="bar-chart-graph" aria-labelledby="{{engine_stat.name}}_time" aria-hidden="true">
+              <div class="bar-chart-serie1 bar{{ (100 * engine_stat.http / engine_stats.max_time)|round }}"></div>{{- "" -}}
+              <div class="bar-chart-serie2 bar{{ (100 * engine_stat.processing / engine_stats.max_time)|round }}"></div>{{- "" -}}
+	    </div>
             <div class="engine-tooltip" role="tooltip" id="{{engine_stat.name}}_time">{{- "" -}}
                 <table>
                     <tr>
-- 
cgit v1.2.3


From 0a6c488417f83fc2fbfcdb8d80b5978a14c561c4 Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Sun, 16 May 2021 14:18:42 +0200
Subject: [fix] make /stats more CSP compliant - simple theme

Replace simple theme's *styles* (see below) by CSP compliant implementation in
``searx/static/themes/simple/less/stats.less`` ::

    ./simple/stats.html:26:  <table style="max-width: 1280px; margin: 0 auto 0 0;">
    ./simple/stats.html:28:  <th scope="col" style="width:20rem;">{{ th_sort('name', _("Engine name")) }}</th>
    ./simple/stats.html:29:  <th scope="col" style="width:7rem; text-align: right;">{{ th_sort('score', _('Scores')) }}</th>
    ./simple/stats.html:32:  <th scope="col" style="text-align: right;">{{ th_sort('reliability', _('Reliability')) }}</th>
    ./simple/stats.html:37:  <td style="text-align: right;">
    ./simple/stats.html:90:  <td style="text-align: right;"> {{ engine_reliabilities.get(engine_stat.name, {}).get('reliablity') }}</td>
    ./simple/stats.html:106: <table style="max-width: 1280px; margin: 1rem; border: 1px solid gray;">
    ./simple/stats.html:107: <tbody style="padding-top: 1rem;">
    ./simple/stats.html:110: <th scope="row" style="width: 10rem">{{ _('Exception') }}</th><td>{{ error.exception_classname }}</td>
    ./simple/stats.html:112: <th scope="row" style="width: 10rem">{{ _('Message') }}</th><td>{{ error.log_message }}</td>
    ./simple/stats.html:114: <th scope="row" style="width: 10rem">{{ _('Percentage') }}</th><td style="width: 10rem">{{ error.percentage }}</td>
    ./simple/stats.html:119: <span style="border-right: 1px solid gray; padding: 0 1rem 0 0; margin: 0 0 0 0.5rem;">{{ param }}</span>
    ./simple/stats.html:136: <th scope="col" style="width: 10rem">{{ _('Failed test') }}</th>

Reported-by: https://github.com/searxng/searxng/issues/57
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 searx/templates/simple/stats.html | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'searx/templates')

diff --git a/searx/templates/simple/stats.html b/searx/templates/simple/stats.html
index c2396f0e5..968208381 100644
--- a/searx/templates/simple/stats.html
+++ b/searx/templates/simple/stats.html
@@ -23,18 +23,18 @@
 {% if not engine_stats.get('time') %}
 {{ _('There is currently no data available. ') }}
 {% else %}
-<table style="max-width: 1280px; margin: 0 auto 0 0;">
+<table class="engine-stats">
     <tr>
-        <th scope="col" style="width:20rem;">{{ th_sort('name', _("Engine name")) }}</th>
-        <th scope="col" style="width:7rem; text-align: right;">{{ th_sort('score', _('Scores')) }}</th>
-        <th scope="col">{{ th_sort('result_count', _('Result count')) }}</th>
-        <th scope="col">{{ th_sort('time', _('Response time')) }}</th>
-        <th scope="col" style="text-align: right;">{{ th_sort('reliability', _('Reliability')) }}</th>
+        <th scope="col" class="engine-name">{{ th_sort('name', _("Engine name")) }}</th>
+        <th scope="col" class="engine-scores">{{ th_sort('score', _('Scores')) }}</th>
+        <th scope="col" class="result-count">{{ th_sort('result_count', _('Result count')) }}</th>
+        <th scope="col" class="response-time">{{ th_sort('time', _('Response time')) }}</th>
+        <th scope="col" class="engine-reliability">{{ th_sort('reliability', _('Reliability')) }}</th>
     </tr>
     {% for engine_stat in engine_stats.get('time', []) %}
     <tr>
-        <td><a href="{{ url_for('stats', engine=engine_stat.name|e) }}">{{ engine_stat.name }}</a></td>
-        <td style="text-align: right;">
+        <td class="engine-name"><a href="{{ url_for('stats', engine=engine_stat.name|e) }}">{{ engine_stat.name }}</a></td>
+        <td class="engine-scores">
             {% 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">{{- "" -}}
@@ -42,7 +42,7 @@
             </div>
             {% endif %}
         </td>
-        <td>
+        <td class="engine-result-count">
             {%- if engine_stat.result_count -%}
 
             <div class="bar-chart-value">{{- engine_stat.result_count | int -}}</div>{{- "" -}}
@@ -51,7 +51,7 @@
 	    </div>
             {%- endif -%}
         </td>
-        <td>
+        <td class="response-time">
             {%- if engine_stat.total -%}
 
             <div class="bar-chart-value">{{- engine_stat.total | round(1) -}}</div>{{- "" -}}
@@ -89,7 +89,7 @@
             </div>
             {%- endif -%}
         </td>
-        <td style="text-align: right;"> {{ engine_reliabilities.get(engine_stat.name, {}).get('reliablity') }}</td>
+        <td class="engine-reliability"> {{ engine_reliabilities.get(engine_stat.name, {}).get('reliablity') }}</td>
     </tr>
     {% endfor %}
 </table>
@@ -105,20 +105,20 @@
                         {% set ns.first = false %}
                         <h3>{% if secondary %}{{ _('Warnings') }}{% else %}{{ _('Errors and exceptions') }}{% endif %}</h3>
                     {% endif %}
-                    <table style="max-width: 1280px; margin: 1rem; border: 1px solid gray;">
-                        <tbody style="padding-top: 1rem;">
+                    <table class="engine-error">
+                        <tbody>
                             <tr>
                                 {%- if error.exception_classname -%}
-                                    <th scope="row" style="width: 10rem">{{ _('Exception') }}</th><td>{{ error.exception_classname }}</td>
+                                    <th scope="row" class="engine-error-type">{{ _('Exception') }}</th><td>{{ error.exception_classname }}</td>
                                 {%- elif error.log_message -%}
-                                    <th scope="row" style="width: 10rem">{{ _('Message') }}</th><td>{{ error.log_message }}</td>
+                                    <th scope="row" class="engine-error-type">{{ _('Message') }}</th><td>{{ error.log_message }}</td>
                                 {%- endif -%}
-                                <th scope="row" style="width: 10rem">{{ _('Percentage') }}</th><td style="width: 10rem">{{ error.percentage }}</td>
+                                <th scope="row" class="engine-error-type">{{ _('Percentage') }}</th><td class="engine-error-type">{{ error.percentage }}</td>
                             </tr>
                             {% if error.log_parameters and error.log_parameters != (None, None, None) %}<tr><th scope="row">{{ _('Parameter') }}</th>{{- '' -}}
                                 <td colspan="3">
                                     {%- for param in error.log_parameters -%}
-                                        <span style="border-right: 1px solid gray; padding: 0 1rem 0 0; margin: 0 0 0 0.5rem;">{{ param }}</span>
+                                        <span class="log_parameters">{{ param }}</span>
                                     {%- endfor -%}
                                 </td>
                             </tr>
@@ -135,7 +135,7 @@
             <h3>{{ _('Checker') }}</h3>
             <table>
                 <tr>
-                    <th scope="col" style="width: 10rem">{{ _('Failed test') }}</th>
+                    <th scope="col" class="failed-test">{{ _('Failed test') }}</th>
                     <th scope="col">{{ _('Comment(s)') }}</th>
                 </tr>
                 {% for test_name, results in engine_reliabilities[selected_engine_name].checker.items() %}
-- 
cgit v1.2.3


From 34859d0e5872499c72fcaebb67ca57f95beb9864 Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Sun, 16 May 2021 17:57:04 +0200
Subject: [fix] make /stats more CSP compliant - oscar theme

Replace oscar theme's *styles* (see below) by CSP compliant implementation in
``searx/static/themes/__common__/less/stats.less`` ::

    ./oscar/stats.html:29:  <th scope="col" style="width:20rem;">{{ th_sort('name', _("Engine name")) }}</th>
    ./oscar/stats.html:30:  <th scope="col" style="width:7rem; text-align: right;">{{ th_sort('score', _('Scores')) }}</th>
    ./oscar/stats.html:33:  <th scope="col" style="text-align: right;">{{ th_sort('reliability', _('Reliability')) }}</th>
    ./oscar/stats.html:38:  <td style="text-align: right;">
    ./oscar/stats.html:91:  <td style="text-align: right;"> {{ engine_reliabilities.get(engine_stat.name, {}).get('reliablity') }}</td>
    ./oscar/stats.html:109: <tbody style="padding-top: 1rem;">
    ./oscar/stats.html:112: <th scope="row" style="width: 10rem">{{ _('Exception') }}</th><td>{{ error.exception_classname }}</td>
    ./oscar/stats.html:114: <th scope="row" style="width: 10rem">{{ _('Message') }}</th><td>{{ error.log_message }}</td>
    ./oscar/stats.html:116: <th scope="row" style="width: 10rem">{{ _('Percentage') }}</th><td style="width: 10rem">{{ error.percentage }}</td>
    ./oscar/stats.html:121: <span style="border-right: 1px solid gray; padding: 0 1rem 0 0; margin: 0 0 0 0.5rem;">{{ param }}</span>
    ./oscar/stats.html:138: <th scope="col" style="width: 10rem">{{ _('Failed test') }}</th>

Reported-by: https://github.com/searxng/searxng/issues/57
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 searx/templates/oscar/stats.html | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/stats.html b/searx/templates/oscar/stats.html
index 8b57e39b6..d75a29d1f 100644
--- a/searx/templates/oscar/stats.html
+++ b/searx/templates/oscar/stats.html
@@ -24,18 +24,18 @@
                         {% include 'oscar/messages/no_data_available.html' %}
                     </div>
                 {% else %}
-                    <table class="table table-hover table-condensed table-striped">
+                    <table class="table table-hover table-condensed table-striped engine-stats">
                         <tr>
-                            <th scope="col" style="width:20rem;">{{ th_sort('name', _("Engine name")) }}</th>
-                            <th scope="col" style="width:7rem; text-align: right;">{{ th_sort('score', _('Scores')) }}</th>
-                            <th scope="col">{{ th_sort('result_count', _('Result count')) }}</th>
-                            <th scope="col">{{ th_sort('time', _('Response time')) }}</th>
-                            <th scope="col" style="text-align: right;">{{ th_sort('reliability', _('Reliability')) }}</th>
+                            <th scope="col" class="engine-name">{{ th_sort('name', _("Engine name")) }}</th>
+                            <th scope="col" class="engine-scores">{{ th_sort('score', _('Scores')) }}</th>
+                            <th scope="col" class="result-count">{{ th_sort('result_count', _('Result count')) }}</th>
+                            <th scope="col" class="response-time">{{ th_sort('time', _('Response time')) }}</th>
+                            <th scope="col" class="engine-reliability">{{ th_sort('reliability', _('Reliability')) }}</th>
                         </tr>
                         {% for engine_stat in engine_stats.get('time', []) %}
                         <tr>
-                            <td><a href="{{ url_for('stats', engine=engine_stat.name|e) }}">{{ engine_stat.name }}</a></td>
-                            <td style="text-align: right;">
+                            <td class="engine-name"><a href="{{ url_for('stats', engine=engine_stat.name|e) }}">{{ engine_stat.name }}</a></td>
+                            <td class="engine-scores">
                                 {%- if engine_stat.score -%}
                                 <span aria-labelledby="{{engine_stat.name}}_score" >{{ engine_stat.score|round(1) }}</span>
                                 <div class="engine-tooltip text-left" role="tooltip" id="{{engine_stat.name}}_score">{{- "" -}}
@@ -43,7 +43,7 @@
                                 </div>
                                 {%- endif -%}
                             </td>
-                            <td>
+                            <td class="result-count">
                                 {%- if engine_stat.result_count -%}
                                 <div class="bar-chart-value">{{- engine_stat.result_count | int -}}</div>{{- "" -}}
 				<div class="bar-chart-graph" aria-hidden="true">
@@ -51,7 +51,7 @@
 				</div>
                                 {%- endif -%}
                             </td>
-                            <td>
+                            <td class="response-time">
                                 {%- if engine_stat.total -%}
                                 <div class="bar-chart-value">{{- engine_stat.total | round(1) -}}</div>{{- "" -}}
 				<div class="bar-chart-graph" aria-labelledby="{{engine_stat.name}}_time" aria-hidden="true">
@@ -88,7 +88,7 @@
                                 </div>
                                 {%- endif -%}
                             </td>
-                            <td style="text-align: right;"> {{ engine_reliabilities.get(engine_stat.name, {}).get('reliablity') }}</td>
+                            <td class="engine-reliability"> {{ engine_reliabilities.get(engine_stat.name, {}).get('reliablity') }}</td>
                         </tr>
                         {% endfor %}
                     </table>
@@ -105,20 +105,20 @@
                             {% set ns.first = false %}
                             <h3>{% if secondary %}{{ _('Warnings') }}{% else %}{{ _('Errors and exceptions') }}{% endif %}</h3>
                         {% endif %}
-                        <table class="table table-striped table-bordered">
-                            <tbody style="padding-top: 1rem;">
+                        <table class="table table-striped table-bordered engine-error">
+                            <tbody>
                                 <tr>
                                     {%- if error.exception_classname -%}
-                                        <th scope="row" style="width: 10rem">{{ _('Exception') }}</th><td>{{ error.exception_classname }}</td>
+                                        <th scope="row" class="engine-error-type">{{ _('Exception') }}</th><td>{{ error.exception_classname }}</td>
                                     {%- elif error.log_message -%}
-                                        <th scope="row" style="width: 10rem">{{ _('Message') }}</th><td>{{ error.log_message }}</td>
+                                        <th scope="row" class="engine-error-type">{{ _('Message') }}</th><td>{{ error.log_message }}</td>
                                     {%- endif -%}
-                                    <th scope="row" style="width: 10rem">{{ _('Percentage') }}</th><td style="width: 10rem">{{ error.percentage }}</td>
+                                    <th scope="row" class="engine-error-type">{{ _('Percentage') }}</th><td class="engine-error-type">{{ error.percentage }}</td>
                                 </tr>
                                 {% if error.log_parameters and error.log_parameters != (None, None, None) %}<tr><th scope="row">{{ _('Parameter') }}</th>{{- '' -}}
                                     <td colspan="3">
                                         {%- for param in error.log_parameters -%}
-                                            <span style="border-right: 1px solid gray; padding: 0 1rem 0 0; margin: 0 0 0 0.5rem;">{{ param }}</span>
+                                            <span class="log_parameters">{{ param }}</span>
                                         {%- endfor -%}
                                     </td>
                                 </tr>
@@ -135,7 +135,7 @@
                 <h3>{{ _('Checker') }}</h3>
                 <table class="table table-striped table-bordered">
                     <tr>
-                        <th scope="col" style="width: 10rem">{{ _('Failed test') }}</th>
+                        <th scope="col" class="failed-test">{{ _('Failed test') }}</th>
                         <th scope="col">{{ _('Comment(s)') }}</th>
                     </tr>
                     {% for test_name, results in engine_reliabilities[selected_engine_name].checker.items() %}
-- 
cgit v1.2.3


From 3e9ad7ae0c5d520e88bf686de9038d22907876f7 Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Sun, 16 May 2021 19:35:49 +0200
Subject: [fix] make /stats more CSP compliant - github issue form

Hide textarea from github issue form::

    ./__common__/new_issue.html:6:    <textarea name="body" style="display: none;">{{- '' -}}

BTW: fix indentation.

Reported-by: https://github.com/searxng/searxng/issues/57
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 searx/templates/__common__/new_issue.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'searx/templates')

diff --git a/searx/templates/__common__/new_issue.html b/searx/templates/__common__/new_issue.html
index d983417b0..1b28804af 100644
--- a/searx/templates/__common__/new_issue.html
+++ b/searx/templates/__common__/new_issue.html
@@ -3,7 +3,7 @@
     <input name="title" type="hidden" value="Bug: {{ engine_name }} engine">
     <input name="labels" type="hidden" value="bug">
     <input name="template" type="hidden" value="bug-report.md">
-    <textarea name="body" style="display: none;">{{- '' -}}
+    <textarea name="body" class="issue-hide">{{- '' -}}
 
 **Version of SearXNG, commit number if you are using on master branch and stipulate if you forked SearXNG**
 <!-- If you are running on master branch using git execute this command
-- 
cgit v1.2.3


From 0507e185a55702c528ead471b17506fc5db39b58 Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Mon, 17 May 2021 17:56:18 +0200
Subject: [fix] bar graph and rename CSS class engine-scores -> engine-score

- drop #main_stats selector in stats.less
- 'engine-score' exists before this PR.
- untabify searx/static/themes/__common__/less/stats.less

for details see comment at: https://github.com/searxng/searxng/pull/81/files/d93bec7638908cae64530727d4e1539ae10bd144..1204e4f07e932029d66b4674a3474918228459a6#r633571496

Suggested-by: @dalf in commit 1204e4f0
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 searx/templates/oscar/stats.html  | 18 +++++++++---------
 searx/templates/simple/stats.html | 14 +++++++-------
 2 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/stats.html b/searx/templates/oscar/stats.html
index d75a29d1f..94117b673 100644
--- a/searx/templates/oscar/stats.html
+++ b/searx/templates/oscar/stats.html
@@ -27,7 +27,7 @@
                     <table class="table table-hover table-condensed table-striped engine-stats">
                         <tr>
                             <th scope="col" class="engine-name">{{ th_sort('name', _("Engine name")) }}</th>
-                            <th scope="col" class="engine-scores">{{ th_sort('score', _('Scores')) }}</th>
+                            <th scope="col" class="engine-score">{{ th_sort('score', _('Scores')) }}</th>
                             <th scope="col" class="result-count">{{ th_sort('result_count', _('Result count')) }}</th>
                             <th scope="col" class="response-time">{{ th_sort('time', _('Response time')) }}</th>
                             <th scope="col" class="engine-reliability">{{ th_sort('reliability', _('Reliability')) }}</th>
@@ -35,7 +35,7 @@
                         {% for engine_stat in engine_stats.get('time', []) %}
                         <tr>
                             <td class="engine-name"><a href="{{ url_for('stats', engine=engine_stat.name|e) }}">{{ engine_stat.name }}</a></td>
-                            <td class="engine-scores">
+                            <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 text-left" role="tooltip" id="{{engine_stat.name}}_score">{{- "" -}}
@@ -46,18 +46,18 @@
                             <td class="result-count">
                                 {%- if engine_stat.result_count -%}
                                 <div class="bar-chart-value">{{- engine_stat.result_count | int -}}</div>{{- "" -}}
-				<div class="bar-chart-graph" aria-hidden="true">
-				  <div class="bar-chart-bar bar{{ (100 * engine_stat.result_count / engine_stats.max_result_count)|round }}"></div>{{- "" -}}
-				</div>
+                                <div class="bar-chart-graph" aria-hidden="true">{{- "" -}}
+                                    <div class="bar-chart-bar bar{{ (100 * engine_stat.result_count / engine_stats.max_result_count)|round }}"></div>{{- "" -}}
+                                </div>
                                 {%- endif -%}
                             </td>
                             <td class="response-time">
                                 {%- if engine_stat.total -%}
                                 <div class="bar-chart-value">{{- engine_stat.total | round(1) -}}</div>{{- "" -}}
-				<div class="bar-chart-graph" aria-labelledby="{{engine_stat.name}}_time" aria-hidden="true">
-                                  <div class="bar-chart-serie1 bar{{ (100 * engine_stat.http / engine_stats.max_time)|round }}"></div>{{- "" -}}
-                                  <div class="bar-chart-serie2 bar{{ (100 * engine_stat.processing / engine_stats.max_time)|round }}"></div>{{- "" -}}
-				</div>
+                                <div class="bar-chart-graph" aria-labelledby="{{engine_stat.name}}_time" aria-hidden="true">{{- "" -}}
+                                    <div class="bar-chart-serie1 bar{{ (100 * engine_stat.http / engine_stats.max_time)|round }}"></div>{{- "" -}}
+                                    <div class="bar-chart-serie2 bar{{ (100 * engine_stat.processing / engine_stats.max_time)|round }}"></div>{{- "" -}}
+                                </div>
                                 <div class="engine-tooltip text-left" role="tooltip" id="{{engine_stat.name}}_time">{{- "" -}}
                                     <table class="table table-striped">
                                         <tr>
diff --git a/searx/templates/simple/stats.html b/searx/templates/simple/stats.html
index 968208381..67c9c79cc 100644
--- a/searx/templates/simple/stats.html
+++ b/searx/templates/simple/stats.html
@@ -26,7 +26,7 @@
 <table class="engine-stats">
     <tr>
         <th scope="col" class="engine-name">{{ th_sort('name', _("Engine name")) }}</th>
-        <th scope="col" class="engine-scores">{{ th_sort('score', _('Scores')) }}</th>
+        <th scope="col" class="engine-score">{{ th_sort('score', _('Scores')) }}</th>
         <th scope="col" class="result-count">{{ th_sort('result_count', _('Result count')) }}</th>
         <th scope="col" class="response-time">{{ th_sort('time', _('Response time')) }}</th>
         <th scope="col" class="engine-reliability">{{ th_sort('reliability', _('Reliability')) }}</th>
@@ -34,7 +34,7 @@
     {% for engine_stat in engine_stats.get('time', []) %}
     <tr>
         <td class="engine-name"><a href="{{ url_for('stats', engine=engine_stat.name|e) }}">{{ engine_stat.name }}</a></td>
-        <td class="engine-scores">
+        <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">{{- "" -}}
@@ -46,19 +46,19 @@
             {%- if engine_stat.result_count -%}
 
             <div class="bar-chart-value">{{- engine_stat.result_count | int -}}</div>{{- "" -}}
-	    <div class="bar-chart-graph" aria-hidden="true">
-	      <div class="bar-chart-bar bar{{ (100 * engine_stat.result_count / engine_stats.max_result_count)|round }}"></div>{{- "" -}}
-	    </div>
+        <div class="bar-chart-graph" aria-hidden="true">
+          <div class="bar-chart-bar bar{{ (100 * engine_stat.result_count / engine_stats.max_result_count)|round }}"></div>{{- "" -}}
+        </div>
             {%- endif -%}
         </td>
         <td class="response-time">
             {%- if engine_stat.total -%}
 
             <div class="bar-chart-value">{{- engine_stat.total | round(1) -}}</div>{{- "" -}}
-	    <div class="bar-chart-graph" aria-labelledby="{{engine_stat.name}}_time" aria-hidden="true">
+        <div class="bar-chart-graph" aria-labelledby="{{engine_stat.name}}_time" aria-hidden="true">
               <div class="bar-chart-serie1 bar{{ (100 * engine_stat.http / engine_stats.max_time)|round }}"></div>{{- "" -}}
               <div class="bar-chart-serie2 bar{{ (100 * engine_stat.processing / engine_stats.max_time)|round }}"></div>{{- "" -}}
-	    </div>
+        </div>
             <div class="engine-tooltip" role="tooltip" id="{{engine_stat.name}}_time">{{- "" -}}
                 <table>
                     <tr>
-- 
cgit v1.2.3