-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
Enter abstraction period dates for return set up #610
Merged
Demwunz
merged 6 commits into
main
from
WATER-4274-enter-abstraction-period-dates-for-return-set-up-basic-page
Dec 29, 2023
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
5d26a83
Enter abstraction period dates for return set up
Demwunz d29ab04
feat:added stub page
Demwunz 98bbf96
Merge branch 'main' into WATER-4274-enter-abstraction-period-dates-fo…
Demwunz d6a431f
Merge branch 'main' into WATER-4274-enter-abstraction-period-dates-fo…
Demwunz 336a216
chore: moved titles into set variable
Demwunz d160752
Merge branch 'main' into WATER-4274-enter-abstraction-period-dates-fo…
Demwunz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
{% extends 'layout.njk' %} | ||
{% from "govuk/components/back-link/macro.njk" import govukBackLink %} | ||
{% from "govuk/components/button/macro.njk" import govukButton %} | ||
|
||
{% set title = "Enter the abstraction period for the return requirement | ||
" %} | ||
{% set rootLink = "/system/return-requirements/" + id %} | ||
|
||
{% block breadcrumbs %} | ||
{# Back link #} | ||
{{ | ||
govukBackLink({ | ||
text: 'Back', | ||
href: rootLink + "/points" | ||
}) | ||
}} | ||
{% endblock %} | ||
|
||
{% block content %} | ||
{# Main heading #} | ||
<div class="govuk-body"> | ||
<h1 class="govuk-heading-xl govuk-!-margin-bottom-3">{{ title }}</h1> | ||
</div> | ||
|
||
<form method="post"> | ||
<div class="govuk-body"> | ||
{{ govukButton({ text: "Continue" }) }} | ||
</div> | ||
</form> | ||
{% endblock %} |
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
3 changes: 2 additions & 1 deletion
3
app/views/return-requirements/no-return-check-your-answers.njk
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,14 @@ | ||
{% extends 'layout.njk' %} | ||
{% from "govuk/components/panel/macro.njk" import govukPanel %} | ||
|
||
{% set title = "What happens next" %} | ||
|
||
{% block content %} | ||
{{ govukPanel({ | ||
titleText: "Returns requirements approved", | ||
classes: "govuk-!-margin-bottom-4" | ||
}) }} | ||
|
||
<h2 class="govuk-heading-m">What happens next</h2> | ||
<h2 class="govuk-heading-m">{{title}}</h2> | ||
<p class="govuk-body">These return requirements are now active and returns will be opened for this licence in the next returns cycle.</p> | ||
{% endblock %} |
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't mind doing it this way but we need to be consistent. some of the pages have the text in the H1 element. so we either need to change the others to this way or make this the same as those.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@robertparkinson I've created another branch and moved all title strings in other files to use the set.
I'm lifting this from the prototype, so it's less friction when copying across nunjucks code.