-
- {% if 'email' == template.template_type %}
- {{ email_message(
- template.subject,
- template.formatted_as_markup,
- ) }}
- {% elif 'sms' == template.template_type %}
+ {% if 'email' == template.template_type %}
+ {{ email_message(
+ template.formatted_subject_as_markup,
+ template.formatted_as_markup,
+ ) }}
+ {% elif 'sms' == template.template_type %}
+
+
{{ sms_message(
template.formatted_as_markup,
) }}
- {% endif %}
-
-
- You can send this message from your existing apps or systems by
- connecting them to GOV.UK Notify.
-
-
- You’ll need to work with a developer to do this.
-
-
+
+ {% endif %}
+
+
+ {{ api_key(template.id, name="Template ID", thing='template ID') }}
-
- Example payload for this template
-
- {{payload|syntax_highlight_json}}
-
-
- Endpoint
-
-
-
-
- {{- 'POST https://api.notifications.service.gov.uk/notifications/{}'.format(
- template.template_type
- ) -}}
-
-
+ {% if personalisation %}
+
Personalisation (all fields are required)
+ {{ personalisation|syntax_highlight_json }}
+ {% endif %}
See the developer documentation for full details.
diff --git a/app/templates/views/send.html b/app/templates/views/send.html
index b916b5e28..0ff51054a 100644
--- a/app/templates/views/send.html
+++ b/app/templates/views/send.html
@@ -11,32 +11,34 @@
{% block maincolumn_content %}
-
Send from a CSV file
- {% if 'sms' == template.template_type %}
-
-
+
Send {{ 'text messages' if 'sms' == template.template_type else 'emails' }}
+
+
+
+ {% if 'sms' == template.template_type %}
{{ sms_message(template.formatted_as_markup) }}
-
+ {% elif 'email' == template.template_type %}
+ {{ email_message(
+ template.formatted_subject_as_markup,
+ template.formatted_as_markup
+ ) }}
+ {% endif %}
- {% elif 'email' == template.template_type %}
- {{ email_message(
- template.formatted_subject_as_markup,
- template.formatted_as_markup,
- from_address='{}@notifications.service.gov.uk'.format(current_service.email_from),
- from_name=current_service.name
- ) }}
- {% endif %}
+
+
- You need
+ Make a CSV file with
{{ template.placeholders|length + 1 }}
{% if template.placeholders %}
- columns
+ columns,
{% else %}
- column
+ column,
{% endif %}
- in your file, like this:
+ like this:
{% call(item, row_number) list_table(
diff --git a/app/templates/views/templates/_template.html b/app/templates/views/templates/_template.html
index 7863ac383..77d67cc07 100644
--- a/app/templates/views/templates/_template.html
+++ b/app/templates/views/templates/_template.html
@@ -10,22 +10,21 @@
) }}
{% elif 'sms' == template.template_type %}
{{ sms_message(
- template.formatted_as_markup,
- name=template.name if show_title else None
- ) }}
+ template.formatted_as_markup,
+ name=template.name if show_title else None
+ ) }}
{% endif %}
\ No newline at end of file
diff --git a/app/templates/views/templates/template.html b/app/templates/views/templates/template.html
index 8a6ec558b..4257761f6 100644
--- a/app/templates/views/templates/template.html
+++ b/app/templates/views/templates/template.html
@@ -14,15 +14,14 @@
{{ template.name }}
- {% include 'views/templates/_template.html' %}
+ {% with show_title=False %}
+ {% include 'views/templates/_template.html' %}
+ {% endwith %}
-
-
- All
- {{ 'email' if 'email' == template.template_type else 'text message' }}
- templates
-
-
+ {{ page_footer(
+ secondary_link=url_for('.choose_template', service_id=current_service.id, template_type=template.template_type),
+ secondary_link_text='All {} templates'.format('email' if 'email' == template.template_type else 'text message')
+ ) }}
{% endblock %}
diff --git a/docs/index.md b/docs/index.md
index 017ba4446..d639967b8 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -158,7 +158,7 @@ where:
* `to` is the phone number (required)
* `template` is the template ID to send (required)
- **Note:** Access the template ID from the [GOV.UK Notify](https://www.notifications.service.gov.uk/) web application: go to **Text message templates**, click on **Edit template** and recover the template id from the url eg `/templates/
/edit`
+ **Note:** Access the template ID from the [GOV.UK Notify](https://www.notifications.service.gov.uk/) web application: go to **Text message templates** or **Email templates** and click on **API info**.
* `personalisation` (optional) specifies the values for the placeholders in your templates
diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py
index 07ea44e60..79512cde4 100644
--- a/tests/app/main/views/test_send.py
+++ b/tests/app/main/views/test_send.py
@@ -419,10 +419,6 @@ def test_route_choose_template_send_messages_permissions(mocker,
"main.send_messages",
service_id=service_one['id'],
template_id=template_id) in page
- assert url_for(
- "main.send_message_to_self",
- service_id=service_one['id'],
- template_id=template_id) in page
assert url_for(
"main.edit_service_template",
service_id=service_one['id'],