Merge pull request #2858 from alphagov/features-content-updates

Update features and footer content and answer some common support questions.

app/main/views/index.py

@@ -65,11 +65,6 @@ def privacy():
     return render_template('views/privacy.html')
 
 
-@main.route('/trial-mode')
-def trial_mode():
-    return redirect(url_for('.using_notify') + '#trial-mode', 301)
-
-
 @main.route('/pricing')
 def pricing():
     return render_template(
@@ -85,7 +80,7 @@ def pricing():
 
 @main.route('/delivery-and-failure')
 def delivery_and_failure():
-    return redirect(url_for('.using_notify') + '#messagedeliveryandfailure', 301)
+    return redirect(url_for('.message_status'), 301)
 
 
 @main.route('/design-patterns-content-guidance')
@@ -240,6 +235,30 @@ def roadmap():
     )
 
 
+@main.route('/features/email')
+def features_email():
+    return render_template(
+        'views/features/emails.html',
+        navigation_links=features_nav()
+    )
+
+
+@main.route('/features/sms')
+def features_sms():
+    return render_template(
+        'views/features/text-messages.html',
+        navigation_links=features_nav()
+    )
+
+
+@main.route('/features/letters')
+def features_letters():
+    return render_template(
+        'views/features/letters.html',
+        navigation_links=features_nav()
+    )
+
+
 @main.route('/features/security', endpoint='security')
 def security():
     return render_template(
@@ -261,6 +280,27 @@ def using_notify():
     return render_template(
         'views/using-notify.html',
         navigation_links=features_nav()
+    ), 410
+
+
+@main.route('/features/messages-status')
+def message_status():
+    return render_template(
+        'views/message-status.html',
+        navigation_links=features_nav()
+    )
+
+
+@main.route('/trial-mode')
+def trial_mode():
+    return redirect(url_for('.trial_mode_new'), 301)
+
+
+@main.route('/features/trial-mode')
+def trial_mode_new():
+    return render_template(
+        'views/trial-mode.html',
+        navigation_links=features_nav()
     )
 
 

app/main/views/sub_navigation_dictionaries.py

@@ -3,11 +3,33 @@ def features_nav():
         {
             "name": "Features",
             "link": "main.features",
+            "sub_navigation_items": [
+                {
+                    "name": "Emails",
+                    "link": "main.features_email",
+                },
+                {
+                    "name": "Text messages",
+                    "link": "main.features_sms",
+                },
+                {
+                    "name": "Letters",
+                    "link": "main.features_letters",
+                },
+            ]
         },
         {
             "name": "Roadmap",
             "link": "main.roadmap",
         },
+        {
+            "name": "Trial mode",
+            "link": "main.trial_mode_new",
+        },
+        {
+            "name": "Message status",
+            "link": "main.message_status",
+        },
         {
             "name": "Security",
             "link": "main.security",
@@ -16,8 +38,4 @@ def features_nav():
             "name": "Terms of use",
             "link": "main.terms",
         },
-        {
-            "name": "Using Notify",
-            "link": "main.using_notify",
-        },
     ]