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

Merge pull request #3670 from alphagov/show-broadcast-tour-when-password-reset

Browse Source 
Take user to page they are meant to visit in various sign-in flow scenarios
This commit is contained in:
Pea M. Tyczynska
2020-10-12 12:27:37 +01:00
committed by GitHub
parent 99880fd672 6578719103
commit b60d25da67
19 changed files with 239 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/templates/views/email-link-invalid.html
View File

@@ -11,7 +11,11 @@
<div class="govuk-grid-column-two-thirds">
<h1 class="heading-large">The link has expired</h1>
<p class="govuk-body"><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.sign_in') }}">Sign in again</a> to get a new link.</p>
<p class="govuk-body">
<a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.sign_in', next=redirect_url) }}">
Sign in again
</a> to get a new link.
</p>
</div>
</div>

2
app/templates/views/email-not-received.html
View File

@@ -16,7 +16,7 @@
{{ govukButton({
"element": "a",
"text": "Resend email link",
"href": url_for('main.resend_email_link')
"href": url_for('main.resend_email_link', next=redirect_url)
}) }}
</p>

2
app/templates/views/re-validate-email-sent.html
View File

@@ -14,7 +14,7 @@
<p class="govuk-body">We’ve sent you a link to sign in to Notify. The link will open in a new browser window, so you can close this one.</p>
{{ page_footer(
secondary_link=url_for('main.email_not_received'),
secondary_link=url_for('main.email_not_received', next=redirect_url),
secondary_link_text='Not received an email?'
) }}
</div>

2
app/templates/views/signin.html
View File

@@ -33,7 +33,7 @@
{% call form_wrapper(autocomplete=True) %}
{{ form.email_address(param_extensions={"autocomplete": "email"}) }}
{{ form.password(param_extensions={"autocomplete": "current-password"}) }}
{{ page_footer("Continue", secondary_link=url_for('.forgot_password'), secondary_link_text="Forgotten your password?") }}
{{ page_footer("Continue", secondary_link=password_reset_url, secondary_link_text="Forgotten your password?") }}
{% endcall %}
</div>
</div>

2
app/templates/views/two-factor-email.html
View File

@@ -13,7 +13,7 @@
<p class="govuk-body">We’ve emailed you a link to sign in to Notify.</p>
<p class="govuk-body">Clicking the link will open Notify in a new browser window, so you can close this one.</p>
{{ page_footer(
secondary_link=url_for('main.email_not_received'),
secondary_link=url_for('main.email_not_received', next=redirect_url),
secondary_link_text='Not received an email?'
) }}
</div>

2
app/templates/views/two-factor.html
View File

@@ -22,7 +22,7 @@
}) }}
{{ page_footer(
"Continue",
secondary_link=url_for('main.check_and_resend_text_code'),
secondary_link=url_for('main.check_and_resend_text_code', next=redirect_url),
secondary_link_text='Not received a text message?'
) }}
{% endcall %}

2
app/templates/views/verification-not-received.html
View File

@@ -16,7 +16,7 @@
{{ govukButton({
"element": "a",
"text": "Resend security code",
"href": url_for('main.check_and_resend_verification_code')
"href": url_for('main.check_and_resend_verification_code', next=redirect_url)
}) }}
</p>