Merge pull request #1315 from alphagov/feature

Adding first pass of the new features page

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 features():
+    return render_template('views/features.html')

app/templates/admin_template.html

@@ -60,6 +60,12 @@
               <a href="{{ url_for('main.sign_out')}}">Sign out</a>
             </li>
           {% else %}
+            <li>
+              <a href="{{ url_for('main.features' )}}">Features</a>
+            </li>
+            <li>
+              <a href="{{ url_for('main.pricing' )}}">Pricing</a>
+            </li>
             <li>
               <a href="{{ url_for('main.sign_in' )}}">Sign in</a>
             </li>
@@ -94,12 +100,13 @@
         <div class="column-one-third">
           <h2>About</h2>
           <ul>
+            <li><a href="{{ url_for("main.features") }}">Features</a></li>
+            <li><a href="{{ url_for("main.roadmap") }}">Roadmap</a></li>
             <li><a href="{{ url_for("main.terms") }}">Terms of use</a></li>
             <li><a href="{{ url_for("main.trial_mode") }}">Trial mode</a></li>
             <li><a href="{{ url_for("main.pricing") }}">Pricing</a></li>
             <li><a href="{{ url_for("main.delivery_and_failure") }}">Delivery and failure</a></li>
             <li><a href="https://www.gov.uk/performance/govuk-notify">Performance</a></li>
-            <li><a href="{{ url_for("main.roadmap") }}">Roadmap</a></li>
           </ul>
         </div>
         <div class="column-one-third">

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
+{% endblock %}
+
+{% block maincolumn_content %}
+
+<div class="grid-row">
+  <div class="column-two-thirds">
+    <h1 class="heading-large">Features</h1>
+
+    <p>
+        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 <a href="{{ url_for('main.roadmap') }}">roadmap</a> to see what’s coming up.
+    </p>
+
+    <div class="panel panel-border-wide">
+      <p>
+          You can <a href="{{ url_for('main.index') }}">create yourself a trial account now</a> to see all
+          of these features in action.
+      </p>
+    </div>
+
+    <h2 class="heading-medium">What you can do with Notify</h2>
+      <ul class="list list-bullet">
+        <li>Send emails</li>
+        <li>Send text messages – UK and internationally</li>
+        <li>Receive text messages</li>
+        <li>Send letters</li>
+      </ul>
+
+    <h2 class="heading-medium">What Notify costs</h2>
+      <ul class="list list-bullet">
+        <li>Free for email</li>
+        <li>250,000 free text messages – then 1.58p + VAT</li>
+        <li>Letters from 29p + VAT</li>
+      </ul>
+      <p>
+          See our <a href="{{ url_for('main.pricing') }}">pricing</a> page for more details.
+      </p>
+
+    <h2 class="heading-medium">Managing your message content</h2>
+      <ul class="list list-bullet">
+        <li>Personalise your messages</li>
+        <li>Format emails and letters</li>
+        <li>Choose email and letter branding</li>
+        <li>Specify an email account for replies</li>
+        <li>Specify text message sender name</li>
+      </ul>
+
+    <h2 class="heading-medium">Using Notify</h2>
+      <ul class="list list-bullet">
+        <li>Create and update message templates in real time</li>
+        <li>Preview messages before sending them</li>
+        <li>Schedule when your messages are sent</li>
+        <li>Send individual emails or text messages</li>
+        <li>See the delivery status of emails and text messages</li>
+        <li>Manually upload batch files of recipient data</li>
+        <li>Automate sending with our API</li>
+        <li>Integrate using supported client libraries</li>
+        <li>Use different types of API key for your
+          <a href="{{ url_for('main.integration_testing') }}">integration testing</a></li>
+      </ul>
+
+    <h2 class="heading-medium">Managing your Notify account</h2>
+      <ul class="list list-bullet">
+        <li>Real-time dashboard of activity</li>
+        <li>View usage and reports</li>
+        <li>Manage your team members’ permissions</li>
+      </ul>
+
+{% endblock %}

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 %}
 
 <div class="grid-row">
   <div class="column-two-thirds">
-    <h1 class="heading-large">Roadmap for GOV.UK Notify</h1>
+    <h1 class="heading-large">Roadmap</h1>
 
     <p>
         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 @@
         <li>Publishing design patterns for integration</li>
       </ul>
 
-    <h2 class="heading-medium">August - October 2017</h2>
+    <h2 class="heading-medium">August to October 2017</h2>
       <ul class="list list-bullet">
         <li>Sending letters (available for everyone)</li>
         <li>Sending of pre-compiled letters</li>

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,