Merge pull request #1291 from alphagov/two-way

Add page to show two-way conversation
This commit is contained in:
Chris Hill-Scott
2017-06-14 16:42:46 +01:00
committed by GitHub
12 changed files with 359 additions and 13 deletions

View File

@@ -0,0 +1,50 @@
{% extends "withnav_template.html" %}
{% block service_page_title %}
Conversation
{% endblock %}
{% block maincolumn_content %}
<div class="dashboard">
<div class="bottom-gutter js-stick-at-top-when-scrolling">
<h1 class="heading-large">
{{ user_number }}
</h1>
</div>
{% for message in conversation %}
<div class="grid-row sms-message-row" id="n{{ message.id }}" tabindex="0">
{% if message.inbound %}
<div class="column-two-thirds sms-message-inbound">
{{ message.content | string }}
<div class="sms-message-status">
{{ message.created_at | format_datetime_relative }}
</div>
</div>
{% else %}
<div class="column-one-third">
&nbsp;
</div>
<div class="column-two-thirds">
{{ message.content | string }}
{% if message.status == 'delivered' %}
<div class="sms-message-status sms-message-status-outbound">
{{ message.created_at | format_datetime_relative }}
</div>
{% elif message.status in ['pending', 'sending', 'created'] %}
<div class="sms-message-status sms-message-status-outbound hint">
sending
</div>
{% else %}
<div class="sms-message-status sms-message-status-outbound table-field-error-label">
Failed (sent {{ message.created_at | format_datetime_relative }})
</div>
{% endif %}
</div>
{% endif %}
</div>
{% endfor %}
</div>
{% endblock %}

View File

@@ -25,7 +25,12 @@
field_headings_visible=False
) %}
{% call field() %}
<span class="file-list-filename" href="#">{{ item.user_number | format_phone_number_human_readable }}</span>
<a
class="file-list-filename"
href="{{ url_for('.conversation', service_id=current_service.id, notification_id=item.id) }}#n{{ item.id }}"
>
{{ item.user_number | format_phone_number_human_readable }}
</a>
<span class="wide-left-hand-column">{{ item.content }}</span>
{% endcall %}
{% call field(align='right') %}