Skip to content
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

Fix 'Change' links on settings page #4898

Merged
merged 2 commits into from
Nov 15, 2023
Merged

Fix 'Change' links on settings page #4898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd43685
Add missing suffix to settings page link
tombye Nov 15, 2023
fff39fa
Add CSS fix for visually-hidden text
tombye Nov 15, 2023
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
13 changes: 13 additions & 0 deletions app/assets/stylesheets/govuk-frontend/extensions.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,19 @@ $govuk-destructive-link-active-colour: $govuk-text-colour;
@include govuk-link-style-destructive-no-visited-state;
}

// TODO: Remove when updating to v5 of govuk-frontend
// Absolute positioning has the unintended consequence of removing any
// whitespace surrounding visually hidden text from the accessibility tree.
// Insert a space character before and after visually hidden text to separate
// it from any visible text surrounding it.
.govuk-visually-hidden::before {
content: "\00a0";
}

.govuk-visually-hidden::after {
content: "\00a0";
}

// GOVUK Frontend's grid-column classes are built from the $govuk-grid-widths map
// that means we can extend the map to get extra classes
$notify-grid-widths: (
Expand Down
3 changes: 2 additions & 1 deletion app/templates/views/service-settings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,8 @@ <h1 class="heading-medium">Settings</h1>
{{ edit_field(
'Change',
url_for('main.service_set_international_letters', service_id=current_service.id),
permissions=['manage_service']
permissions=['manage_service'],
suffix='your settings for sending international letters',
)}}
{% endcall %}

Expand Down
6 changes: 3 additions & 3 deletions tests/app/main/views/service_settings/test_service_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def mock_get_service_settings_page_common(
"Send text messages Off Change your settings for sending text messages",
"Label Value Action",
"Send letters On Change your settings for sending letters",
"Send international letters Off Change",
"Send international letters Off Change your settings for sending international letters",
"Sender addresses Not set Manage sender addresses",
"Letter branding Not set Change letter branding",
],
Expand Down Expand Up @@ -157,7 +157,7 @@ def mock_get_service_settings_page_common(
"Send text messages Off Change your settings for sending text messages",
"Label Value Action",
"Send letters On Change your settings for sending letters",
"Send international letters Off Change",
"Send international letters Off Change your settings for sending international letters",
"Sender addresses Not set Manage sender addresses",
"Letter branding Not set Change letter branding",
"Label Value Action",
Expand Down Expand Up @@ -474,7 +474,7 @@ def test_send_files_by_email_row_on_settings_page(
"Send text messages Off Change your settings for sending text messages",
"Label Value Action",
"Send letters On Change your settings for sending letters",
"Send international letters Off Change",
"Send international letters Off Change your settings for sending international letters",
"Sender addresses 1 Example Street Manage sender addresses",
"Letter branding Not set Change letter branding",
],
Expand Down