diff options
| author | Markus Heiser <markus.heiser@darmarit.de> | 2021-09-05 16:03:00 +0200 |
|---|---|---|
| committer | Markus Heiser <markus.heiser@darmarit.de> | 2021-09-06 11:08:50 +0200 |
| commit | 48c806954eecc242227ad9868eabe03d1d415621 (patch) | |
| tree | 2afb64a02b9035c0cd8d852928498018ec4067bb /searx | |
| parent | 33ea1d59096c08cc5b5045f975525d311d1960d1 (diff) | |
| download | searxng-48c806954eecc242227ad9868eabe03d1d415621.tar.gz searxng-48c806954eecc242227ad9868eabe03d1d415621.zip | |
[fix] make /preferences more CSP compliant - simple & oscar theme
in simple & oscar theme replace bar-graph's *styles* by CSP compliant
implementation in::
searx/static/themes/__common__/less/stats.less
Fixed files::
./oscar/preferences.html:29: <span style="width: calc(max(2px, 100%*{{ (stats[engine_name].time / max_rate95)|round(3) }}))" class="stacked-bar-chart-median"></span>{{- "" -}}
./oscar/preferences.html:30: <span style="width: calc(100%*{{ ((stats[engine_name].rate80 - stats[engine_name].time) / max_rate95)|round(3) }})" class="stacked-bar-chart-rate80"></span>{{- "" -}}
./oscar/preferences.html:31: <span style="width: calc(100%*{{ ((stats[engine_name].rate95 - stats[engine_name].rate80) / max_rate95)|round(3) }})" class="stacked-bar-chart-rate95"></span>{{- "" -}}
./simple/preferences.html:43: <span style="width: calc(max(2px, 100%*{{ (stats[engine_name].time / max_rate95)|round(3) }}))" class="stacked-bar-chart-median"></span>{{- "" -}}
./simple/preferences.html:44: <span style="width: calc(100%*{{ ((stats[engine_name].rate80 - stats[engine_name].time) / max_rate95)|round(3) }})" class="stacked-bar-chart-rate80"></span>{{- "" -}}
./simple/preferences.html:45: <span style="width: calc(100%*{{ ((stats[engine_name].rate95 - stats[engine_name].rate80) / max_rate95)|round(3) }})" class="stacked-bar-chart-rate95"></span>{{- "" -}}
Reported-by: https://github.com/searxng/searxng/issues/57
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
Diffstat (limited to 'searx')
| -rw-r--r-- | searx/templates/oscar/preferences.html | 6 | ||||
| -rw-r--r-- | searx/templates/simple/preferences.html | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html index c47675562..f46d1e620 100644 --- a/searx/templates/oscar/preferences.html +++ b/searx/templates/oscar/preferences.html @@ -27,9 +27,9 @@ <span class="stacked-bar-chart-value">{{- stats[engine_name].time -}}</span>{{- "" -}} <span class="stacked-bar-chart" aria-labelledby="{{engine_name}}_chart" aria-hidden="true"> {%- if max_rate95 is not none and max_rate95 > 0 -%} - <span style="width: calc(max(2px, 100%*{{ (stats[engine_name].time / max_rate95)|round(3) }}))" class="stacked-bar-chart-median"></span>{{- "" -}} - <span style="width: calc(100%*{{ ((stats[engine_name].rate80 - stats[engine_name].time) / max_rate95)|round(3) }})" class="stacked-bar-chart-rate80"></span>{{- "" -}} - <span style="width: calc(100%*{{ ((stats[engine_name].rate95 - stats[engine_name].rate80) / max_rate95)|round(3) }})" class="stacked-bar-chart-rate95"></span>{{- "" -}} + <div class="stacked-bar-chart-median bar{{ (100 * (stats[engine_name].time / max_rate95))|round }}"></div>{{- "" -}} + <div class="stacked-bar-chart-rate80 bar{{ (100 * ((stats[engine_name].rate80 - stats[engine_name].time) / max_rate95))|round }}"></div>{{- "" -}} + <div class="stacked-bar-chart-rate95 bar{{ (100 * ((stats[engine_name].rate95 - stats[engine_name].rate80) / max_rate95))|round }}"></div>{{- "" -}} <span class="stacked-bar-chart-rate100"></span> {%- endif -%} </span>{{- "" -}} diff --git a/searx/templates/simple/preferences.html b/searx/templates/simple/preferences.html index e3b1545b9..ede958450 100644 --- a/searx/templates/simple/preferences.html +++ b/searx/templates/simple/preferences.html @@ -41,9 +41,9 @@ <span class="stacked-bar-chart-value">{{- stats[engine_name].time -}}</span>{{- "" -}} <span class="stacked-bar-chart" aria-labelledby="{{engine_name}}_chart" aria-hidden="true"> {%- if max_rate95 is not none and max_rate95 > 0 -%} - <span style="width: calc(max(2px, 100%*{{ (stats[engine_name].time / max_rate95)|round(3) }}))" class="stacked-bar-chart-median"></span>{{- "" -}} - <span style="width: calc(100%*{{ ((stats[engine_name].rate80 - stats[engine_name].time) / max_rate95)|round(3) }})" class="stacked-bar-chart-rate80"></span>{{- "" -}} - <span style="width: calc(100%*{{ ((stats[engine_name].rate95 - stats[engine_name].rate80) / max_rate95)|round(3) }})" class="stacked-bar-chart-rate95"></span>{{- "" -}} + <div class="stacked-bar-chart-median bar{{ (100 * (stats[engine_name].time / max_rate95))|round }}"></div>{{- "" -}} + <div class="stacked-bar-chart-rate80 bar{{ (100 * ((stats[engine_name].rate80 - stats[engine_name].time) / max_rate95))|round }}"></div>{{- "" -}} + <div class="stacked-bar-chart-rate95 bar{{ (100 * ((stats[engine_name].rate95 - stats[engine_name].rate80) / max_rate95))|round }}"></div>{{- "" -}} <span class="stacked-bar-chart-rate100"></span> {%- endif -%} </span>{{- "" -}} |