Merge pull request #292 from return42/fix-csp

[fix] make HTML templates more CSP compliant

searx/static/themes/__common__/less/result_templates.less

@@ -0,0 +1,5 @@
+.osm-map-box {
+    height:300px;
+    width:100%;
+    margin: 10px 0;
+}

searx/static/themes/oscar/css/logicodev-dark.css

@@ -369,9 +369,14 @@
 .bar100 {
   width: 100%;
 }
+.osm-map-box {
+  height: 300px;
+  width: 100%;
+  margin: 10px 0;
+}
 /*
    this file is generated automatically by searx_extra/update/update_pygments.py
-   using pygments version 2.9.0
+   using pygments version 2.10.0
 */
 .code-highlight .linenos {
   -webkit-touch-callout: none;

searx/static/themes/oscar/css/logicodev.css

@@ -369,9 +369,14 @@
 .bar100 {
   width: 100%;
 }
+.osm-map-box {
+  height: 300px;
+  width: 100%;
+  margin: 10px 0;
+}
 /*
    this file is generated automatically by searx_extra/update/update_pygments.py
-   using pygments version 2.9.0
+   using pygments version 2.10.0
 */
 .code-highlight .linenos {
   -webkit-touch-callout: none;

searx/static/themes/oscar/css/pointhi.css

@@ -369,9 +369,14 @@
 .bar100 {
   width: 100%;
 }
+.osm-map-box {
+  height: 300px;
+  width: 100%;
+  margin: 10px 0;
+}
 /*
    this file is generated automatically by searx_extra/update/update_pygments.py
-   using pygments version 2.9.0
+   using pygments version 2.10.0
 */
 .code-highlight .linenos {
   -webkit-touch-callout: none;

searx/static/themes/oscar/src/generated/pygments-logicodev.less

@@ -1,6 +1,6 @@
 /*
    this file is generated automatically by searx_extra/update/update_pygments.py
-   using pygments version 2.9.0
+   using pygments version 2.10.0
 */
 
 .code-highlight .linenos {

searx/static/themes/oscar/src/generated/pygments-pointhi.less

@@ -1,6 +1,6 @@
 /*
    this file is generated automatically by searx_extra/update/update_pygments.py
-   using pygments version 2.9.0
+   using pygments version 2.10.0
 */
 
 .code-highlight .linenos {

searx/static/themes/oscar/src/less/logicodev-dark/oscar.less

@@ -1,6 +1,7 @@
 @import "../logicodev/variables.less";
 @import "../../../../__common__/less/new_issue.less";
 @import "../../../../__common__/less/stats.less";
+@import "../../../../__common__/less/result_templates.less";
 @import "../../generated/pygments-logicodev.less";
 
 @stacked-bar-chart: rgb(213, 216, 215, 1);

searx/static/themes/oscar/src/less/logicodev/oscar.less

@@ -1,6 +1,7 @@
 @import "variables.less";
 @import "../../../../__common__/less/new_issue.less";
 @import "../../../../__common__/less/stats.less";
+@import "../../../../__common__/less/result_templates.less";
 @import "../../generated/pygments-logicodev.less";
 
 @import "navbar.less";

searx/static/themes/oscar/src/less/pointhi/oscar.less

@@ -1,6 +1,7 @@
 @import "variables.less";
 @import "../../../../__common__/less/new_issue.less";
 @import "../../../../__common__/less/stats.less";
+@import "../../../../__common__/less/result_templates.less";
 @import "../../generated/pygments-pointhi.less";
 
 @import "footer.less";

searx/static/themes/simple/css/searx-rtl.css

@@ -374,6 +374,11 @@
 .bar100 {
   width: 100%;
 }
+.osm-map-box {
+  height: 300px;
+  width: 100%;
+  margin: 10px 0;
+}
 /*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
 
 /* Document
@@ -825,7 +830,7 @@ template {
 }
 /*
    this file is generated automatically by searx_extra/update/update_pygments.py
-   using pygments version 2.9.0
+   using pygments version 2.10.0
 */
 .code-highlight .linenos {
   -webkit-touch-callout: none;

searx/static/themes/simple/css/searx.css

@@ -374,6 +374,11 @@
 .bar100 {
   width: 100%;
 }
+.osm-map-box {
+  height: 300px;
+  width: 100%;
+  margin: 10px 0;
+}
 /*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
 
 /* Document
@@ -825,7 +830,7 @@ template {
 }
 /*
    this file is generated automatically by searx_extra/update/update_pygments.py
-   using pygments version 2.9.0
+   using pygments version 2.10.0
 */
 .code-highlight .linenos {
   -webkit-touch-callout: none;

searx/static/themes/simple/src/generated/pygments.less

@@ -1,6 +1,6 @@
 /*
    this file is generated automatically by searx_extra/update/update_pygments.py
-   using pygments version 2.9.0
+   using pygments version 2.10.0
 */
 
 .code-highlight .linenos {

searx/static/themes/simple/src/less/style.less

@@ -10,6 +10,7 @@
 
 @import "../../__common__/less/new_issue.less";
 @import "../../__common__/less/stats.less";
+@import "../../__common__/less/result_templates.less";
 @import (inline) "../../node_modules/normalize.css/normalize.css";
 @import "../generated/ion.less";
 @import "definitions.less";

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>{{- "" -}}

searx/templates/oscar/result_templates/map.html

@@ -64,7 +64,7 @@
 
 {%- if (result.latitude and result.longitude) or result.boundingbox -%}
     <div class="collapse" id="result-map-{{ index }}">
-        <div style="height:300px; width:100%; margin: 10px 0;" id="osm-map-{{ index }}"></div>
+        <div class="osm-map-box" id="osm-map-{{ index }}"></div>
     </div>
 {%- endif -%}
 

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>{{- "" -}}

searx/templates/simple/result_templates/map.html

@@ -45,7 +45,7 @@
 {{- result_sub_footer(result, proxify) -}}
 
 {% if (result.latitude and result.longitude) or result.boundingbox -%}
-    <div id="result-map-{{ index }}" class="invisible"><div id="osm-map-{{ index }}" style="height:300px; width:100%; margin: 10px 0;" ></div></div>
+    <div id="result-map-{{ index }}" class="invisible"><div id="osm-map-{{ index }}" class="osm-map-box"></div></div>
 {%- endif %}
 
 {{- result_footer(result) }}