darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-03 21:21:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move skip links underneath the text box

Browse Source 
If we add another link under it will look weird having two under and
one off to the side. It looked sort of balanced when it was just one
off to the side and one under.

Having all the links under the box makes it less visually noisy.
This commit is contained in:
Chris Hill-Scott
2020-03-15 14:56:52 +00:00
parent b22ea172b9
commit f76a9e787a
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/templates/views/send-test.html
View File

@@ -22,24 +22,27 @@
data_kwargs={'force-focus': True}
) %}
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds {% if form.placeholder_value.label.text == 'phone number' %}extra-tracking{% endif %}">
<div class="govuk-grid-column-full {% if form.placeholder_value.label.text == 'phone number' %}extra-tracking{% endif %}">
{{ textbox(
form.placeholder_value,
hint='Optional' if optional_placeholder else None,
width='1-1',
) }}
</div>
{% if skip_link %}
<div class="govuk-grid-column-one-third">
<a href="{{ skip_link[1] }}" class="govuk-link govuk-link--no-visited-state top-gutter-4-3">{{ skip_link[0] }}</a>
{% if skip_link or link_to_upload %}
<div class="govuk-grid-column-full">
{% if link_to_upload %}
<a class="govuk-link govuk-link--no-visited-state govuk-!-margin-right-3" href="{{ url_for('.send_messages', service_id=current_service.id, template_id=template.id) }}">Upload a list of {{ recipient_count_label(999, template.template_type) }}</a>
{% endif %}
{% if skip_link %}
<a href="{{ skip_link[1] }}" class="govuk-link govuk-link--no-visited-state govuk-!-margin-right-3">{{ skip_link[0] }}</a>
{% endif %}
</div>
{% endif %}
</div>
{% if link_to_upload %}
<p>
<a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.send_messages', service_id=current_service.id, template_id=template.id) }}">
Upload a list of {{ recipient_count_label(999, template.template_type) }}
</a>
</p>
{% endif %}
{{ page_footer('Continue') }}

18
tests/app/main/views/test_send.py
View File

@@ -1310,16 +1310,17 @@ def test_send_one_off_has_skip_link(
_follow_redirects=True,
)
skip_links = page.select('a.top-gutter-4-3')
skip_links = page.select('form a')
if expected_link_text and expected_link_url:
assert skip_links[0].text.strip() == expected_link_text
assert skip_links[0]['href'] == expected_link_url(
assert skip_links[1].text.strip() == expected_link_text
assert skip_links[1]['href'] == expected_link_url(
service_id=service_one['id'],
template_id=fake_uuid,
)
else:
assert not skip_links
with pytest.raises(IndexError):
skip_links[1]
@pytest.mark.parametrize('template_type, expected_sticky', [
@@ -1376,9 +1377,9 @@ def test_skip_link_will_not_show_on_sms_one_off_if_service_has_no_mobile_number(
assert not skip_links
@pytest.mark.parametrize('user, link_index', (
(create_active_user_with_permissions(), 2),
(create_active_caseworking_user(), 1),
@pytest.mark.parametrize('user', (
create_active_user_with_permissions(),
create_active_caseworking_user(),
))
def test_send_one_off_offers_link_to_upload(
client_request,
@@ -1386,7 +1387,6 @@ def test_send_one_off_offers_link_to_upload(
mock_get_service_template,
mock_has_jobs,
user,
link_index,
):
client_request.login(user)
@@ -1398,7 +1398,7 @@ def test_send_one_off_offers_link_to_upload(
)
back_link = page.select('main a')[0]
link = page.select('main a')[link_index]
link = page.select_one('form a')
assert back_link.text.strip() == 'Back'