Merge pull request #267 from OnroerendErfgoed/develop

Develop

CHANGES.rst

@@ -1,3 +1,8 @@
+0.16.1 (24-02-2023)
+===================
+
+- main_nav updaten zodat het ook css kan zetten (#262)
+
 0.16.0 (14-12-2022)
 ===================
 

npm-packages/pyoes/package.json

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

package.json

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

pyoes/static/package.json

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

pyoes/templates/pyoes/header.jinja2

@@ -70,22 +70,28 @@
       {% set default_login_sub_nav = [('Profiel', '/'), ('Afmelden', '/')] %}
 
       {% set main_nav = main_nav|default(default_main_nav) -%}
-
+      
       {# MAIN NAV #}
       <ul class="left">
-        {% for id, caption, href in main_nav %}
-          <li{% if id == active_main_nav %} class="active"{% endif %}>
-            {% if id == 'home' %}
-              <a href="{{ href }}"><i class="fa fa-home"></i></a>
-            {% else %}
-              <a href="{{ href }}">{{ caption|safe }}</a>
-            {% endif %}
+        {% for item in main_nav %}
+          {% if item|length == 3 %}
+            {% set id, caption, href = item %}
+            {% set class = None %}
+          {% else %}
+            {% set id, caption, href, class = item %}
+          {% endif %}
+          <li class="{{ 'active' if id == active_main_nav else '' }} {{class or ''}}">
+          {% if id == 'home' %}
+            <a href="{{ href }}"><i class="fa fa-home"></i></a>
+          {% else %}
+            <a href="{{ href }}">{{ caption|safe }}</a>
+          {% endif %}
           </li>
         {% endfor %}
-        <li class="show-for-small-only"><a href="https://www.onroerenderfgoed.be/contact" target="_blank" title="Contacteer ons">Contact</a></li>
-        <li class="show-for-small-only"><a href="https://www.onroerenderfgoed.be/over-ons" target="_blank" title="Meer informatie over ons">Over ons</a></li>
+          <li class="show-for-small-only"><a href="https://www.onroerenderfgoed.be/contact" target="_blank" title="Contacteer ons">Contact</a></li>
+          <li class="show-for-small-only"><a href="https://www.onroerenderfgoed.be/over-ons" target="_blank" title="Meer informatie over ons">Over ons</a></li>
       </ul>
-
+      
       {% set dropdown_main_nav = dropdown_main_nav|default(default_dropdown_main_nav) -%}
 
       {# DROPDOWN NAV #}

setup.py

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