diff --git a/app/main/views/pricing.py b/app/main/views/pricing.py index f532737e0..52bc273f3 100644 --- a/app/main/views/pricing.py +++ b/app/main/views/pricing.py @@ -6,7 +6,7 @@ from notifications_utils.international_billing_rates import ( from app.main import main from app.main.forms import SearchByNameForm -from app.main.views.sub_navigation_dictionaries import pricing_nav +from app.main.views.sub_navigation_dictionaries import using_notify_nav CURRENT_SMS_RATE = '1.72' @@ -21,7 +21,7 @@ def pricing(): for cc, country in INTERNATIONAL_BILLING_RATES.items() ], key=lambda x: x[0]), search_form=SearchByNameForm(), - navigation_links=pricing_nav(), + navigation_links=using_notify_nav(), ) @@ -29,7 +29,7 @@ def pricing(): def how_to_pay(): return render_template( 'views/pricing/how-to-pay.html', - navigation_links=pricing_nav(), + navigation_links=using_notify_nav(), ) @@ -39,9 +39,9 @@ def billing_details(): return render_template( 'views/pricing/billing-details.html', billing_details=current_app.config['NOTIFY_BILLING_DETAILS'], - navigation_links=pricing_nav(), + navigation_links=using_notify_nav(), ) return render_template( 'views/pricing/billing-details-signed-out.html', - navigation_links=pricing_nav(), + navigation_links=using_notify_nav(), ) diff --git a/app/main/views/sub_navigation_dictionaries.py b/app/main/views/sub_navigation_dictionaries.py index a86ffcf1f..314f92c63 100644 --- a/app/main/views/sub_navigation_dictionaries.py +++ b/app/main/views/sub_navigation_dictionaries.py @@ -22,10 +22,6 @@ def features_nav(): "name": "Roadmap", "link": "main.roadmap", }, - { - "name": "Who can use Notify", - "link": "main.who_can_use_notify", - }, { "name": "Security", "link": "main.security", @@ -37,29 +33,16 @@ def features_nav(): ] -def pricing_nav(): - return [ - { - "name": "Pricing", - "link": "main.pricing", - }, - { - "name": "How to pay", - "link": "main.how_to_pay", - }, - { - "name": "Billing details", - "link": "main.billing_details", - }, - ] - - def using_notify_nav(): return [ { "name": "Get started", "link": "main.get_started", }, + { + "name": "Pricing", + "link": "main.pricing", + }, { "name": "Trial mode", "link": "main.trial_mode_new", diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index d23a91979..3c6cd9fe2 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -138,20 +138,7 @@ {% endblock %} {% block footer %} - {% set meta_items = [ - { - "href": url_for("main.privacy"), - "text": "Privacy" - }, - { - "href": url_for("main.cookies"), - "text": "Cookies" - }, - { - "href": url_for("main.accessibility_statement"), - "text": "Accessibility statement" - } - ] %} + {% if current_service and current_service.research_mode %} {% set meta_suffix = 'Built by the Technology Transformation Serviceresearch mode' %} @@ -162,28 +149,6 @@ {{ govukFooter({ "classes": "js-footer", "navigation": [ - { - "title": "Support", - "columns": 1, - "items": [ - { - "href": url_for('main.support'), - "text": "Contact support" - }, - { - "href": "https://status.notifications.service.gov.uk", - "text": "System status" - }, - { - "href": url_for('main.performance'), - "text": "Performance data" - }, - { - "href": "https://ukgovernmentdigital.slack.com/messages/C0E1ADVPC", - "text": "Chat to us on Slack" - } - ] - }, { "title": "About Notify", "columns": 1, @@ -196,10 +161,6 @@ "href": url_for("main.roadmap"), "text": "Roadmap" }, - { - "href": url_for("main.who_can_use_notify"), - "text": "Who can use Notify", - }, { "href": url_for("main.security"), "text": "Security" @@ -208,28 +169,6 @@ "href": url_for("main.terms"), "text": "Terms of use" }, - { - "href": "https://gds.blog.gov.uk/category/gov-uk-notify/", - "text": "Blog" - } - ] - }, - { - "title": "Pricing and payment", - "columns": 1, - "items": [ - { - "href": url_for("main.pricing"), - "text": "Pricing" - }, - { - "href": url_for("main.how_to_pay"), - "text": "How to pay" - }, - { - "href": url_for("main.billing_details"), - "text": "Billing details" - } ] }, { @@ -240,6 +179,10 @@ "href": url_for("main.get_started"), "text": "Get started" }, + { + "href": url_for("main.pricing"), + "text": "Pricing" + }, { "href": url_for("main.trial_mode_new"), "text": "Trial mode" @@ -257,7 +200,17 @@ "text": "API documentation" } ] - } + }, + { + "title": "Support", + "columns": 1, + "items": [ + { + "href": url_for('main.support'), + "text": "Contact us" + }, + ] + }, ], "meta": { "items": meta_items, diff --git a/app/templates/vendor/govuk-frontend/components/footer/template.njk b/app/templates/vendor/govuk-frontend/components/footer/template.njk index 1e797312a..7c6439071 100644 --- a/app/templates/vendor/govuk-frontend/components/footer/template.njk +++ b/app/templates/vendor/govuk-frontend/components/footer/template.njk @@ -50,37 +50,6 @@ {% endif %} {% endif %} - {#- The SVG needs `focusable="false"` so that Internet Explorer does not - treat it as an interactive element - without this it will be - 'focusable' when using the keyboard to navigate. #} - - - -
diff --git a/app/templates/views/features.html b/app/templates/views/features.html index 0f3352f54..5024f51fa 100644 --- a/app/templates/views/features.html +++ b/app/templates/views/features.html @@ -9,7 +9,7 @@ {% block content_column_content %}If you work for central government, a local authority or the NHS, you can use US Notify to keep your users updated.
+If you work for the federal government, you can use US Notify to keep your users updated.
Notify makes it easy to create, customise and send:
Notify uses two-factor authentication (2FA) to keep your account secure. When you sign in, we’ll send a unique one-time code to your phone and ask you to enter it before we let you use your account.
Read more about security. -
The US Notify Service Manual has advice on:
+The UK Notify Service Manual has additional advice on:
- US Notify is available to: -
-- If you work for one of these organisations but get an error when you try to create an account, contact support. -
- -- If you’re doing work for a public sector organisation you can use US Notify. -
-- 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. -
- -- Notify is not currently available to charities. -
- -- The US Notify service is only for people who work in the government - or other public sector organisations. -
-- Find government services and information on usa.gov. -
- -{% endblock %} diff --git a/app/templates/views/pricing/how-to-pay.html b/app/templates/views/pricing/how-to-pay.html index afc8b6c2e..9598ba50e 100644 --- a/app/templates/views/pricing/how-to-pay.html +++ b/app/templates/views/pricing/how-to-pay.html @@ -9,7 +9,7 @@ {{ page_header('How to pay') }} -+ {% endblock %} diff --git a/app/templates/views/security.html b/app/templates/views/security.html index 7f27f353a..02548ebad 100644 --- a/app/templates/views/security.html +++ b/app/templates/views/security.html @@ -23,22 +23,22 @@
Any recipient data you upload is only held for 7 days.
If you send a file by email, the file will be available for the recipient to download for 18 months.
-The Cabinet Office acts as data processor for Notify. Your organisation is the data controller.
-Other technical security controls on Notify include:
+Some messages include sensitive information like security codes or password reset links.
@@ -54,16 +54,16 @@If signing in with a text message is a problem for your team, contact us to find out about using an email link instead.
-US Notify provides 24-hour online support.
+We are available at tts-benefits-studio@gsa.gov.
- {% call form_wrapper() %} +You can expect a response within 1 business day.
+ + + + {% endblock %}