[#2036] Fixed missing 'next' parameter in link tags

maykinmedia · Apr 18, 2024 · dfd16d9 · dfd16d9
1 parent ad225a4
commit dfd16d9
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 23 deletions.
diff --git a/src/open_inwoner/accounts/templates/registration/login.html b/src/open_inwoner/accounts/templates/registration/login.html
@@ -36,7 +36,9 @@ <h1 class="utrecht-heading-1">{% trans 'Welkom' %}</h1>
                                             <img class="digid-logo__image" src="{% static 'accounts/digid_logo.svg' %}" alt="DigiD inlogpagina">
                                         </a>
                                         {% url 'digid_oidc:init' as href %}
-                                        {% link href=href text=_('Inloggen met DigiD') primary=True icon='east' extra_classes="link--next link--digid" %}
+                                        {% with href|addnexturl:next as href_with_next %}
+                                            {% link href=href_with_next text=_('Inloggen met DigiD') primary=True icon='east' extra_classes="link--next link--digid" %}
+                                        {% endwith %}
                                     {% endrender_card %}
                                 {% else %}
                                     {% render_card direction='horizontal' tinted=True compact=True %}
@@ -85,20 +87,20 @@ <h1 class="utrecht-heading-1">{% trans 'Welkom' %}</h1>
                                 </div>
 
                                 {# Hide mail login initially #}
-                                    <div class="column column--start-4 column--span-5" id="column__login-form">
-                                        {% if login_allow_registration %}
-                                            {% render_card tinted=True compact=True %}
-                                                {% render_form id="login-form" method="POST" form=form show_required=True %}
-                                                    {% csrf_token %}
-                                                    <input type="hidden" name="next" value="{{ next }}"/>
-                                                    {% input form.username %}
-                                                    {% input form.password %}
-                                                    {% button text=_('Wachtwoord vergeten?') href='password_reset' secondary=True transparent=True align='right' %}
-                                                    {% form_actions primary_text=_("Inloggen") primary_icon="arrow_forward" single=True %}
-                                                {% endrender_form %}
-                                            {% endrender_card %}
-                                        {% endif %}
-                                    </div>
+                                <div class="column column--start-4 column--span-5" id="column__login-form">
+                                    {% if login_allow_registration %}
+                                        {% render_card tinted=True compact=True %}
+                                            {% render_form id="login-form" method="POST" form=form show_required=True %}
+                                                {% csrf_token %}
+                                                <input type="hidden" name="next" value="{{ next }}"/>
+                                                {% input form.username %}
+                                                {% input form.password %}
+                                                {% button text=_('Wachtwoord vergeten?') href='password_reset' secondary=True transparent=True align='right' %}
+                                                {% form_actions primary_text=_("Inloggen") primary_icon="east" single=True %}
+                                            {% endrender_form %}
+                                        {% endrender_card %}
+                                    {% endif %}
+                                </div>
                                 {# End hidden #}
 
                                 {% render_column start=4 span=5 %}
@@ -128,21 +130,23 @@ <h2 class="tab__heading-4">Of registreer</h2>
                             {% if eherkenning_enabled %}
                                 {% get_solo 'digid_eherkenning_oidc_generics.OpenIDConnectEHerkenningConfig' as eherkenning_oidc_config %}
                                 {% if eherkenning_oidc_config.enabled %}
-                                    {% render_card direction='horizontal' tinted=True %}
+                                    {% render_card direction='horizontal' tinted=True compact=True %}
                                         <a href="{% url 'eherkenning_oidc:init' %}" class="link eherkenning-logo">
-                                            <img class="eherkenning-logo__image" src="{% static 'accounts/eherkenning.png' %}" height=30 alt="eHerkenning inlogpagina">
+                                            <img class="eherkenning-logo__image" src="{% static 'accounts/eherkenning.png' %}" height=40 alt="eHerkenning inlogpagina">
                                         </a>
                                         {% url 'eherkenning_oidc:init' as href %}
-                                        {% link href=href text=_('Inloggen met eHerkenning') primary=True icon='east' extra_classes="link--next link--eherkenning" %}
+                                        {% with href|addnexturl:next as href_with_next %}
+                                            {% link href=href_with_next text=_('Inloggen met eHerkenning') primary=True icon='east' extra_classes="link--eherkenning" %}
+                                        {% endwith %}
                                     {% endrender_card %}
                                 {% else %}
-                                    {% render_card direction='horizontal' tinted=True %}
+                                    {% render_card direction='horizontal' tinted=True compact=True %}
                                         <a href="{% url 'eherkenning:login' %}" class="link eherkenning-logo">
-                                            <img class="eherkenning-logo__image" src="{% static 'accounts/eherkenning.png' %}" height=30 alt="eHerkenning inlogpagina">
+                                            <img class="eherkenning-logo__image" src="{% static 'accounts/eherkenning.png' %}" height=40 alt="eHerkenning inlogpagina">
                                         </a>
                                         {% url 'eherkenning:login' as href %}
                                         {% with href|addnexturl:next as href_with_next %}
-                                            {% link href=href_with_next text=_('Inloggen met eHerkenning') primary=True icon='east' extra_classes="link--next link--eherkenning" %}
+                                            {% link href=href_with_next text=_('Inloggen met eHerkenning') primary=True icon='east' extra_classes="link--eherkenning" %}
                                         {% endwith %}
                                     {% endrender_card %}
                                 {% endif %}

diff --git a/src/open_inwoner/scss/components/Logo/DigidLogo.scss b/src/open_inwoner/scss/components/Logo/DigidLogo.scss
@@ -1,5 +1,5 @@
 .digid-logo {
   &__image {
-    height: 40px;
+    height: 50px;
   }
 }
diff --git a/src/open_inwoner/scss/components/TabPanel/TabPanel.scss b/src/open_inwoner/scss/components/TabPanel/TabPanel.scss
@@ -175,6 +175,10 @@
       margin-bottom: var(--spacing-large);
     }
 
+    .grid {
+      gap: var(--spacing-large);
+    }
+
     .card {
       & .link--next [class*='icon'] {
         font-size: var(--font-size-body);

diff --git a/src/open_inwoner/scss/components/Typography/Link.scss b/src/open_inwoner/scss/components/Typography/Link.scss
@@ -85,7 +85,7 @@
 
     *[class*='icon'] {
       color: var(--color-gray-90);
-      font-size: 46px;
+      font-size: 50px;
     }
   }