From 11215a0c16265a32311260908ad12ca5e67ebeb3 Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Wed, 14 Jun 2017 16:05:20 +0100 Subject: [PATCH 1/7] Adding route for new features page --- app/main/views/index.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/main/views/index.py b/app/main/views/index.py index 70b09a963..e9979349d 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -110,3 +110,8 @@ def integration_testing(): @main.route('/roadmap') def roadmap(): return render_template('views/roadmap.html') + + +@main.route('/features') +def roadmap(): + return render_template('views/features.html') From b466b266dfbcf198701b7dc656fef92de760024d Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Wed, 14 Jun 2017 16:07:34 +0100 Subject: [PATCH 2/7] Adding test for routing to features page --- tests/app/main/views/test_index.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/app/main/views/test_index.py b/tests/app/main/views/test_index.py index 31315e836..8c1a78c0d 100644 --- a/tests/app/main/views/test_index.py +++ b/tests/app/main/views/test_index.py @@ -17,7 +17,7 @@ def test_logged_in_user_redirects_to_choose_service( @pytest.mark.parametrize('view', [ - 'cookies', 'trial_mode', 'pricing', 'terms', 'delivery_and_failure', 'integration_testing', 'roadmap' + 'cookies', 'trial_mode', 'pricing', 'terms', 'delivery_and_failure', 'integration_testing', 'roadmap', 'features' ]) def test_static_pages( client, From 7c5873c5b00cc64f018f9ab6ff4c56c868127055 Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Wed, 14 Jun 2017 16:14:16 +0100 Subject: [PATCH 3/7] Adding features to the admin template Bumped features and pricing to the banner for non logged in users too. --- app/templates/admin_template.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index 5bd9868ad..6b89e06de 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -61,6 +61,8 @@ {% else %}
  • + Features + Pricing Sign in
    • {% endif %} @@ -94,6 +96,7 @@

    About

      +
    • Features
    • Terms of use
    • Trial mode
    • Pricing
      • From 314e3690ca8644bfc9a1e1399deccf2da6b433e0 Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Wed, 14 Jun 2017 16:18:36 +0100 Subject: [PATCH 4/7] Moving roadmap next to features in the footer --- app/templates/admin_template.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index 6b89e06de..c67ba7df4 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -97,12 +97,12 @@

      About

    From b999378251c0fa1ab11fb0a6a58c20dc7d55b7da Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Wed, 14 Jun 2017 16:41:52 +0100 Subject: [PATCH 5/7] New features page --- app/templates/views/features.html | 74 +++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 app/templates/views/features.html diff --git a/app/templates/views/features.html b/app/templates/views/features.html new file mode 100644 index 000000000..0a2e91592 --- /dev/null +++ b/app/templates/views/features.html @@ -0,0 +1,74 @@ +{% from "components/table.html" import mapping_table, row, text_field, edit_field, field %} +{% extends "withoutnav_template.html" %} + +{% block per_page_title %} + Features of GOV.UK Notify +{% endblock %} + +{% block maincolumn_content %} + +
    +
    +

    Features

    + +

    + Here’s a list of what you can do with GOV.UK Notify. We’re adding new features all the time, + so keep an eye on our roadmap to see what’s coming up. +

    + +
    +

    + You can create yourself a trial account now to see all + of these features in action. +

    +
    + +

    What you can do with Notify

    +
      +
    • Send emails
      • +
    • Send text messages – UK and internationally
      • +
    • Receive text messages
      • +
    • Send letters
      • +
    + +

    What Notify costs

    +
      +
    • Free for email
      • +
    • 250,000 free text messages – then 1.58p + VAT
      • +
    • Letters from 29p + VAT
      • +
    +

    + See our pricing page for more details. +

    + +

    Manage your message content

    +
      +
    • Personalise your messages
      • +
    • Format emails and letters
      • +
    • Choose email and letter branding
      • +
    • Specify an email account for replies
      • +
    • Specify text message sender name
      • +
    + +

    Using Notify

    +
      +
    • Create and update message templates in real time
      • +
    • Preview messages before sending them
      • +
    • Schedule when your messages are sent
      • +
    • Send individual emails or text messages
      • +
    • See the delivery status of emails and text messages
      • +
    • Manually upload batch files of recipient data
      • +
    • Automate sending with our API
      • +
    • Integrate using supported client libraries
      • +
    • Use different types of API key for your + integration testing
      • +
    + +

    Managing your Notify account

    +
      +
    • Real-time dashboard of activity
      • +
    • View usage and reports
      • +
    • Manage your team members permissions
      • +
    + +{% endblock %} From 86b4a27ca3f7ce58c8c422e95db079f4406dec4f Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Wed, 14 Jun 2017 16:53:16 +0100 Subject: [PATCH 6/7] Fix the problems --- app/main/views/index.py | 2 +- app/templates/admin_template.html | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/main/views/index.py b/app/main/views/index.py index e9979349d..23f03fff6 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -113,5 +113,5 @@ def roadmap(): @main.route('/features') -def roadmap(): +def features(): return render_template('views/features.html') diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index c67ba7df4..cd00e56a2 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -62,7 +62,11 @@ {% else %}
  • Features - Pricing +
    • +
  • + Pricing +
    • +
  • Sign in
    • {% endif %} From f6f05a384d7479d6a8952b087c77544f43ecaf41 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Wed, 14 Jun 2017 17:01:16 +0100 Subject: [PATCH 7/7] Content fixes --- app/templates/views/features.html | 12 ++++++------ app/templates/views/roadmap.html | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/templates/views/features.html b/app/templates/views/features.html index 0a2e91592..aee8b7a7b 100644 --- a/app/templates/views/features.html +++ b/app/templates/views/features.html @@ -2,7 +2,7 @@ {% extends "withoutnav_template.html" %} {% block per_page_title %} - Features of GOV.UK Notify + Features {% endblock %} {% block maincolumn_content %} @@ -12,13 +12,13 @@

    Features

    - Here’s a list of what you can do with GOV.UK Notify. We’re adding new features all the time, + Here’s a list of what you can do with GOV.UK Notify. We’re adding new features all the time, so keep an eye on our roadmap to see what’s coming up.

    - You can create yourself a trial account now to see all + You can create yourself a trial account now to see all of these features in action.

    @@ -41,7 +41,7 @@ See our pricing page for more details.

    -

    Manage your message content

    +

    Managing your message content

    • Personalise your messages
    • Format emails and letters
      • @@ -60,7 +60,7 @@
    • Manually upload batch files of recipient data
    • Automate sending with our API
    • Integrate using supported client libraries
      • -
    • Use different types of API key for your +
    • Use different types of API key for your integration testing
    @@ -68,7 +68,7 @@
    • Real-time dashboard of activity
    • View usage and reports
      • -
    • Manage your team members permissions
      • +
    • Manage your team members’ permissions
    {% endblock %} diff --git a/app/templates/views/roadmap.html b/app/templates/views/roadmap.html index b730ca2eb..532bffedc 100644 --- a/app/templates/views/roadmap.html +++ b/app/templates/views/roadmap.html @@ -2,14 +2,14 @@ {% extends "withoutnav_template.html" %} {% block per_page_title %} - Roadmap for GOV.UK Notify + Roadmap {% endblock %} {% block maincolumn_content %}
    -

    Roadmap for GOV.UK Notify

    +

    Roadmap

    Here’s a list of the new functionality we’re planning to offer through GOV.UK Notify over the next 6 to 9 months. @@ -43,7 +43,7 @@

  • Publishing design patterns for integration
    • -

    August - October 2017

    +

    August to October 2017

    • Sending letters (available for everyone)
    • Sending of pre-compiled letters