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

Link to specification page, not PDF directly

Browse Source
This commit is contained in:
Chris Hill-Scott
2020-09-22 15:36:08 +01:00
parent a384f4cace
commit 2d64306e88
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/main/views/sub_navigation_dictionaries.py
View File

@@ -84,6 +84,10 @@ def using_notify_nav():
"name": "Upload a letter",
"link": "main.upload_a_letter",
},
{
"name": "Letter specification",
"link": "main.letter_specification",
},
]
},
{

2
app/templates/views/uploads/choose-file.html
View File

@@ -35,7 +35,7 @@
)}}
</p>
<p class="govuk-body">Your file must meet our <a href="#">letter specification</a>.</p>
<p class="govuk-body">Your file must meet our <a class="govuk-link" href="{{ url_for('main.letter_specification') }}">letter specification</a>.</p>
</div>
</div>
{% endblock %}

14
app/utils.py
View File

@@ -623,14 +623,14 @@ LETTER_VALIDATION_MESSAGES = {
'detail': (
'You need to change the size or orientation of {invalid_pages}. <br>'
'Files must meet our '
'<!--replace links to the PDF with links to the new page--><a class="govuk-link govuk-link--destructive" href="{letter_spec_guidance}" target="_blank">'
'<a class="govuk-link govuk-link--destructive" href="{letter_spec_guidance}" target="_blank">'
'letter specification'
'</a>.'
),
'summary': (
'Validation failed because {invalid_pages} {invalid_pages_are_or_is} not A4 portrait size.<br>'
'Files must meet our '
'<a class="govuk-link govuk-link--no-visited-state" href="{letter_spec}" target="_blank">'
'<a class="govuk-link govuk-link--no-visited-state" href="{letter_spec_guidance}">'
'letter specification'
'</a>.'
),
@@ -640,14 +640,14 @@ LETTER_VALIDATION_MESSAGES = {
'detail': (
'You need to edit {invalid_pages}.<br>'
'Files must meet our '
'<a class="govuk-link govuk-link--destructive" href="{letter_spec_guidance}" target="_blank">'
'<a class="govuk-link govuk-link--destructive" href="{letter_spec_guidance}">'
'letter specification'
'</a>.'
),
'summary': (
'Validation failed because content is outside the printable area on {invalid_pages}.<br>'
'Files must meet our '
'<a class="govuk-link govuk-link--no-visited-state" href="{letter_spec}" target="_blank">'
'<a class="govuk-link govuk-link--no-visited-state" href="{letter_spec_guidance}" target="_blank">'
'letter specification'
'</a>.'
),
@@ -689,7 +689,7 @@ LETTER_VALIDATION_MESSAGES = {
'summary': (
'Validation failed because the address block is empty.<br>'
'Files must meet our '
'<a class="govuk-link govuk-link--no-visited-state" href="{letter_spec}" target="_blank">'
'<a class="govuk-link govuk-link--no-visited-state" href="{letter_spec_guidance}" target="_blank">'
'letter specification'
'</a>.'
),
@@ -791,13 +791,13 @@ def get_letter_validation_error(validation_message, invalid_pages=None, page_cou
invalid_pages=invalid_pages,
invalid_pages_are_or_is=invalid_pages_are_or_is,
page_count=page_count,
letter_spec_guidance=url_for('.upload_a_letter')
letter_spec_guidance=url_for('.letter_specification')
),
'summary': LETTER_VALIDATION_MESSAGES[validation_message]['summary'].format(
invalid_pages=invalid_pages,
invalid_pages_are_or_is=invalid_pages_are_or_is,
page_count=page_count,
letter_spec=url_for('.letter_spec'),
letter_spec_guidance=url_for('.letter_specification'),
),
}

6
tests/app/test_utils.py
View File

@@ -586,13 +586,11 @@ def test_get_letter_validation_error_for_known_errors(
assert detail.text == expected_content
if detail.select_one('a'):
assert detail.select_one('a')['href'] == url_for('.upload_a_letter')
assert detail.select_one('a')['target'] == '_blank'
assert detail.select_one('a')['href'] == url_for('.letter_specification')
assert summary.text == expected_summary
if summary.select_one('a'):
assert summary.select_one('a')['href'] == url_for('.letter_spec')
assert summary.select_one('a')['target'] == '_blank'
assert summary.select_one('a')['href'] == url_for('.letter_specification')
@pytest.mark.parametrize("date_from_db, expected_result", [