diff --git a/src/open_inwoner/accounts/views/contactmoments.py b/src/open_inwoner/accounts/views/contactmoments.py index d6a2de40a2..4afc44225b 100644 --- a/src/open_inwoner/accounts/views/contactmoments.py +++ b/src/open_inwoner/accounts/views/contactmoments.py @@ -253,12 +253,12 @@ def get_context_data(self, **kwargs): } if zaak: ctx["destination"] = { - "label": _("Naar aanvrag"), + "label": _("Naar aanvraag"), "url": zaak_url, } else: ctx["origin"] = { - "label": _("Terug naar aanvrag"), + "label": _("Terug naar aanvraag"), "url": zaak_url, } ctx["destination"] = { diff --git a/src/open_inwoner/openklant/tests/test_views.py b/src/open_inwoner/openklant/tests/test_views.py index 645831b92e..8cd13b328a 100644 --- a/src/open_inwoner/openklant/tests/test_views.py +++ b/src/open_inwoner/openklant/tests/test_views.py @@ -294,7 +294,7 @@ def test_show_detail_for_bsn_with_zaak(self, m, mock_get_kcm_answer_mapping): zaak_link = response.pyquery("#origin_link") - self.assertIn(_("Terug naar aanvrag"), zaak_link.text()) + self.assertIn(_("Terug naar aanvraag"), zaak_link.text()) self.assertEqual( zaak_link.attr("href"), reverse( @@ -355,7 +355,7 @@ def test_show_detail_for_bsn_with_zaak_reformat_esuite_id( zaak_link = response.pyquery("#origin_link") - self.assertIn(_("Terug naar aanvrag"), zaak_link.text()) + self.assertIn(_("Terug naar aanvraag"), zaak_link.text()) self.assertEqual( zaak_link.attr("href"), reverse( diff --git a/src/open_inwoner/scss/components/Contactmomenten/Contactmomenten.scss b/src/open_inwoner/scss/components/Contactmomenten/Contactmomenten.scss index 924ad43606..82984c5ef5 100644 --- a/src/open_inwoner/scss/components/Contactmomenten/Contactmomenten.scss +++ b/src/open_inwoner/scss/components/Contactmomenten/Contactmomenten.scss @@ -74,15 +74,21 @@ } .contactmoment { - margin: auto; - width: 100%; + p { + color: var(--font-color-body); + } + + &__heading:first-of-type { + margin-top: 0; + } - @media (min-width: 768px) and (max-width: 900px) { - width: 75%; + &__heading { + font-size: var(--font-size-body-large); } - @media (min-width: 901px) { - width: 50%; + &__text { + padding-bottom: var(--spacing-large); + line-height: var(--font-line-height-body-medium); } } diff --git a/src/open_inwoner/templates/pages/contactmoment/detail.html b/src/open_inwoner/templates/pages/contactmoment/detail.html index 7bc6f6c9fd..b0188c6b12 100644 --- a/src/open_inwoner/templates/pages/contactmoment/detail.html +++ b/src/open_inwoner/templates/pages/contactmoment/detail.html @@ -10,32 +10,34 @@

{{ contactmoment.onderwerp }}

{% endrender_column %} {% endrender_grid %} -
-
-

{% trans "Uw vraag" %}

-

{{ contactmoment.text }}

-
-
-

{% trans "Antwoord" %}

- {% if contactmoment.antwoord %} -

{{ contactmoment.antwoord }}

- {% else %} -

{% trans "Nog geen antwoord beschijkbaar" %}

- {% endif %} -
-
- - {% icon "arrow_backward" %}{{ origin.label }} - -
- {% if destination %} + {% render_grid %} + {% render_column start=4 span=6 %}
- - {{ destination.label }}{% icon "arrow_forward" %} +

{% trans "Uw vraag" %}

+

{{ contactmoment.text }}

+
+
+

{% trans "Antwoord" %}

+ {% if contactmoment.antwoord %} +

{{ contactmoment.antwoord }}

+ {% else %} +

{% trans "Nog geen antwoord beschijkbaar" %}

+ {% endif %} +
+
+ + {% icon "arrow_backward" %}{{ origin.label }}
- {% endif %} -
+ {% if destination %} +
+ + {{ destination.label }}{% icon "arrow_forward" %} + +
+ {% endif %} + {% endrender_column %} + {% endrender_grid %} {% else %}

{% trans 'There is no available data at the moment.' %}