Skip to content

hotfix/aria-describedby-correction #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gtrinkwon merged 7 commits into from
Jan 14, 2026
Merged

hotfix/aria-describedby-correction #3

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1de01f5
Fixed incorrect help and error IDs to match aria-describedby values.
gtrinkwon Jan 9, 2026
553731e
fix: Fixed incorrect help and error IDs to match aria-describedby val…
gtrinkwon Jan 9, 2026
cad83d3
Updated required label to be an asterisk.
gtrinkwon Jan 9, 2026
f5333cb
Restored required text to label, but removed required from widget att…
gtrinkwon Jan 14, 2026
1b94269
Fixed missing change from widget_attributes override.
gtrinkwon Jan 14, 2026
1b94c32
Replaced asterisk with the word required.
gtrinkwon Jan 14, 2026
28ffc60
Remove form_prefix block
simonrjones Jan 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 41 additions & 30 deletions src/Resources/views/Form/accessible-forms.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@
{# Custom block to list errors #}
{%- block form_error_summary -%}
{% if form is not valid %}
<div id="site-aria-alert" role="alert">
<div class="govuk-error-summary rnib-error-summary" data-module="govuk-error-summary">
<h2 class="govuk-error-summary__title rnib-error-summary__title">
There are {{ form_all_errors(form) | length }} problems with this request
</h2>
<div class="govuk-error-summary__body rnib-error-summary__body">
<ul class="govuk-error-summary__list rnib-error-summary__list">
{% for error in form_all_errors(form) %}
<li><a href='#{{ error.id }}'>{{ error.message }}</a></li>
{% endfor %}
</ul>
<div id="site-aria-alert" role="alert">
<div class="govuk-error-summary rnib-error-summary" data-module="govuk-error-summary">
<h2 class="govuk-error-summary__title rnib-error-summary__title">
There are {{ form_all_errors(form) | length }} problems with this request
</h2>
<div class="govuk-error-summary__body rnib-error-summary__body">
<ul class="govuk-error-summary__list rnib-error-summary__list">
{% for error in form_all_errors(form) %}
<li><a href='#{{ error.id }}'>{{ error.message }}</a></li>
{% endfor %}
</ul>
</div>
</div>
</div>
</div>
{% endif %}
{%- endblock form_error_summary -%}

{# Custom markup for field errors. Appears as error above each field #}
{%- block form_errors -%}
{%- if errors|length > 0 -%}
{% for error in errors %}
<span id="id_{{ id }}_error{{ loop.index }}" class="tbxforms-error-message">Error: {{ error.message }}</span>
<span id="{{ id }}_error{{ loop.index }}" class="tbxforms-error-message">Error: {{ error.message }}</span>
{% endfor %}
{%- endif -%}
{%- endblock form_errors -%}
Expand Down Expand Up @@ -74,7 +74,7 @@
{% set label_attr = label_attr|merge({'class': 'tbxforms-label tbxforms-checkboxes__label'}) %}

<label{% if label_attr %}{% with {attr: label_attr} %}{{ block('attributes') }}{% endwith %}{% endif %}>
{{- block('form_label_content') -}}
{{- block('form_label_content') -}}
</label>
{%- endif -%}
{% endblock %}
Expand All @@ -88,15 +88,15 @@
{% set label_attr = label_attr|merge({'class': 'rnib-form-label rnib-form-label--option govuk-radios__label'}) %}

<label{% if label_attr %}{% with {attr: label_attr} %}{{ block('attributes') }}{% endwith %}{% endif %}>
{{- block('form_label_content') -}}
{{- block('form_label_content') -}}
</label>
{%- endif -%}
{% endblock %}

{# Custom markup for field hints #}
{% block form_help -%}
{%- if help -%}
<div id="id_{{ id }}_hint" class="rnib-form-hint">
<div id="{{ id }}_help" class="rnib-form-hint">
{{- block('form_help_content') -}}
</div>
{%- endif -%}
Expand All @@ -106,28 +106,28 @@
{%- block form_row_render -%}
<div{% with {attr: row_attr} %}{{ block('attributes') }}{% endwith %}>
{% if compound %}
<fieldset class="tbxforms-fieldset">
{% endif %}
{{- form_label(form) -}}
{{- form_help(form) -}}
{{- form_errors(form) -}}
{{- form_widget(form, widget_attr) -}}
{% if compound %}
</fieldset>
<fieldset class="tbxforms-fieldset">
{% endif %}
{{- form_label(form) -}}
{{- form_help(form) -}}
{{- form_errors(form) -}}
{{- form_widget(form, widget_attr) -}}
{% if compound %}
</fieldset>
{% endif %}
</div>
{%- endblock form_row_render -%}

{# This is for single non-choice checkboxes (eg. Agree to Terms) #}
{% block checkbox_row %}
<div class="tbxforms-form-group">
<div class="tbxforms-checkboxes">
<div class="tbxforms-checkboxes__item">
{{- form_widget(form, row_attr) -}}
{{- form_label(form) -}}
<div class="tbxforms-form-group">
<div class="tbxforms-checkboxes">
<div class="tbxforms-checkboxes__item">
{{- form_widget(form, row_attr) -}}
{{- form_label(form) -}}
</div>
</div>
</div>
</div>
{% endblock checkbox_row %}

{# Add custom markup to checkbox / radio buttons in choice context #}
Expand Down Expand Up @@ -183,11 +183,13 @@
</button>
{%- endblock button_widget -%}

{# Add class to textareas #}
{%- block textarea_widget -%}
{% set attr = attr|merge({'class': 'tbxforms-input tbxforms-textarea'}) %}
{{- parent() -}}
{%- endblock textarea_widget -%}

{# Customise markup and classes for birthday field #}
{% block birthday_widget %}
{% if widget == 'single_text' %}
{{- block('form_widget_simple') -}}
Expand All @@ -206,3 +208,12 @@

{% endif %}
{% endblock birthday_widget %}

{# Remove the required attribute from the element (disable frontend validation) #}
{%- block widget_attributes -%}
id="{{ id }}" name="{{ full_name }}"
{%- if disabled %} disabled="disabled"{% endif -%}
{% set attr = attr|merge({'required': false}) %}
{{ block('attributes') }}
{%- endblock widget_attributes -%}

Loading