Merge pull request #2995 from alphagov/new-email-reply-to

Update email_reply_to.html
This commit is contained in:
Chris Hill-Scott
2019-06-05 16:53:58 +01:00
committed by GitHub
5 changed files with 43 additions and 38 deletions

View File

@@ -23,24 +23,20 @@
<a href="{{ url_for('.service_email_reply_to', service_id=service_id) }}" class="button">Continue</a>
</div>
{% elif verification_status == "failure" %}
{% call banner_wrapper(type='dangerous') %}
<h2 class='banner-title' data-module="track-error" data-error-type="reply-to-email-not-working" data-error-label="{{ upload_id }}">
Theres a problem with your reply-to address
</h2>
<p>
We sent an email to {{ reply_to_email_address }} but it wasnt delivered.
</p>
<p>
You can try again, or use a different address.
</p>
{% endcall %}
<p>
Let recipients send replies to a shared inbox thats managed by your team.
</p>
<p>
Do not use your own email address for replies.
</p>
{% if replace and replace != "False" %}
<div class="bottom-gutter">
{% call banner_wrapper(type='dangerous') %}
<h2 class='banner-title' data-module="track-error" data-error-type="reply-to-email-not-working" data-error-label="{{ upload_id }}">
Theres a problem with your reply-to address
</h2>
<p>
We sent an email to {{ reply_to_email_address }} but it wasnt delivered.
</p>
<p>
You can try again, or use a different address.
</p>
{% endcall %}
</div>
{% if replace %}
{% set form_url = url_for('.service_edit_email_reply_to', service_id=service_id, reply_to_email_id=replace) %}
{% else %}
{% set form_url = url_for('.service_add_email_reply_to', service_id=service_id) %}
@@ -50,14 +46,11 @@
) %}
{{ textbox(
form.email_address,
width='2-3',
safe_error_message=True
width='1-1',
safe_error_message=True,
hint='This should be a shared inbox managed by your team, not your own email address'
) }}
{% if form.is_default.data %}
<p class="form-group">
This is the default reply-to address for {{ current_service.name }} emails
</p>
{% else %}
{% if not first_email_address and not existing_is_default %}
<div class="form-group">
{{ checkbox(form.is_default) }}
</div>

View File

@@ -15,16 +15,12 @@
'Add email reply-to address',
back_link=url_for('main.service_email_reply_to', service_id=current_service.id)
) }}
<p>
Let recipients send replies to a shared inbox thats managed by your team.
</p>
<p>
Do not use your own email address for replies.
</p>
{% call form_wrapper() %}
{{ textbox(
form.email_address,
width='2-3',
width='1-1',
hint='This should be a shared inbox managed by your team, not your own email address',
safe_error_message=True
) }}
{% if not first_email_address %}

View File

@@ -7,20 +7,21 @@
{% from "components/form.html" import form_wrapper %}
{% block service_page_title %}
Edit email reply to address
Change email reply to address
{% endblock %}
{% block maincolumn_content %}
{{ page_header(
'Edit email reply to address',
'Change email reply to address',
back_link=url_for('main.service_email_reply_to', service_id=current_service.id)
) }}
{% call form_wrapper() %}
{{ textbox(
form.email_address,
width='2-3',
safe_error_message=True
width='1-1',
safe_error_message=True,
hint='This should be a shared inbox managed by your team, not your own email address.'
) }}
{% if form.is_default.data %}
<p class="form-group">