Merge branch 'develop' of github.com:maykinmedia/open-inwoner into de…

…velop
maykinmedia · Jun 25, 2024 · 4485fee · 4485fee
2 parents 3c2e2c2 + 4b02eb4
commit 4485fee
Show file tree

Hide file tree

Showing 43 changed files with 3,347 additions and 2,476 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -225,7 +225,7 @@ django-localflavor==3.1
     # via -r requirements/base.in
 django-log-outgoing-requests==0.6.1
     # via -r requirements/base.in
-django-open-forms-client==0.3.0
+django-open-forms-client==0.4.0
     # via -r requirements/base.in
 django-ordered-model==3.7.4
     # via

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -379,7 +379,7 @@ django-log-outgoing-requests==0.6.1
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
-django-open-forms-client==0.3.0
+django-open-forms-client==0.4.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -423,7 +423,7 @@ django-log-outgoing-requests==0.6.1
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
-django-open-forms-client==0.3.0
+django-open-forms-client==0.4.0
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt

diff --git a/src/open_inwoner/components/templates/components/File/File.html b/src/open_inwoner/components/templates/components/File/File.html
@@ -18,11 +18,11 @@
                 <span class="file__name">
                     {{ name }}
                     {% if extension and size %}
-                        ({{extension}}, {{size|readable_size}})
+                        ({{ extension }}, {{ size|readable_size }})
                     {% elif extension %}
-                        ({{extension}})
+                        ({{ extension }})
                     {% elif size %}
-                        ({{size|readable_size}})
+                        ({{ size|readable_size }})
                     {% endif %}
                 </span>
                 <span class="file__date">{{ created|date:'j F Y' }}</span>
@@ -50,7 +50,7 @@
                 {% enddropdown %}
             {% elif show_download %}
                 {% trans "Download" as download %}
-                {% link href=url text=download primary=True download=True hide_text=True extra_classes="file__download" icon="download" icon_outlined=True icon_position="before" %}
+                {% link href=url text=download|add:" "|add:name primary=True download=True hide_text=True extra_classes="file__download" icon="download" icon_outlined=True icon_position="before" %}
             {% endif %}
             {% if description %}<p class="utrecht-paragraph utrecht-paragraph--oip utrecht-paragraph--small">{{ description }}</p>{% endif %}
         </div>

diff --git a/src/open_inwoner/components/templates/components/Header/Header.html b/src/open_inwoner/components/templates/components/Header/Header.html
@@ -32,7 +32,7 @@
         </div>
         {# end of mobile header-menu with logo #}
 
-        <div class="header__submenu">
+        <div class="header--mobile header__submenu">
             {% if cms_apps.products and request.user.is_authenticated or not config.hide_search_from_anonymous_users %}
                 <nav class="header__actions header__actions--open" aria-label="Zoek navigatie mobiel">
                     <form id="search-form-mobile-open" class="search-form-delegate form form--inline">
@@ -42,7 +42,7 @@
                 </nav>
             {% endif %}
 
-                <nav class="primary-navigation" aria-label="Hoofd navigatie">
+                <nav class="primary-navigation primary-navigation--mobile" aria-label="Hoofd navigatie">
                     <ul class="primary-navigation__list">
 
                         <li class="primary-navigation__list-item">

diff --git a/src/open_inwoner/components/templates/components/Header/NavigationAuthenticated.html b/src/open_inwoner/components/templates/components/Header/NavigationAuthenticated.html
@@ -4,7 +4,7 @@
 
 {% if request.user.is_authenticated %}
 
-    <nav class="primary-navigation primary-navigation__authenticated" aria-label="Navigatie na inloggen">
+    <nav class="primary-navigation primary-navigation--desktop primary-navigation__authenticated" aria-label="Navigatie na inloggen">
         <ul class="primary-navigation__list">
             <li class="primary-navigation__list-item">
             {% button text=_('Welkom ')|addstr:request.user.get_short_name type="button" icon="expand_more" icon_position="after" icon_outlined=True transparent=True extra_classes="primary-navigation--toggle" %}

diff --git a/src/open_inwoner/components/templates/components/Header/PrimaryNavigation.html b/src/open_inwoner/components/templates/components/Header/PrimaryNavigation.html
@@ -2,7 +2,7 @@
 
 {% get_solo "configurations.SiteConfiguration" as config %}
 
-<nav class="primary-navigation primary-navigation__main" aria-label="Hoofd navigatie">
+<nav class="primary-navigation primary-navigation--desktop primary-navigation__main" aria-label="Hoofd navigatie">
     <ul class="primary-navigation__list">
         {% if cms_apps.products and menu_categories %}
             {% if request.user.is_authenticated or not config.hide_categories_from_anonymous_users %}

diff --git a/src/open_inwoner/conf/locale/nl/LC_MESSAGES/django.mo b/src/open_inwoner/conf/locale/nl/LC_MESSAGES/django.mo