Skip to content
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

Change 'account' to 'profile' #5105

Draft
wants to merge 31 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
c975c67
Change 'account' to 'profile'
karlchillmaid Jun 6, 2024
3050d39
Change account to profile
karlchillmaid Jun 6, 2024
90441d6
Change account to profile
karlchillmaid Jun 6, 2024
cdbed8a
Change registration to profile
karlchillmaid Jun 6, 2024
92d07e5
Change account to profile
karlchillmaid Jun 6, 2024
effb123
Change account to profile
karlchillmaid Jun 6, 2024
3cc5408
Change account to profile
karlchillmaid Jun 6, 2024
37b39c9
Change account to profile
karlchillmaid Jun 6, 2024
f1812f4
Chnage account to profile
karlchillmaid Jun 6, 2024
1e7d06d
Change account to profile
karlchillmaid Jun 6, 2024
cd4c5bf
Change account to profile
karlchillmaid Jun 6, 2024
854f7e3
Change account to profile
karlchillmaid Jun 6, 2024
191bd17
Change account to mailbox
karlchillmaid Jun 6, 2024
34ccb1d
Change account to profile
karlchillmaid Jun 6, 2024
c61ef27
Change account to profile
karlchillmaid Jun 6, 2024
d853ffd
Change account to profile
karlchillmaid Jun 6, 2024
5e1eb95
Make instruction clearer
karlchillmaid Jun 10, 2024
4c27c92
Use ‘sign up’
karlchillmaid Jun 10, 2024
77a6e55
Use ‘sign up
karlchillmaid Jun 10, 2024
98b5c1a
Use inbox instead of mailbox
karlchillmaid Jun 10, 2024
64d6843
Use inbox instead of mailbox
karlchillmaid Jun 10, 2024
41b9e4a
Update content to make things clearer
karlchillmaid Jun 10, 2024
43d0b00
Make instructions clearer
karlchillmaid Jun 10, 2024
61cc433
Use sign up
karlchillmaid Jun 10, 2024
fbf71dd
Change to numbered list
karlchillmaid Jun 10, 2024
191149e
Update formatting for numbered list
karlchillmaid Jun 10, 2024
5e7f88c
Update formatting for numbered list
karlchillmaid Jun 10, 2024
d989aea
Use sign up
karlchillmaid Jun 10, 2024
725f1a8
Add sign up
karlchillmaid Jun 10, 2024
96ce035
Use sign up
karlchillmaid Jun 10, 2024
348af09
Update list
karlchillmaid Jun 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/templates/views/email-not-received.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ <h1 class="heading-large">Resend email link</h1>

<h2 class="heading-medium">If your email address has changed</h2>
<p class="govuk-body">You’ll need to:</p>
<ul class="govuk-list govuk-list--bullet">
<li>find a member of your team who has permission to manage settings, team and usage</li>
<li>ask them to change the email address for your account</li>
<li>select <span class="govuk-body govuk-!-font-weight-bold">Resend email link</span></li>
<ol class="govuk-list govuk-list--number">
<li>Find a member of your team with the ‘Manage settings, team and usage’ permission.</li>
<li>Ask them to go to the Team members page and change your email address.</li>
<li>Select <span class="govuk-body govuk-!-font-weight-bold">Resend email link</span>.</li>
</ul>

</div>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/views/guidance/features/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ <h1 class="heading-large">Features</h1>

{% if not current_user.is_authenticated %}
{% set insetHtml %}
<a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.register') }}">Create an account</a> for free and try it yourself.
<a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.register') }}">Sign up</a> for free and try it yourself.
{% endset %}
{{ govukInsetText({"html": insetHtml}) }}
{% endif %}
Expand Down
4 changes: 2 additions & 2 deletions app/templates/views/guidance/features/who-can-use-notify.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<li>state-funded schools</li>
</ul>
<p class="govuk-body">
If you work for one of these organisations but get an error when you try to create an account, <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.support') }}">contact support</a>.
If you work for one of these organisations but get an error when you try to sign up, <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.support') }}">contact support</a>.
</p>

<p class="govuk-body">GOV.UK Notify is not for personal use.</p>
Expand All @@ -49,7 +49,7 @@ <h2 class="govuk-heading-m" id="suppliers">Suppliers</h2>
If you’re doing work for a public sector organisation you can use GOV.UK&nbsp;Notify.
</p>
<p class="govuk-body">
Someone from the public sector organisation you’re working with needs to set up the account. Then they can invite you as a team member.
Someone from the public sector organisation you’re working with needs to sign up for Notify and add a service. Then they can invite you to join that service as a team member.
</p>

<h2 class="govuk-heading-m" id="gp">GP surgeries</h2>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/views/guidance/pricing/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h2 class="heading-medium">Try Notify for free</h2>

