diff --git a/src/open_inwoner/accounts/tests/test_profile_views.py b/src/open_inwoner/accounts/tests/test_profile_views.py index d643e41eb4..606b1ab7c6 100644 --- a/src/open_inwoner/accounts/tests/test_profile_views.py +++ b/src/open_inwoner/accounts/tests/test_profile_views.py @@ -177,7 +177,7 @@ def test_mydata_shown_with_digid_and_brp(self): login_type=LoginTypeChoices.digid, ) response = self.app.get(self.url, user=user) - self.assertContains(response, _("My details")) + self.assertContains(response, _("Bekijk alle gegevens")) # check business profile section not displayed self.assertNotContains(response, "Bedrijfsgegevens") diff --git a/src/open_inwoner/accounts/views/profile.py b/src/open_inwoner/accounts/views/profile.py index e9232a0a6a..58e64c05d1 100644 --- a/src/open_inwoner/accounts/views/profile.py +++ b/src/open_inwoner/accounts/views/profile.py @@ -75,6 +75,7 @@ def get_context_data(self, **kwargs): ("#personal-info", _("Persoonlijke gegevens")), ("#notifications", _("Voorkeuren voor meldingen")), ("#overview", _("Overzicht")), + ("#profile-remove", _("Profiel verwijderen")), ] user_files = user.get_all_files() diff --git a/src/open_inwoner/components/templates/components/Form/FormActions.html b/src/open_inwoner/components/templates/components/Form/FormActions.html index 0b28f89306..6c92fec78f 100644 --- a/src/open_inwoner/components/templates/components/Form/FormActions.html +++ b/src/open_inwoner/components/templates/components/Form/FormActions.html @@ -1,5 +1,5 @@ {% load button_tags %} -
+
{% if secondary_text %}{% button href=secondary_href secondary=secondary text=secondary_text icon=secondary_icon icon_position=secondary_icon_position form_id=form_id %}{% endif %} {% if secondary_name %}{% button name=secondary_name type="submit" secondary=secondary text=secondary_text icon=secondary_icon icon_position=secondary_icon_position form_id=form_id %}{% endif %} {% if secondary_value %}{% button name=secondary_name value=secondary_value type="submit" secondary=secondary text=secondary_text icon=secondary_icon icon_position=secondary_icon_position form_id=form_id %}{% endif %} diff --git a/src/open_inwoner/components/templatetags/form_tags.py b/src/open_inwoner/components/templatetags/form_tags.py index 0e86e093de..8a1639431b 100644 --- a/src/open_inwoner/components/templatetags/form_tags.py +++ b/src/open_inwoner/components/templatetags/form_tags.py @@ -367,6 +367,7 @@ def form_actions( {% form_actions primary_text="Submit" %} Variables: + - fullwidth: bool | if submit-buttons should be in a block instead of grid. - primary: bool | if false, hide the primary button. - primary_text: string | The text for the primary button. - primary_icon: string | The icon for the primary button. diff --git a/src/open_inwoner/scss/components/Cases/CaseDetail.scss b/src/open_inwoner/scss/components/Cases/CaseDetail.scss index 37528115e6..c61fc188d9 100644 --- a/src/open_inwoner/scss/components/Cases/CaseDetail.scss +++ b/src/open_inwoner/scss/components/Cases/CaseDetail.scss @@ -14,6 +14,7 @@ /// cards on case detail .card { margin-bottom: var(--spacing-extra-large); + &__body { &.document-upload-description { display: flex; @@ -61,7 +62,7 @@ } .file-list, - .form__actions { + .form__actions--fullwidth { display: block; margin: 0; diff --git a/src/open_inwoner/scss/components/Form/Form.scss b/src/open_inwoner/scss/components/Form/Form.scss index 587b3d1998..8e40cba66d 100644 --- a/src/open_inwoner/scss/components/Form/Form.scss +++ b/src/open_inwoner/scss/components/Form/Form.scss @@ -81,6 +81,7 @@ } } } + &__control .label .notifications__errors @@ -164,6 +165,7 @@ font-family: var(--font-family-body); font-size: var(--font-size-body); font-style: italic; + .label__label--required { vertical-align: sub; } @@ -190,6 +192,17 @@ gap: 0; margin-top: 0; } + + &--fullwidth { + display: block; + margin: 0; + + .button { + width: 100%; + font-weight: bold; + justify-content: center; + } + } } &__actions .button--secondary:last-child { diff --git a/src/open_inwoner/templates/pages/cases/document_form.html b/src/open_inwoner/templates/pages/cases/document_form.html index ff487d5591..1342d46491 100644 --- a/src/open_inwoner/templates/pages/cases/document_form.html +++ b/src/open_inwoner/templates/pages/cases/document_form.html @@ -6,7 +6,7 @@ {% csrf_token %} {% input form.type no_label=True no_help=True class="label input" id="id_type" extra_classes="file-type__select" %} {% file_input form.files max_upload_size=openzaak_config.max_upload_size allowed_file_extensions=openzaak_config.allowed_file_extensions %} - {% form_actions primary_text=_("Upload documenten") enctype="multipart/form-data" %} + {% form_actions primary_text=_("Upload documenten") enctype="multipart/form-data" fullwidth=True %} diff --git a/src/open_inwoner/templates/pages/profile/edit.html b/src/open_inwoner/templates/pages/profile/edit.html index 3fcb4d0901..f3517d99c8 100644 --- a/src/open_inwoner/templates/pages/profile/edit.html +++ b/src/open_inwoner/templates/pages/profile/edit.html @@ -1,45 +1,61 @@ {% extends 'master.html' %} -{% load i18n l10n form_tags %} +{% load i18n l10n grid_tags form_tags anchor_menu_tags icon_tags button_tags %} + +{% block sidebar_content %} + {% anchor_menu anchors=anchors desktop=True %} +{% endblock sidebar_content %} {% block extra_head %} - {{form.media}} + {{ form.media }} {% endblock %} {% block content %} -

- {% trans "Profiel bewerken" %} -

- - {% render_form id="profile-edit" method="POST" form=form form_action=form_action enctype="multipart/form-data" %} - {% csrf_token %} - - {% with request.user as user %} - {% if user.is_digid_user_with_brp %} - {% input form.display_name %} - {% input form.email %} - {% input form.phonenumber %} - {% if user.contact_type == "begeleider" %} - {% input form.image no_help=True %} - {% image_crop form.cropping %} - {% endif %} - {% else %} - {% input form.first_name %} - {% input form.infix %} - {% input form.last_name %} - {% input form.display_name %} - {% input form.email %} - {% input form.phonenumber %} - {% input form.street %} - {% input form.housenumber %} - {% input form.postcode %} - {% input form.city %} - {% if user.contact_type == "begeleider" %} - {% input form.image no_help=True %} - {% image_crop form.cropping %} - {% endif %} - {% endif %} - {% endwith %} - {% form_actions primary_text=_("Opslaan") primary_icon="arrow_forward" secondary_href='profile:detail' secondary_text=_('Terug') secondary_icon='arrow_backward' secondary_icon_position="before" enctype="multipart/form-data" %} - {% endrender_form %} + +
+

+ {% trans "Bewerk contactgegevens" %} +

+ + {% render_grid %} + {% render_column start=0 span=8 %} + + {% render_form id="profile-edit" method="POST" form=form form_action=form_action enctype="multipart/form-data" %} + {% csrf_token %} + + {% with request.user as user %} + {% if user.is_digid_user_with_brp %} + {% input form.display_name %} + {% input form.email %} + {% input form.phonenumber %} + {% if user.contact_type == "begeleider" %} + {% input form.image no_help=True %} + {% image_crop form.cropping %} + {% endif %} + {% else %} + {% input form.first_name %} + {% input form.infix %} + {% input form.last_name %} + {% input form.display_name %} + {% input form.email %} + {% input form.phonenumber %} + {% input form.street %} + {% input form.housenumber %} + {% input form.postcode %} + {% input form.city %} + {% if user.contact_type == "begeleider" %} + {% input form.image no_help=True %} + {% image_crop form.cropping %} + {% endif %} + {% endif %} + {% endwith %} +
+ {% button text="Sla wijzigingen op" primary=True type="submit" form_id="profile-edit" %} + {% button href="profile:detail" icon="west" text=_("Terug naar Mijn profiel") icon_outlined=True transparent=True %} +
+ {% endrender_form %} + + {% endrender_column %} + {% endrender_grid %} +
{% endblock content %} diff --git a/src/open_inwoner/templates/pages/profile/me.html b/src/open_inwoner/templates/pages/profile/me.html index 6908f7b5b8..e9a6210bd8 100644 --- a/src/open_inwoner/templates/pages/profile/me.html +++ b/src/open_inwoner/templates/pages/profile/me.html @@ -1,5 +1,5 @@ {% extends 'master.html' %} -{% load i18n l10n link_tags file_tags card_tags grid_tags list_tags button_tags utils icon_tags form_tags anchor_menu_tags dropdown_tags %} +{% load i18n l10n link_tags file_tags card_tags list_tags button_tags utils icon_tags form_tags anchor_menu_tags dropdown_tags %} {% block sidebar_content %} {% anchor_menu anchors=anchors desktop=True %} @@ -47,7 +47,7 @@

{% trans "Persoonlijke gegevens" %}
{% button href="profile:edit" text=_("Bewerk") icon="edit" transparent=True icon_outlined=True %} {% if user.is_digid_user_with_brp and view.config.my_data %} - {% button href="profile:data" text=_("My details") icon="info" transparent=True icon_outlined=True %} + {% button href="profile:data" text=_("Bekijk alle gegevens") icon="east" transparent=True icon_position="after" icon_outlined=True %} {% elif not user.is_digid_user %} {% button href="password_change" text=_("Password") icon="vpn_key" transparent=True icon_outlined=True %} {% endif %} @@ -104,7 +104,7 @@

{% trans "Voorkeuren voor meldingen" %} {% if view.config.mentors or view.config.my_contacts or view.config.actions or view.config.ssd or view.config.selfdiagnose %} {# Overview #}
-

{% trans "Overzicht" %}

+

{% trans "Overzicht" %}

{# Mentors #} @@ -236,7 +236,7 @@

{% trans "Zelftest" %}
-

{% trans "Profiel verwijderen" %}

+

{% trans "Profiel verwijderen" %}

{% trans "Hiermee worden alleen uw persoonlijke voorkeuren verwijderd. U krijgt dan bijvoorbeeld geen e-mail meer van ons over wijzigingen van uw lopende zaken. Uw persoonsgegevens en uw lopende zaken zelf worden hiermee niet verwijderd." %} diff --git a/src/open_inwoner/templates/pages/profile/mydata.html b/src/open_inwoner/templates/pages/profile/mydata.html index bf6eec7733..0612041f27 100644 --- a/src/open_inwoner/templates/pages/profile/mydata.html +++ b/src/open_inwoner/templates/pages/profile/mydata.html @@ -1,115 +1,116 @@ {% extends 'master.html' %} -{% load i18n l10n link_tags grid_tags dropdown_tags button_tags %} +{% load i18n l10n link_tags anchor_menu_tags dropdown_tags icon_tags button_tags %} + +{% block sidebar_content %} + {% anchor_menu anchors=anchors desktop=True %} +{% endblock sidebar_content %} {% block content %} -

- {% trans "Mijn gegevens" %} -

+
+

+ {% trans "Persoonlijke gegevens" %} +

-{% render_grid %} - {% render_column span=7 %}

{% trans "Hier ziet u een beperkte set van gegevens die van u zijn opgeslagen in de Basisregistratie Personen (BRP). Al uw persoonlijke gegevens kunt u vinden op " %} {% link href="https://mijn.overheid.nl" text="mijn.overheid.nl" primary=True %}

-

{% trans "Mijn BRP gegevens" %}

- {% with request.user as user %} -
-
+
+
+

{% trans "Mijn BRP gegevens" %}

+
+
{% trans "Voornamen" %}
-
{{my_data.first_name|default:"-"}}
+
{{ my_data.first_name|default:"-" }}
-
+
{% trans "Voorletters" %}
-
{{my_data.initials|default:"-"}}
+
{{ my_data.initials|default:"-" }}
-
+
{% trans "Achternaam" %}
-
{{my_data.last_name|default:"-"}}
+
{{ my_data.last_name|default:"-" }}
-
+
{% trans "Voorvoegsel" %}
-
{{my_data.infix|default:"-"}}
+
{{ my_data.infix|default:"-" }}
-
+
{% trans "Geboortedatum" %}
-
{{my_data.birthday|date:"d F Y"|default:"-"}}
+
{{ my_data.birthday|date:"d F Y"|default:"-" }}
-
+
{% trans "Geboorteplaats" %}
-
{{my_data.birth_place|default:"-"}}
+
{{ my_data.birth_place|default:"-" }}
-
+
{% trans "Burgerservicenummer (BSN)" %}
-
{{user.bsn|default:"-"}}
+
{{ user.bsn|default:"-" }}
-
+
{% trans "Geslacht" %}
-
{{my_data.gender|default:"-"}}
+
{{ my_data.gender|default:"-" }}
-
+
-

{% trans "Inschrijfadres" %}

- -
-
+
+
+

{% trans "Inschrijfadres" %}

+
+
{% trans "Straat" %}
-
{{my_data.street|default:"-"}}
+
{{ my_data.street|default:"-" }}
-
+
{% trans "Huisnummer" %}
-
{{my_data.get_housenumber|default:"-"}}
+
{{ my_data.get_housenumber|default:"-" }}
-
+
{% trans "Postcode" %}
-
{{my_data.postal_code|default:"-"}}
+
{{ my_data.postal_code|default:"-" }}
-
+
{% trans "Plaats" %}
-
{{my_data.city|default:"-"}}
+
{{ my_data.city|default:"-" }}
{% if my_data.country %} -
-
{% trans "Land" %}
-
{{my_data.country|default:"-"}}
-
+
+
{% trans "Land" %}
+
{{ my_data.country|default:"-" }}
+
{% endif %} -
+
-

- {% trans "Contactgegevens" %} - - {% button_row align="right" %} - {% dropdown icon="settings" secondary=True %} -
- {% button href="profile:edit" text=_("Bewerken") icon="edit" transparent=True %} +
+
+

{% trans "Contactgegevens" %} +
+ {% button href="profile:edit" text=_("Bewerk") icon="edit" transparent=True icon_outlined=True %}
- {% enddropdown %} - {% endbutton_row %} -

- -
-
+

+
+
{% trans "Roepnaam" %}
-
{{user.display_name|default:"-"}}
+
{{ user.display_name|default:"-" }}
-
+
{% trans "Telefoonnummer" %}
-
{{user.phonenumber|default:"-"}}
+
{{ user.phonenumber|default:"-" }}
-
+
{% trans "E-mailadres" %}
-
{{user.email|default:"-"}}
+
{{ user.email|default:"-" }}
-
+
+ {% endwith %} - {% endrender_column %} -{% endrender_grid %} + +

{% endblock content %} diff --git a/src/open_inwoner/templates/registration/password_change_form.html b/src/open_inwoner/templates/registration/password_change_form.html index fd4dada90c..df16c7d5bd 100644 --- a/src/open_inwoner/templates/registration/password_change_form.html +++ b/src/open_inwoner/templates/registration/password_change_form.html @@ -1,16 +1,29 @@ {% extends 'master.html' %} -{% load i18n form_tags %} +{% load i18n grid_tags form_tags anchor_menu_tags button_tags %} + +{% block sidebar_content %} + {% anchor_menu anchors=anchors desktop=True %} +{% endblock sidebar_content %} {% block content %} -

{% trans "Password reset" %}

-

{% trans "For security reasons, please enter your old password and your new password twice so we can make sure you have not made any typo." %}

- {% render_form id="password-change-form" method="POST" form=form%} - {% csrf_token %} - {% input form.old_password %} - {% input form.new_password1 %} - {% input form.new_password2 %} - {% form_actions primary_text=_("Change my password") primary_icon="arrow_forward" %} - {% endrender_form %} + {% render_grid %} + {% render_column start=0 span=8 %} + +

{% trans "Password reset" %}

+

{% trans "For security reasons, please enter your old password and your new password twice so we can make sure you have not made any typo." %}

+ + {% render_form id="password-change-form" method="POST" form=form %} + {% csrf_token %} + {% input form.old_password %} + {% input form.new_password1 %} + {% input form.new_password2 %} +
+ {% button text=_("Change my password") primary=True type="submit" icon="east" icon_outlined=True icon_position="after" form_id="password-change-form" %} +
+ {% endrender_form %} + + {% endrender_column %} + {% endrender_grid %} {% endblock content %}