Add line break functionality to instruction and description #196
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ajmaddaford
reviewed
Jul 14, 2020
Co-authored-by: Andrew Maddaford <[email protected]>
JamesGardiner
suggested changes
Jul 16, 2020
scripts/run_validator.sh
Outdated
| @@ -1,4 +1,4 @@ | |||
| #!/usr/bin/env bash | |||
| tag=latest | |||
| tag=make-description-list | |||
There was a problem hiding this comment.
reminder to revert before merge
templates/interstitial.html
Outdated
|
|
||
| {% set save_on_signout = true %} | ||
|
|
||
| {% set continue_button_text = _("Continue") %} | ||
|
|
||
| {% block form_content %} | ||
| {% set interstitial_instruction = format_paragraphs(block.content.instruction) if block.content.instruction else None %} | ||
| {% set interstitial_instruction = format_paragraphs([block.content.instruction]) if block.content.instruction else None %} |
There was a problem hiding this comment.
We should be able to pass an empty iterable to format_paragraph and have it not output anything by using the {% else %} operator when we iterate
Suggested change
| {% set interstitial_instruction = format_paragraphs([block.content.instruction]) if block.content.instruction else None %} | |
| {% set interstitial_instruction = format_paragraphs([block.content.instruction]) |
ajmaddaford
reviewed
Jul 21, 2020
| "instruction": "Just pause for a second", | ||
| "instruction": [ | ||
| "Just pause for a second" | ||
| ], |
There was a problem hiding this comment.
We should also have a question instruction in a test schema.
JamesGardiner
approved these changes
Jul 21, 2020
iwootten
changed the title
ajmaddaford
approved these changes
Jul 21, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is the context of this PR?
Break current question description into a list to allow for multiple paragraphs. Additionally makes format_paragraphs a macro and adds it to the helpers.html.
Depends on ONSdigital/eq-translations#62 and ONSdigital/eq-questionnaire-validator#50 to be merged prior to this.
How to review
Open a schema using a description (test_markup) and confirm the description continues to be displayed correctly.
Checklist