diff --git a/app/assets/stylesheets/_grids.scss b/app/assets/stylesheets/_grids.scss index ec083e809..f0008d51e 100644 --- a/app/assets/stylesheets/_grids.scss +++ b/app/assets/stylesheets/_grids.scss @@ -30,3 +30,19 @@ padding-left: 2px; padding-right: 2px; } + +.global-cookie-message { + p { + @extend %site-width-container; + } +} + +.footer-nav { + @include copy-16; + margin-bottom: $gutter-two-thirds; + + a { + display: inline-block; + margin-right: $gutter-half; + } +} diff --git a/app/assets/stylesheets/app.scss b/app/assets/stylesheets/app.scss index d7eeacb62..d2d7fb838 100644 --- a/app/assets/stylesheets/app.scss +++ b/app/assets/stylesheets/app.scss @@ -80,3 +80,11 @@ a { } } + +td { + vertical-align: top; +} + +.heading-xlarge { + margin-bottom: 20px; +} diff --git a/app/assets/stylesheets/components/banner.scss b/app/assets/stylesheets/components/banner.scss index 36ebad07d..540ce1e38 100644 --- a/app/assets/stylesheets/components/banner.scss +++ b/app/assets/stylesheets/components/banner.scss @@ -112,7 +112,7 @@ margin-top: $gutter; .heading-medium { - margin-top: 0; + margin: 0 0 10px 0; } a { @@ -129,4 +129,14 @@ } + .big-number { + + margin-top: 10px; + + &-label { + padding-bottom: 0; + } + + } + } diff --git a/app/main/views/index.py b/app/main/views/index.py index 5f7d700df..47780a1e7 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -16,3 +16,13 @@ def index(): @login_required def verify_mobile(): return render_template('views/verify-mobile.html') + + +@main.route('/cookies') +def cookies(): + return render_template('views/cookies.html') + + +@main.route('/help') +def help(): + return render_template('views/help.html') diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index bd1eba398..666add0bb 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -24,6 +24,10 @@ {% endblock %} {% block cookie_message %} +

+ GOV.UK Notify uses cookies to make the site simpler. + Find out more about cookies +

{% endblock %} {% block inside_header %} @@ -68,6 +72,15 @@ {% endblock %} +{% block footer_support_links %} + +{% endblock %} + {% block body_end %} {% endblock %} diff --git a/app/templates/views/cookies.html b/app/templates/views/cookies.html new file mode 100644 index 000000000..6337c1f77 --- /dev/null +++ b/app/templates/views/cookies.html @@ -0,0 +1,81 @@ +{% extends "withoutnav_template.html" %} + +{% block page_title %} + Cookies – GOV.UK Notify +{% endblock %} + +{% block maincolumn_content %} + +
+
+

Cookies

+

+ GOV.UK Notify puts small files (known as ‘cookies’) + on to your computer. +

+

These cookies are used to remember you once you’ve logged in

+

+ Find out how to manage cookies. +

+ +

Session cookies

+

+ We store session cookies on your computer to help keep your information + secure while you use the service. +

+ + + + + + + + + + + + + + + +
NamePurposeExpires
+ notify_admin_session + + Used to keep you logged in + + 1 hour +
+ +

Introductory message cookie

+

+ When you first use the service, you may see a pop-up ‘welcome’ message. + Once you’ve seen the message, we store a cookie on your computer so it + knows not to show it again. +

+ + + + + + + + + + + + + + + +
NamePurposeExpires
+ seen_cookie_message + + Saves a message to let us know that you have seen our cookie + message + + 1 month +
+
+
+ +{% endblock %} diff --git a/app/templates/views/dashboard/trial-mode-banner.html b/app/templates/views/dashboard/trial-mode-banner.html index 1ad62066e..3a3c34829 100644 --- a/app/templates/views/dashboard/trial-mode-banner.html +++ b/app/templates/views/dashboard/trial-mode-banner.html @@ -3,12 +3,13 @@ {% call banner_wrapper(type="mode") %} +

Trial mode

-

Trial mode

We’ll only deliver messages to you and members of your team - +
+ Find out more

diff --git a/app/templates/views/help.html b/app/templates/views/help.html new file mode 100644 index 000000000..72ef617b3 --- /dev/null +++ b/app/templates/views/help.html @@ -0,0 +1,79 @@ +{% extends "withoutnav_template.html" %} + +{% block page_title %} + Cookies – GOV.UK Notify +{% endblock %} + +{% block maincolumn_content %} + +
+
+

Help

+ +

Trial mode

+ +

+ When you create a service on GOV.UK Notify, you start off in trial + mode. This means: +

+
    +
  • + you can only send messages to yourself and your team members +
    • +
  • + you can only send 50 messages per day +
    • +
+ +

+ Anyone working in central government can create an account on + GOV.UK Notify and try it out. So it’s important that you start off + with some restrictions in place. +

+ +

To remove these restrictions

+ +

+ You need to request to go live: +

+
    +
  • + You’ll need to agree to our terms of use +
    • +
  • + If you plan to send more than 250,000 text messages per year, you’ll + need to agree to pay for what you use – take a look at our pricing +
    • +
  • + We’ll check your templates to make sure they’re consistent with our + design patterns, style guide and information security principles +
    • +
+ +

+ All other aspects of GOV.UK Notify are exactly the same +

+ +

+ You can still: +

+
    +
  • + upload a batch of recipients +
    • +
  • + do an API integration +
    • +
+ +

+ We’ll send the messages you have permission to send. The messages you + don’t have permission to send will still be listed on your + GOV.UK Notify dashboard but won’t actually get sent. This means you + can check that everything is fully working without accidentally sending + hundreds of text messages or emails. +

+
+
+ +{% endblock %} diff --git a/tests/app/main/views/test_accept_invite.py b/tests/app/main/views/test_accept_invite.py index 2cf6f3198..cb2133f38 100644 --- a/tests/app/main/views/test_accept_invite.py +++ b/tests/app/main/views/test_accept_invite.py @@ -175,7 +175,7 @@ def test_new_user_accept_invite_calls_api_and_views_registration_page(app_, page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') assert page.h1.string.strip() == 'Create an account' - email_in_page = page.find('p') + email_in_page = page.find('main').find('p') assert email_in_page.text.strip() == 'Your account will be created with this email: invited_user@test.gov.uk' # noqa form = page.find('form')