<p class="govuk-body">
{% if not current_user.is_authenticated %}
<a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.register') }}">Create an account</a> then add as many unique services as you need to.
<a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.register') }}">Create a profile</a> then add as many unique services as you need to.
{% else %}
You can add as many unique services as you need to.
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion app/templates/views/new-password.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{% if user %}
{{ govuk_page_header("Create a new password") }}
<p class="govuk-body">
You can now create a new password for your account.
You can now create a new password for your profile.
</p>
Comment on lines 16 to 18
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this paragraph at all?

{% call form_wrapper() %}
{{ form.new_password(
Expand Down
8 changes: 3 additions & 5 deletions app/templates/views/privacy.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ <h2 class="heading-medium" id="who-we-are">Who we are</h2>

<h2 class="heading-medium" id="what-data-we-collect-from-you">What data we collect from you</h2>

<p class="govuk-body">The personal data we collect from public sector employees that create a GOV.UK Notify account includes:</p>
<p class="govuk-body">The personal data we collect from public sector employees that sign up for a GOV.UK Notify profile includes:</p>

<ul class="govuk-list govuk-list--bullet">
<li>your name</li>
Expand Down Expand Up @@ -64,11 +64,9 @@ <h2 class="heading-medium" id="what-we-do-with-your-data">What we do with your d

<h2 class="heading-medium" id="how-long-we-keep-your-data">How long we keep your data</h2>

<p class="govuk-body">We’ll keep your personal data for as long as you have a GOV.UK Notify account.</p>
<p class="govuk-body">We’ll keep your personal data for as long as you have a GOV.UK Notify profile</p>

<p class="govuk-body">When you ask us to close your account, we will delete your data within 1 year.</p>

<p class="govuk-body">When we close your account we’ll delete your:</p>
<p class="govuk-body">When you ask us to delete your profile, we will delete your:</p>

<ul class="govuk-list govuk-list--bullet">
<li>name</li>
Expand Down
6 changes: 3 additions & 3 deletions app/templates/views/register-from-invite.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
{% from "components/form.html" import form_wrapper %}

{% block per_page_title %}
Create an account
Create a profile
{% endblock %}

{% block maincolumn_content %}

<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
{{ govuk_page_header("Create an account") }}
{{ govuk_page_header("Create a profile") }}
<p class="govuk-body">
Your account will be created with this email address:
Your profile will be created with this email address:
<span class="nowrap">{{invited_user.email_address}}</span>
</p>
{% call form_wrapper() %}
Expand Down
6 changes: 3 additions & 3 deletions app/templates/views/register-from-org-invite.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
{% from "components/form.html" import form_wrapper %}

{% block per_page_title %}
Create an account
Create a profile
{% endblock %}

{% block maincolumn_content %}

<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
{{ govuk_page_header("Create an account") }}
<p class="govuk-body">Your account will be created with this email: {{invited_org_user.email_address}}</p>
{{ govuk_page_header("Create a profile") }}
<p class="govuk-body">You will sign in to Notify with this email address: {{invited_org_user.email_address}}</p>
{% call form_wrapper() %}
{{ form.name(param_extensions={"classes": "govuk-!-width-three-quarters"}) }}
<div class="extra-tracking">
Expand Down
6 changes: 3 additions & 3 deletions app/templates/views/register.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@

<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<h1 class="heading-large">Create an account</h1>
<h1 class="heading-large">Create a profile</h1>
{% call form_wrapper(autocomplete=True) %}
{{ form.name(param_extensions={"classes": "govuk-!-width-three-quarters"}) }}
{{ form.email_address(
param_extensions={
"hint": {"text": "Must be from a public sector organisation"},
"hint": {"text": "Must be a public sector organisation email address"},
"classes": "govuk-!-width-three-quarters",
"autocomplete": "email"
},
Expand All @@ -31,7 +31,7 @@ <h1 class="heading-large">Create an account</h1>
{{form.auth_type}}
{{ page_footer("Continue") }}
{% endcall %}
<p class="bottom-gutter">When you create an account you accept our <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.terms_of_use') }}">terms of use</a>.</p>
<p class="bottom-gutter">When you sign up to Notify you accept our <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.terms_of_use') }}">terms of use</a>.</p>
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion app/templates/views/registration-continue.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@

<h1 class="heading-large">Check your email​</h1>
<p class="govuk-body">An email has been sent to {{ session['user_details']['email'] }}.</p>
<p class="govuk-body">Click the link in the email to continue your registration.</p>
<p class="govuk-body">Click the link in the email to finish setting up your profile.</p>

{% endblock %}
2 changes: 1 addition & 1 deletion app/templates/views/resend-email-verification.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@

<h1 class="heading-large">Check your email</h1>
<p class="govuk-body">A new confirmation email has been sent to {{ email }}</p>
<p class="govuk-body">Click the link in the email to continue your registration.</p>
<p class="govuk-body">Click the link in the email to finish setting up your profile.</p>

{% endblock %}
2 changes: 1 addition & 1 deletion app/templates/views/service-settings/set-auth-type.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</p>
<p class="govuk-body">
Team members can also sign in using a link that’s sent in an email.
For security, you should only do this if they access their email accounts using:
For security, you should only do this if they access their inbox using:
</p>
<ul class="govuk-list govuk-list--bullet">
<li>a work-issued device</li>
Expand Down
4 changes: 2 additions & 2 deletions app/templates/views/signedout.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ <h1>
<div class="button-container">
{{ govukButton({
"element": "a",
"text": "Create an account",
"text": "Create a profile",
"classes": "product-page-button button-container__button govuk-button--inverse govuk-!-margin-right-3",
"href": url_for('main.register' )
}) }}
or <a class="govuk-link govuk-link--inverse" href="{{ url_for('main.sign_in' )}}">sign in</a> if you’ve used
it before
Notify before
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/views/signin.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
{% else %}
{{ govuk_page_header("Sign in") }}
<p class="govuk-body">
If you do not have an account, you can
If you do not have a profile, you can
<a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.register') }}">create one now</a>.
karlchillmaid marked this conversation as resolved.
Show resolved Hide resolved
</p>
{% endif %}
Expand Down
6 changes: 3 additions & 3 deletions app/templates/views/terms-of-use.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h1 class="heading-large">Terms of use</h1>
</p>

<p class="govuk-body">
You accept our terms of use when you create an account.
You accept our terms of use when you sign up to Notify.
</p>

<p class="govuk-body">
Expand Down Expand Up @@ -68,7 +68,7 @@ <h3 class="heading-small" id="signing-in-to-notify">Signing in to Notify</h3>

<ol class="govuk-list govuk-list--number">
<li>You must sign in to the Notify website using a work-managed device. We recommend that, as a minimum, your device meets the requirements of the National Cyber Security Centre (NCSC) <a class="govuk-link govuk-link--no-visited-state" href="https://www.ncsc.gov.uk/files/Cyber-Essentials-Requirements-for-Infrastructure-v3-1-April-2023.pdf">Cyber Essentials Scheme</a>. If possible, your device should use a protective Domain Name System (DNS) service, for example the <a class="govuk-link govuk-link--no-visited-state" href="https://www.ncsc.gov.uk/information/pdns">NCSC’s PDNS</a>.</li>
<li>You must sign in to Notify using a work email address. Your mailbox should be protected by <a class="govuk-link govuk-link--no-visited-state" href="https://www.ncsc.gov.uk/guidance/multi-factor-authentication-online-services">multi-factor authentication</a> (MFA). When you open emails sent by Notify, you should only do this from a work-managed device.</li>
<li>You must sign in to Notify using a work email address. Your inbox should be protected by <a class="govuk-link govuk-link--no-visited-state" href="https://www.ncsc.gov.uk/guidance/multi-factor-authentication-online-services">multi-factor authentication</a> (MFA). When you open emails sent by Notify, you should only do this from a work-managed device.</li>
<li>Take reasonable care to protect your sign-in details. Choose <a class="govuk-link govuk-link--no-visited-state" href="https://www.ncsc.gov.uk/blog-post/three-random-words-or-thinkrandom-0">a strong and unique password</a>. Never share your password with anyone, including other members of your team.</li>
<li>Remove team members promptly if they should no longer have access to Notify.</li>
</ol>
Expand Down Expand Up @@ -98,7 +98,7 @@ <h2 class="heading-medium" id="what-notify-will-do">What GOV.UK Notify will do</

<h2 class="heading-medium" id="leaving-notify">Leaving Notify</h2>

<p class="govuk-body">You can <a class="govuk-link govuk-link--no-visited-state" href="{{url_for('main.support')}}">contact us</a> at any time to close your account.</p>
<p class="govuk-body">You can <a class="govuk-link govuk-link--no-visited-state" href="{{url_for('main.support')}}">contact us</a> at any time to delete your profile.</p>

<p class="govuk-body">Check our privacy notice to find out <a class="govuk-link govuk-link--no-visited-state" href="{{url_for('main.privacy')}}#how-long-we-keep-your-data">how long we keep your personal data</a>.</p>

Expand Down
2 changes: 1 addition & 1 deletion app/templates/views/verification-not-received.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h2 class="heading-medium">If your mobile number has changed</h2>
<p class="govuk-body">You’ll need to:</p>
<ul class="govuk-list govuk-list--bullet">
<li>find a member of your team who has permission to manage settings, team and usage</li>
<li>ask them to change the mobile number for your account</li>
<li>ask them to change the mobile number for your profile</li>
<li>select <span class="govuk-body govuk-!-font-weight-bold">Resend security code</span></li>
</ul>
</div>
Expand Down