Merge remote-tracking branch 'origin/main' into feature/18-mongolian

Conflicts: json_matrix.js json_text.js
SwissTPH · Jan 28, 2024 · e7d357c · e7d357c
2 parents 8c85a53 + 9f658a3
commit e7d357c
Show file tree

Hide file tree

Showing 45 changed files with 18,967 additions and 1,189 deletions.
diff --git a/.github/linters/.htmlhintrc b/.github/linters/.htmlhintrc
@@ -0,0 +1 @@
+head-script-disabled: false
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -0,0 +1,34 @@
+name: Lint Code Base
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    name: Lint
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      packages: read
+      statuses: write
+
+    steps:
+
+      - name: Checkout Code
+        uses: actions/checkout@v4
+        with:
+          # entire history needed
+          fetch-depth: 0
+
+      - name: Lint Code Base
+        uses: super-linter/[email protected]
+        env:
+          DEFAULT_BRANCH: main
+          VALIDATE_ALL_CODEBASE: true
+          VALIDATE_CSS: true
+          VALIDATE_HTML: true
+          VALIDATE_JAVASCRIPT_ES: true
+          VALIDATE_JSON: true
+          FILTER_REGEX_EXCLUDE: jquery/*
+          # For reporting status
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/README.adoc b/README.adoc
@@ -1,4 +1,7 @@
+image:https://github.com/SwissTPH/AP-Health-Effects/actions/workflows/linter.yml/badge.svg?branch=main&event=push[Super-Linter, link=https://github.com/marketplace/actions/super-linter]
+
 [[ap-health-effects]]
+
 = AP-Health-Effects
 
 == Interactive figure of air pollutants and health effects

diff --git a/graph/_image-map.fim b/graph/_image-map.fim
@@ -1,10 +1,10 @@
 "fim200","",""
 <map name="ludok" id="ludok">
- <area shape="rect" coords="118,138,277,340" href="#" onClick="Show_Organ('Atemwege')" onMouseover="$(&quot;#img_Organ_Atemwege&quot;).show();" onMouseout="$(&quot;#img_Organ_Atemwege&quot;).hide();" alt="" fimcolor="0" fimcontrast="1" />
- <area shape="rect" coords="176,84,383,997" href="#" onClick="Show_Organ('Herz')" onMouseover="$('#img_Organ_Herz').show();" onMouseout="$('#img_Organ_Herz').hide();" alt="" fimcolor="0" fimcontrast="1" />
- <area shape="rect" coords="2,84,173,1005" href="#" onClick="Show_Organ('Nervensystem')" onMouseover="$('#img_Organ_Nervensystem').show()" onMouseout="$('#img_Organ_Nervensystem').hide()" alt="" fimcolor="0" fimcontrast="1" />
- <area shape="rect" coords="145,9,247,85" href="#" onClick="Show_Organ('Hirn')" onMouseover="$('#img_Organ_Hirn').show()" onMouseout="$('#img_Organ_Hirn').hide()" alt="" fimcolor="0" fimcontrast="1" />
- <area shape="rect" coords="120,326,246,430" href="#" onClick="Show_Organ('Stoffwechsel')" onMouseover="$('#img_Organ_Stoffwechsel').show()" onMouseout="$('#img_Organ_Stoffwechsel').hide()" alt="" fimcolor="0" fimcontrast="1" />
- <area shape="rect" coords="176,242,226,307" href="#" onClick="Show_Organ('Herz')" onMouseover="$('#img_Organ_Herz').show()" onMouseout="$('#img_Organ_Herz').hide()" alt="" fimcolor="0" fimcontrast="1" />
+ <area shape="rect" coords="118,138,277,340" href="#" onClick="Show_Organ('atemwege')" onMouseover="$(&quot;#img-organ-atemwege&quot;).show();" onMouseout="$(&quot;#img-organ-atemwege&quot;).hide();" alt="" fimcolor="0" fimcontrast="1" />
+ <area shape="rect" coords="176,84,383,997" href="#" onClick="Show_Organ('herz')" onMouseover="$('#img-organ-herz').show();" onMouseout="$('#img-organ-herz').hide();" alt="" fimcolor="0" fimcontrast="1" />
+ <area shape="rect" coords="2,84,173,1005" href="#" onClick="Show_Organ('nervensystem')" onMouseover="$('#img-organ-nervensystem').show()" onMouseout="$('#img-organ-nervensystem').hide()" alt="" fimcolor="0" fimcontrast="1" />
+ <area shape="rect" coords="145,9,247,85" href="#" onClick="Show_Organ('hirn')" onMouseover="$('#img-organ-hirn').show()" onMouseout="$('#img-organ-hirn').hide()" alt="" fimcolor="0" fimcontrast="1" />
+ <area shape="rect" coords="120,326,246,430" href="#" onClick="Show_Organ('stoffwechsel')" onMouseover="$('#img-organ-stoffwechsel').show()" onMouseout="$('#img-organ-stoffwechsel').hide()" alt="" fimcolor="0" fimcontrast="1" />
+ <area shape="rect" coords="176,242,226,307" href="#" onClick="Show_Organ('herz')" onMouseover="$('#img-organ-herz').show()" onMouseout="$('#img-organ-herz').hide()" alt="" fimcolor="0" fimcontrast="1" />
 </map>
 <img src="c:\_php\ludok\graph\_mensch_1000.png" width="407" height="1000" border="0" alt="" title="" usemap="#ludok" />
diff --git a/graph/_mensch_1000.png → graph/_mensch-1000.png b/graph/_mensch_1000.png → graph/_mensch-1000.png
diff --git a/graph/ic_C_Feinstaub.png → graph/ic-c-feinstaub.png b/graph/ic_C_Feinstaub.png → graph/ic-c-feinstaub.png
diff --git a/graph/ic_C_Kohlenmonoxid.png → graph/ic-c-kohlenmonoxid.png b/graph/ic_C_Kohlenmonoxid.png → graph/ic-c-kohlenmonoxid.png
diff --git a/graph/ic_C_Ozon.png → graph/ic-c-ozon.png b/graph/ic_C_Ozon.png → graph/ic-c-ozon.png
diff --git a/graph/ic_C_Schwefeldioxid.png → graph/ic-c-schwefeldioxid.png b/graph/ic_C_Schwefeldioxid.png → graph/ic-c-schwefeldioxid.png
diff --git a/graph/ic_C_Stickstoffdioxid.png → graph/ic-c-stickstoffdioxid.png b/graph/ic_C_Stickstoffdioxid.png → graph/ic-c-stickstoffdioxid.png
diff --git a/graph/ic_C.png → graph/ic-c.png b/graph/ic_C.png → graph/ic-c.png
diff --git a/graph/ic_info.png → graph/ic-info.png b/graph/ic_info.png → graph/ic-info.png
diff --git a/graph/ic_L_Feinstaub.png → graph/ic-l-feinstaub.png b/graph/ic_L_Feinstaub.png → graph/ic-l-feinstaub.png
diff --git a/graph/ic_L_Kohlenmonoxid.png → graph/ic-l-kohlenmonoxid.png b/graph/ic_L_Kohlenmonoxid.png → graph/ic-l-kohlenmonoxid.png
diff --git a/graph/ic_L_Ozon.png → graph/ic-l-ozon.png b/graph/ic_L_Ozon.png → graph/ic-l-ozon.png
diff --git a/graph/ic_L_Schwefeldioxid.png → graph/ic-l-schwefeldioxid.png b/graph/ic_L_Schwefeldioxid.png → graph/ic-l-schwefeldioxid.png
diff --git a/graph/ic_L_Stickstoffdioxid.png → graph/ic-l-stickstoffdioxid.png b/graph/ic_L_Stickstoffdioxid.png → graph/ic-l-stickstoffdioxid.png
diff --git a/graph/ic_L.png → graph/ic-l.png b/graph/ic_L.png → graph/ic-l.png
diff --git a/graph/ic_tph.png → graph/ic-tph.png b/graph/ic_tph.png → graph/ic-tph.png
diff --git a/graph/mensch_Atemwege.png → graph/mensch-atemwege.png b/graph/mensch_Atemwege.png → graph/mensch-atemwege.png
diff --git a/graph/mensch_bg.png → graph/mensch-bg.png b/graph/mensch_bg.png → graph/mensch-bg.png
diff --git a/graph/mensch_empty.png → graph/mensch-empty.png b/graph/mensch_empty.png → graph/mensch-empty.png
diff --git a/graph/mensch_Feinstaub_K.png → graph/mensch-feinstaub-k.png b/graph/mensch_Feinstaub_K.png → graph/mensch-feinstaub-k.png
diff --git a/graph/mensch_Feinstaub_L.png → graph/mensch-feinstaub-l.png b/graph/mensch_Feinstaub_L.png → graph/mensch-feinstaub-l.png
diff --git a/graph/mensch_Herz.png → graph/mensch-herz.png b/graph/mensch_Herz.png → graph/mensch-herz.png
diff --git a/graph/mensch_Kohlenmonoxid_K.png → graph/mensch-kohlenmonoxid-k.png b/graph/mensch_Kohlenmonoxid_K.png → graph/mensch-kohlenmonoxid-k.png
diff --git a/graph/mensch_Nervensystem.png → graph/mensch-nervensystem.png b/graph/mensch_Nervensystem.png → graph/mensch-nervensystem.png
diff --git a/graph/mensch_Notfaelle.png → graph/mensch-notfaelle.png b/graph/mensch_Notfaelle.png → graph/mensch-notfaelle.png
diff --git a/graph/mensch_Ozon_K.png → graph/mensch-ozon-k.png b/graph/mensch_Ozon_K.png → graph/mensch-ozon-k.png
diff --git a/graph/mensch_Ozon_L.png → graph/mensch-ozon-l.png b/graph/mensch_Ozon_L.png → graph/mensch-ozon-l.png
diff --git a/graph/mensch_Schwefeldioxid_K.png → graph/mensch-schwefeldioxid-k.png b/graph/mensch_Schwefeldioxid_K.png → graph/mensch-schwefeldioxid-k.png
diff --git a/graph/mensch_Sterblichkeit.png → graph/mensch-sterblichkeit.png b/graph/mensch_Sterblichkeit.png → graph/mensch-sterblichkeit.png
diff --git a/graph/mensch_Stickstoffdioxid_K.png → graph/mensch-stickstoffdioxid-k.png b/graph/mensch_Stickstoffdioxid_K.png → graph/mensch-stickstoffdioxid-k.png
diff --git a/graph/mensch_Stickstoffdioxid_L.png → graph/mensch-stickstoffdioxid-l.png b/graph/mensch_Stickstoffdioxid_L.png → graph/mensch-stickstoffdioxid-l.png
diff --git a/graph/mensch_Stoffwechsel.png → graph/mensch-stoffwechsel.png b/graph/mensch_Stoffwechsel.png → graph/mensch-stoffwechsel.png
diff --git a/iframe.html b/iframe.html
@@ -7,7 +7,7 @@
 
     <title>LUDOK iFrame</title>
 
-    <script type="text/javascript" src="jquery/jquery-3.5.1.min.js"></script>
+    <script type="text/javascript" src="jquery/jquery-3.7.1.min.js"></script>
 
     <script>
 
@@ -42,9 +42,9 @@
 <body>
 
 <div class="div_iFrame" id="div_iFrame">
-    <iframe src="index.html" id="ifr_LUDOK" width="100%" height="100%">
+    <iframe src="index.html" id="ifr_LUDOK" width="100%" height="100%" />
 </div>
 
 </body>
 
-</html>
+</html>