streamline navs & menus

2026-08-04 13:41:38 -04:00 · 2022-11-01 15:27:29 -04:00
parent a2f5bd2616
commit 14a8afee12
10 changed files with 52 additions and 195 deletions
--- 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(),
    )
--- 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",
--- 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 <a href="https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services/tts-solutions" class="govuk-footer__link">Technology Transformation Service</a><span id="research-mode" class="research-mode">research mode</span>' %}
@@ -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,
--- a/app/templates/vendor/govuk-frontend/components/footer/template.njk
+++ b/app/templates/vendor/govuk-frontend/components/footer/template.njk
@@ -50,37 +50,6 @@
            </div>
          {% 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. #}
-        <svg
-          role="presentation"
-          focusable="false"
-          class="govuk-footer__licence-logo"
-          xmlns="http://www.w3.org/2000/svg"
-          viewbox="0 0 483.2 195.7"
-          height="17"
-          width="41"
-        >
-          <path
-            fill="currentColor"
-            d="M421.5 142.8V.1l-50.7 32.3v161.1h112.4v-50.7zm-122.3-9.6A47.12 47.12 0 0 1 221 97.8c0-26 21.1-47.1 47.1-47.1 16.7 0 31.4 8.7 39.7 21.8l42.7-27.2A97.63 97.63 0 0 0 268.1 0c-36.5 0-68.3 20.1-85.1 49.7A98 98 0 0 0 97.8 0C43.9 0 0 43.9 0 97.8s43.9 97.8 97.8 97.8c36.5 0 68.3-20.1 85.1-49.7a97.76 97.76 0 0 0 149.6 25.4l19.4 22.2h3v-87.8h-80l24.3 27.5zM97.8 145c-26 0-47.1-21.1-47.1-47.1s21.1-47.1 47.1-47.1 47.2 21 47.2 47S123.8 145 97.8 145"
-          />
-        </svg>
-        <span class="govuk-footer__licence-description">
-          All content is available under the
-          <a
-            class="govuk-footer__link"
-            href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/"
-            rel="license"
-          >Open Government Licence v3.0</a>, except where otherwise stated
-        </span>
-      </div>
-      <div class="govuk-footer__meta-item">
-        <a
-          class="govuk-footer__link govuk-footer__copyright-logo"
-          href="https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/"
-        >© Crown copyright</a>
      </div>
    </div>
  </div>
--- a/app/templates/views/features.html
+++ b/app/templates/views/features.html
@@ -9,7 +9,7 @@
 {% block content_column_content %}

 <h1 class="heading-large">Features</h1>
-<p class="govuk-body">If you work for central government, a local authority or the NHS, you can use US Notify to keep your users updated.</p>
+<p class="govuk-body">If you work for the federal government, you can use US Notify to keep your users updated.</p>
 <p class="govuk-body">Notify makes it easy to create, customise and send:</p>
 <ul class="list list-bullet">
  <li><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.features_email') }}">emails</a></li>
@@ -70,8 +70,8 @@
 <p class="govuk-body">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.</p>
 <p class="govuk-body">Read more about <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.security') }}">security</a>.

-<h2 class="heading-medium" id="support">Support</h2>
+<!-- <h2 class="heading-medium" id="support">Support</h2>
 <p class="govuk-body">Notify provides 24-hour online support. If you have an emergency outside office hours, we’ll reply within 30 minutes.</p>
-<p class="govuk-body">Find out more about <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.support') }}">support</a>.</p>
+<p class="govuk-body">Find out more about <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.support') }}">support</a>.</p> -->

 {% endblock %}
--- a/app/templates/views/guidance/index.html
+++ b/app/templates/views/guidance/index.html
@@ -23,7 +23,7 @@

  <h2 class="heading-medium">More information</h2>

-  <p class="govuk-body">The US Notify Service Manual has advice on:</p>
+  <p class="govuk-body">The UK Notify Service Manual has additional advice on:</p>

  <ul class="list list-bullet">
    <li><a class="govuk-link govuk-link--no-visited-state" href="https://www.gov.uk/service-manual/design/sending-emails-and-text-messages">planning and writing text messages and emails</a></li>
--- a/app/templates/views/guidance/who-can-use-notify.html
+++ b/app/templates/views/guidance/who-can-use-notify.html
@@ -1,51 +0,0 @@
-{% extends "content_template.html" %}
-{% from "components/page-header.html" import page_header %}
-
-{% block per_page_title %}
-  Who can use Notify
-{% endblock %}
-
-{% block content_column_content %}
-
-  {{ page_header(
-    'Who can use Notify'
-  ) }}
-
-  <p class="govuk-body">
-    US Notify is available to:
-  </p>
-  <ul class="list list-bullet">
-    <li>central government departments</li>
-    <li>emergency services</li>
-    <li>local authorities</li>
-    <li>the armed forces</li>
-    <li>the NHS and GP practices</li>
-    <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>.
-  </p>
-
-  <h2 class="govuk-heading-m" id="suppliers">Suppliers</h2>
-  <p class="govuk-body">
-    If you’re doing work for a public sector organisation you can use US&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.
-  </p>
-
-  <h2 class="govuk-heading-m" id="charities">Charities</h2>
-  <p class="govuk-body">
-    Notify is not currently available to charities.
-  </p>
-
-  <h2 class="govuk-heading-m" id="public">Members of the public</h2>
-  <p class="govuk-body">
-    The US Notify service is only for people who work in the government
-    or other public sector organisations.
-  </p>
-  <p class="govuk-body">
-    <a class="govuk-link govuk-link--no-visited-state" href="https://www.gov.uk">Find government services and information on usa.gov</a>.
-  </p>
-
-{% endblock %}
--- 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') }}

-    <p class="govuk-body">
+    <!-- <p class="govuk-body">
      If you use US Notify to send text messages or letters, you may need to send us a <a class="govuk-link govuk-link--no-visited-state" href="#purchase-orders">purchase order</a>.
    </p>

@@ -60,6 +60,6 @@

    <p class="govuk-body">
      Your organisation may need to <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.billing_details') }}">add the Cabinet Office as a supplier</a> before you can raise a <abbr title="purchase order">PO</abbr>.
-    </p>
+    </p> -->

 {% endblock %}
--- a/app/templates/views/security.html
+++ b/app/templates/views/security.html
@@ -23,22 +23,22 @@
  </ul>
  <p class="govuk-body">Any recipient data you upload is only held for 7 days.</p>
  <p class="govuk-body">If you <a class="govuk-link govuk-link--no-visited-state" href="/features/email#send-files">send a file by email</a>, the file will be available for the recipient to download for 18 months.</p>
-  <p class="govuk-body">The Cabinet Office acts as data processor for Notify. Your organisation is the data controller.</p>
-  <h3 class="heading-small">Data Protection Act</h3>
+  <!-- <p class="govuk-body">The Cabinet Office acts as data processor for Notify. Your organisation is the data controller.</p> -->
+  <!-- <h3 class="heading-small">Data Protection Act</h3>
  <p class="govuk-body">Notify complies with data protection law. To make sure it stays compliant, there are regular legal reviews of the service’s:</p>
  <ul class="list list-bullet">
    <li>privacy policy</li>
    <li>terms of use</li>
    <li>approach to data sharing</li>
-  </ul>
+  </ul> -->

  <h2 class="heading-medium" id="technical-security">Technical security</h2>
-  <p class="govuk-body">Other technical security controls on Notify include:</p>
+  <!-- <p class="govuk-body">Other technical security controls on Notify include:</p>
  <ul class="list list-bullet">
    <li>compliance with National Cyber Security Centre (NCSC) Cloud Security Principles</li>
    <li>protective monitoring to record activity, and raise alerts about any suspicious activity</li>
    <li>using JSON Web Tokens, to avoid sending API keys when your service talks to Notify</li>
-  </ul>
+  </ul> -->

  <h3 class="heading-small">Protect sensitive information</h3>
  <p class="govuk-body">Some messages include sensitive information like security codes or password reset links.</p>
@@ -54,16 +54,16 @@
  </ul>
  <p class="govuk-body">If signing in with a text message is a problem for your team, <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.support') }}">contact us</a> to find out about using an email link instead.</p>

-  <h2 class="heading-medium" id="information-risk-management">Information risk management</h2>
+  <!-- <h2 class="heading-medium" id="information-risk-management">Information risk management</h2>
  <p class="govuk-body">Our approach to information risk management follows NCSC guidance. It assesses:</p>
  <ul class="list list-bullet">
    <li>how Notify is built</li>
    <li>the infrastructure Notify is built upon</li>
    <li>support for the Notify service</li>
  </ul>
-  <p class="govuk-body">This approach also applies to the service providers Notify uses to send messages.</p>
+  <p class="govuk-body">This approach also applies to the service providers Notify uses to send messages.</p> -->

-  <h2 class="heading-medium" id="how-we-manage-risk">How we manage risks on Notify</h2>
+  <!-- <h2 class="heading-medium" id="how-we-manage-risk">How we manage risks on Notify</h2>
  <p class="govuk-body">Things we do to manage risks on Notify include:</p>
  <ul class="list list-bullet">
    <li>formal risk assessments based on <a class="govuk-link govuk-link--no-visited-state" href="http://www.iso.org/iso/catalogue_detail?csnumber=56742">ISO 27005:2011</a> and National Cyber Security Centre guidance</li>
@@ -71,15 +71,15 @@
    <li>residual risk statement preparation and active management of the risk treatment plan</li>
    <li>regular updates to the Privacy Impact Assessment</li>
    <li>security impact assessments</li>
-  </ul>
+  </ul> -->

-  <h2 class="heading-medium" id="cabinet-office-approval">Cabinet Office approval</h2>
+  <!-- <h2 class="heading-medium" id="cabinet-office-approval">Cabinet Office approval</h2>
  <p class="govuk-body">Notify has been assessed and approved by the Cabinet Office Senior Information Risk Officer (SIRO). The SIRO checks this approval once a year.</p>
  <p class="govuk-body">Notify also has approval from the Office of the Government’s SIRO to host data within the EEA.</p>

  <h2 class="heading-medium" id="classifications-and-security-vetting">Classifications and security vetting</h2>
  <p class="govuk-body">You can use Notify to send messages classified as ‘OFFICIAL’ or ‘OFFICIAL-SENSITIVE’ under the <a class="govuk-link govuk-link--no-visited-state" href="https://www.gov.uk/government/publications/government-security-classifications">Government Security Classifications</a> policy.</p>
  <p class="govuk-body">Notify does not process data classified as ‘SECRET’ or ‘TOP SECRET’.</p>
-  <p class="govuk-body">The Notify team has Security Check (SC) level clearance from <a class="govuk-link govuk-link--no-visited-state" href="https://www.gov.uk/government/organisations/united-kingdom-security-vetting">United Kingdom Security Vetting</a> (UKSV).</p>
+  <p class="govuk-body">The Notify team has Security Check (SC) level clearance from <a class="govuk-link govuk-link--no-visited-state" href="https://www.gov.uk/government/organisations/united-kingdom-security-vetting">United Kingdom Security Vetting</a> (UKSV).</p> -->

 {% endblock %}
--- a/app/templates/views/support/index.html
+++ b/app/templates/views/support/index.html
@@ -3,15 +3,20 @@
 {% from "components/form.html" import form_wrapper %}

 {% block per_page_title %}
-  Support
+  Contact us
 {% endblock %}

 {% block maincolumn_content %}

-  <h1 class="heading-large">Support</h1>
-  <p class="govuk-body">US Notify provides 24-hour online support.</p>
+  <h1 class="heading-large">Contact us</h1>
+  
+  <p class="govuk-body">We are available at <a href="mailto:tts-benefits-studio@gsa.gov">tts-benefits-studio@gsa.gov</a>.</p>

-  {% call form_wrapper() %}
+  <p class="govuk-body">You can expect a response within 1 business day.</p>
+  
+  <!-- <p class="govuk-body">US Notify provides 24-hour online support.</p> -->
+
+  <!-- {% call form_wrapper() %}
    {% if current_user.is_authenticated %}
      {{ form.support_type }}
    {% else %}
@@ -23,8 +28,6 @@
    {{ page_footer('Continue') }}
  {% endcall %}

-  <p class="govuk-body">You can also <a class="govuk-link govuk-link--no-visited-state" href="https://ukgovernmentdigital.slack.com/messages/C0E1ADVPC">contact us on Slack</a>.</p>
-
 <div class="govuk-grid-row">
  <div class="govuk-grid-column-two-thirds">
    <h2 class="heading-medium">Office hours</h2>
@@ -42,6 +45,6 @@
      <li>a 500 response code appears when you try to send messages using the API</li>
    </ul>
  </div>
-</div>
+</div> -->

 {% endblock %}