From efd003e236e2f93ba68940a9a52ab84811dec162 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 9 Apr 2019 17:04:27 +0100
Subject: [PATCH] Reformatted tables

Reformatted tables to separate email and text message statuses
---
 app/templates/views/message-status.html | 35 ++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html
index 0bfd067d0..44a41c4a9 100644
--- a/app/templates/views/message-status.html
+++ b/app/templates/views/message-status.html
@@ -29,21 +29,20 @@
     >
     <h2 id="messagestatus" class="heading-medium">Message statuses you’ll see in Notify</h2>
 
-    <h3 class="heading-small">Emails and text messages</h3>
+    <h3 class="heading-small">Emails</h3>
     <div class="bottom-gutter-3-2">
       {% call mapping_table(
-        caption='Message statuses – email and text message',
+        caption='Message statuses – emails',
         field_headings=['Status', 'Description'],
         field_headings_visible=True,
         caption_visible=False
       ) %}
         {% for message_length, charge in [
           ('Sending', 'GOV.UK Notify has sent the message to the provider. The provider will try to deliver the message to the recipient. GOV.UK Notify is waiting for delivery information.'),
-          ('Sent internationally (text messages only)', 'The message was sent to an international number. The mobile networks in some countries do not provide any more delivery information.'),
           ('Delivered', 'The message was successfully delivered. Notify will not tell you if a user has opened or read a message.'),
-          ('Phone number or email address does not exist', 'The provider could not deliver the message because the email address or phone number was wrong. You should remove these email addresses or phone numbers from your database. You’ll still be charged for text messages to numbers that do not exist.'),
-          ('Inbox or phone not accepting messages right now', 'The provider could not deliver the message after trying for 72 hours. This can happen when the recipient’s inbox is full or their phone is off. You can try to send the message again. You’ll still be charged for text messages to phones that are not accepting messages.'),
-          ('Technical failure', 'Your message was not sent because there was a problem between Notify and the provider. You’ll have to try sending your messages again. You will not be charged for text messages that are affected by a technical failure.'),
+          ('Email address does not exist', 'The provider could not deliver the message because the email address was wrong. You should remove these email addresses from your database.'),
+          ('Inbox not accepting messages right now', 'The provider could not deliver the message after trying for 72 hours. This can happen when the recipient’s inbox is full. You can try to send the message again.'),
+          ('Technical failure', 'Your message was not sent because there was a problem between Notify and the provider. You’ll have to try sending your messages again.'),
         ] %}
           {% call row() %}
             {{ text_field(message_length) }}
@@ -53,6 +52,30 @@
       {% endcall %}
     </div>
 
+    <h3 class="heading-small">Text messages</h3>
+    <div class="bottom-gutter-3-2">
+      {% call mapping_table(
+        caption='Message statuses – text messages',
+        field_headings=['Status', 'Description'],
+        field_headings_visible=True,
+        caption_visible=False
+      ) %}
+        {% for message_length, charge in [
+          ('Sending', 'GOV.UK Notify has sent the message to the provider. The provider will try to deliver the message to the recipient. GOV.UK Notify is waiting for delivery information.'),
+          ('Sent internationally', 'The message was sent to an international number. The mobile networks in some countries do not provide any more delivery information.'),
+          ('Delivered', 'The message was successfully delivered. Notify will not tell you if a user has opened or read a message.'),
+          ('Phone number does not exist', 'The provider could not deliver the message because the phone number was wrong. You should remove these phone numbers from your database. You’ll still be charged for text messages to numbers that do not exist.'),
+          ('Phone not accepting messages right now', 'The provider could not deliver the message after trying for 72 hours. This can happen when the recipient’s phone is off. You can try to send the message again. You’ll still be charged for text messages to phones that are not accepting messages.'),
+          ('Technical failure', 'Your message was not sent because there was a problem between Notify and the provider. You’ll have to try sending your messages again. You will not be charged for text messages that are affected by a technical failure.'),
+        ] %}
+          {% call row() %}
+            {{ text_field(message_length) }}
+            {{ text_field(charge) }}
+          {% endcall %}
+        {% endfor %}
+      {% endcall %}
+    </div>
+    
     <h3 class="heading-small">Letters</h3>
     <div class="bottom-gutter-3-2">
       {% call mapping_table(