Merge pull request #297 from OnroerendErfgoed/develop

release 0.21.1

CHANGES.rst

@@ -1,3 +1,8 @@
+0.21.1 (08-04-2024)
+===================
+
+- Foundation laadt niet goed op publieke pagina's (#294)
+
 0.21.0 (13-03-2024)
 ===================
 

npm-packages/pyoes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pyoes",
-  "version": "0.21.0",
+  "version": "0.21.1",
   "description": "Pyoes styles package",
   "repository": "git+https://github.com/OnroerendErfgoed/pyoes.git",
   "keywords": [

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.21.0",
+  "version": "0.21.1",
   "name": "pyoes-npm-packages",
   "workspaces": ["npm-packages/*"],
   "private": true

pyoes/static/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pyoes",
   "description": "Pyoes",
-  "version": "0.21.0",
+  "version": "0.21.1",
   "private": true,
   "repository": {
     "type": "git",

pyoes/templates/pyoes/layout.jinja2

@@ -37,20 +37,6 @@
         <link rel="stylesheet" href="{{ css }}"/>
       {% endfor -%}
     {% endblock -%}
-
-    {% block javascript scoped -%}
-      <!-- javascript -->
-      {% set default_js_files = [
-        request.static_path(app_package + ':static/node_modules/foundation-sites/js/vendor/modernizr.js'),
-        request.static_path(app_package + ':static/node_modules/foundation-sites/js/vendor/jquery.js'),
-        request.static_path(app_package + ':static/node_modules/foundation-sites/js/foundation.min.js'),
-        request.static_path(app_package + ':static/js/app.js')
-		  ] -%}
-      {% set js_files = js_files|default(default_js_files) -%}
-      {% for js in js_files -%}
-        <script src="{{ js }}"></script>
-      {% endfor -%}
-    {% endblock -%}
   {% endblock %}
 
   {% block plausible -%}
@@ -101,6 +87,22 @@
   </div>
 </div>
 
+
+{% block javascript scoped -%}
+  <!-- javascript -->
+  <!-- deze moet moet onderaan de pagina zitten om foundation goed te laten werken -->
+  {% set default_js_files = [
+    request.static_path(app_package + ':static/node_modules/foundation-sites/js/vendor/modernizr.js'),
+    request.static_path(app_package + ':static/node_modules/foundation-sites/js/vendor/jquery.js'),
+    request.static_path(app_package + ':static/node_modules/foundation-sites/js/foundation.min.js'),
+    request.static_path(app_package + ':static/js/app.js')
+  ] -%}
+  {% set js_files = js_files|default(default_js_files) -%}
+  {% for js in js_files -%}
+    <script src="{{ js }}"></script>
+  {% endfor -%}
+{% endblock -%}
+
 {% if request.registry.settings['pyoes.banner'] %}
   {% from 'macros.jinja2' import render_info_banner %}
   {{ render_vlaanderen_footer(request.registry.settings['pyoes.banner'], request.registry.settings['pyoes.banner.detail']) }}

setup.py

@@ -15,7 +15,7 @@
     ]
 
 setup(name='pyoes',
-      version='0.21.0',
+      version='0.21.1',
       description='Algemene onroerenderfgoed stijl (gebaseerd op de Vlaamse huisstijl) voor pyramid',
       long_description=README + '\n\n' + CHANGES,
       classifiers=[