From cdfb4b7ff9829cb9048b573f7f1775dc8029f75a Mon Sep 17 00:00:00 2001 From: Markus Heiser 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: {{- "" -}} ./simple/stats.html:57: {{- "" -}} ./simple/stats.html:58: {{- "" -}} ./oscar/stats.html:50: {{- "" -}} ./oscar/stats.html:58: {{- "" -}} ./oscar/stats.html:59: {{- "" -}} Reported-by: https://github.com/searxng/searxng/issues/57 Signed-off-by: Markus Heiser --- searx/static/themes/__common__/less/stats.less | 38 ++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 searx/static/themes/__common__/less/stats.less (limited to 'searx/static/themes/__common__/less/stats.less') diff --git a/searx/static/themes/__common__/less/stats.less b/searx/static/themes/__common__/less/stats.less new file mode 100644 index 000000000..6c2117b39 --- /dev/null +++ b/searx/static/themes/__common__/less/stats.less @@ -0,0 +1,38 @@ +.bar-chart-value { + width: 3em; +} + +.bar-chart-graph { + width: 300px; +} + +.bar-chart-bar { + border: 3px solid #5bc0de; + margin: 1px 0; +} + +.bar-chart-serie1 { + border: 3px solid #5bc0de; + margin: 1px 0; + float: left; +} + +.bar-chart-serie2 { + border: 3px solid #deb15b; + margin: 1px 0; + float: left; +} + +.bar0{ + width: 0; + border: 0; +} + +.generate-bar(100); + +.generate-bar(@n, @i: 1) when (@i =< @n) { + .bar@{i} { + width: (@i * 100% / @n); + } + .generate-bar(@n, (@i + 1)); +} -- cgit v1.2.3 From 0a6c488417f83fc2fbfcdb8d80b5978a14c561c4 Mon Sep 17 00:00:00 2001 From: Markus Heiser 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: ./simple/stats.html:28: ./simple/stats.html:29: ./simple/stats.html:32: ./simple/stats.html:37: ./simple/stats.html:106:
{{ th_sort('name', _("Engine name")) }}{{ th_sort('score', _('Scores')) }}{{ th_sort('reliability', _('Reliability')) }} ./simple/stats.html:90: {{ engine_reliabilities.get(engine_stat.name, {}).get('reliablity') }}
./simple/stats.html:107: ./simple/stats.html:110: ./simple/stats.html:112: ./simple/stats.html:114: ./simple/stats.html:119: {{ param }} ./simple/stats.html:136: Reported-by: https://github.com/searxng/searxng/issues/57 Signed-off-by: Markus Heiser --- searx/static/themes/__common__/less/stats.less | 47 ++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'searx/static/themes/__common__/less/stats.less') diff --git a/searx/static/themes/__common__/less/stats.less b/searx/static/themes/__common__/less/stats.less index 6c2117b39..2204fb02b 100644 --- a/searx/static/themes/__common__/less/stats.less +++ b/searx/static/themes/__common__/less/stats.less @@ -1,3 +1,50 @@ +#main_stats { + + table { + margin: 0 auto 0 0; + } + + table .engine-name { + width: 20rem; + } + + table .engine-scores { + width: 7rem; + } + + table .result-count { + } + + table .response-time { + } + + table .engine-reliability { + text-align: right; + } + + table.engine-error { + max-width: 1280px; + margin: 1rem; + border: 1px solid gray; + } + + table.engine-error th.engine-error-type, + table.engine-error td.engine-error-type, + failed-test { + width: 10rem; + } + + table.engine-error span.log_parameters + { + border-right: 1px solid gray; + padding: 0 1rem 0 0; + margin: 0 0 0 0.5rem; + } +} + +@media screen and (max-width: 75em) { +} + .bar-chart-value { width: 3em; } -- cgit v1.2.3 From 0507e185a55702c528ead471b17506fc5db39b58 Mon Sep 17 00:00:00 2001 From: Markus Heiser 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 --- searx/static/themes/__common__/less/stats.less | 54 +++++++++++++------------- 1 file changed, 26 insertions(+), 28 deletions(-) (limited to 'searx/static/themes/__common__/less/stats.less') diff --git a/searx/static/themes/__common__/less/stats.less b/searx/static/themes/__common__/less/stats.less index 2204fb02b..687d15906 100644 --- a/searx/static/themes/__common__/less/stats.less +++ b/searx/static/themes/__common__/less/stats.less @@ -1,56 +1,54 @@ -#main_stats { +.engine-stats { - table { - margin: 0 auto 0 0; + .engine-name { + width: 20rem; } - table .engine-name { - width: 20rem; + .engine-score { + width: 7rem; + text-align: right; } - table .engine-scores { - width: 7rem; + .result-count { } - table .result-count { + .response-time { } - table .response-time { - } - - table .engine-reliability { - text-align: right; + .engine-reliability { + text-align: right; } table.engine-error { - max-width: 1280px; - margin: 1rem; - border: 1px solid gray; + max-width: 1280px; + margin: 1rem; + border: 1px solid gray; } table.engine-error th.engine-error-type, table.engine-error td.engine-error-type, failed-test { - width: 10rem; + width: 10rem; } table.engine-error span.log_parameters { - border-right: 1px solid gray; - padding: 0 1rem 0 0; - margin: 0 0 0 0.5rem; + border-right: 1px solid gray; + padding: 0 1rem 0 0; + margin: 0 0 0 0.5rem; } } -@media screen and (max-width: 75em) { -} - .bar-chart-value { width: 3em; + display: inline-block; + text-align: right; + padding-right: 0.5rem; } .bar-chart-graph { - width: 300px; + width: calc(100% - 5rem); + display: inline-block; } .bar-chart-bar { @@ -78,8 +76,8 @@ .generate-bar(100); .generate-bar(@n, @i: 1) when (@i =< @n) { - .bar@{i} { - width: (@i * 100% / @n); - } - .generate-bar(@n, (@i + 1)); + .bar@{i} { + width: (@i * 100% / @n); + } + .generate-bar(@n, (@i + 1)); } -- cgit v1.2.3
{{ _('Exception') }}{{ error.exception_classname }}{{ _('Message') }}{{ error.log_message }}{{ _('Percentage') }}{{ error.percentage }}{{ _('Failed test') }}