Merge branch 'master' into reinstate-new-rate-api

Conflicts:
	app/main/views/dashboard.py

app/templates/views/dashboard/_inbox.html

@@ -0,0 +1,21 @@
+{% from "components/big-number.html" import big_number, big_number_with_status %}
+
+<div class="ajax-block">
+  {% if inbound_sms_summary != None %}
+    <div class="big-number-meta-wrapper">
+      {{
+        big_number_with_status(
+          inbound_sms_summary.count,
+          'text messages received',
+          link=url_for('.inbox', service_id=current_service.id),
+          show_failures=False
+        )
+      }}
+      <div class="big-number-meta">
+        {% if inbound_sms_summary.most_recent %}
+          latest message {{ inbound_sms_summary.most_recent | format_delta }}
+        {% endif %}
+      </div>
+    </div>
+  {% endif %}
+</div>

app/templates/views/dashboard/_totals.html

@@ -6,7 +6,7 @@
     <div id="total-email" class="column-half">
       {{ big_number_with_status(
         statistics['email']['requested'],
-        message_count_label(statistics['email']['requested'], 'email', suffix=''),
+        message_count_label(statistics['email']['requested'], 'email', suffix='sent'),
         statistics['email']['failed'],
         statistics['email']['failed_percentage'],
         statistics['email']['show_warning'],
@@ -17,7 +17,7 @@
     <div id="total-sms" class="column-half">
       {{ big_number_with_status(
         statistics['sms']['requested'],
-        message_count_label(statistics['sms']['requested'], 'sms', suffix=''),
+        message_count_label(statistics['sms']['requested'], 'sms', suffix='sent'),
         statistics['sms']['failed'],
         statistics['sms']['failed_percentage'],
         statistics['sms']['show_warning'],

app/templates/views/dashboard/dashboard.html

@@ -29,6 +29,8 @@
       In the last 7 days
     </h2>
 
+    {{ ajax_block(partials, updates_url, 'inbox') }}
+
     {{ ajax_block(partials, updates_url, 'totals') }}
     {{ show_more(
       url_for('.monthly', service_id=current_service.id),

app/templates/views/dashboard/inbox.html

@@ -0,0 +1,43 @@
+{% from "components/table.html" import list_table, field, hidden_field_heading, right_aligned_field_heading, row_heading %}
+{% from "components/message-count-label.html" import message_count_label %}
+
+{% extends "withnav_template.html" %}
+
+{% block service_page_title %}
+  Inbox
+{% endblock %}
+
+{% block maincolumn_content %}
+
+  <h1 class="heading-large">
+    Received text messages
+  </h1>
+  <div>
+    {% call(item, row_number) list_table(
+      messages,
+      caption="Inbox",
+      caption_visible=False,
+      empty_message='When users text your service’s phone number ({}) you’ll see the messages here'.format(current_service.sms_sender),
+      field_headings=[
+        'From',
+        'First two lines of message'
+      ],
+      field_headings_visible=False
+    ) %}
+      {% call field() %}
+        <span class="file-list-filename" href="#">{{ item.user_number }}</span>
+        <span class="wide-left-hand-column">{{ item.content }}</span>
+      {% endcall %}
+      {% call field(align='right') %}
+        <span class="file-list-hint align-with-message-body">
+          {{ item.created_at | format_delta }}
+        </span>
+      {% endcall %}
+    {% endcall %}
+    {% if messages %}
+      <p class="table-show-more-link">
+        Showing all {{ messages | length }} messages
+      </p>
+    {% endif %}
+  </div>
+{% endblock %}