diff --git a/app/__init__.py b/app/__init__.py index 9dc27d08c..99f5b121f 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,7 +1,7 @@ import os import re -from flask import Flask, session, Markup, render_template +from flask import Flask, session, Markup, escape, render_template from flask._compat import string_types from flask.ext.sqlalchemy import SQLAlchemy from flask_login import LoginManager @@ -47,6 +47,7 @@ def create_app(config_name, config_overrides=None): application.add_template_filter(placeholders) application.add_template_filter(replace_placeholders) + application.add_template_filter(nl2br) application.after_request(useful_headers_after_request) register_errorhandlers(application) @@ -108,6 +109,14 @@ def placeholders(value): )) +def nl2br(value): + _paragraph_re = re.compile(r'(?:\r\n|\r|\n){2,}') + + result = u'\n\n'.join(u'

%s

' % p.replace('\n', Markup('
\n')) + for p in _paragraph_re.split(escape(value))) + return Markup(result) + + def replace_placeholders(template, values): if not template: return template diff --git a/app/assets/stylesheets/components/email-message.scss b/app/assets/stylesheets/components/email-message.scss new file mode 100644 index 000000000..c351e4263 --- /dev/null +++ b/app/assets/stylesheets/components/email-message.scss @@ -0,0 +1,24 @@ +.email-message { + + margin-bottom: $gutter; + border: 1px solid $border-colour; + + &-subject { + border-bottom: 1px solid $border-colour;; + padding: 10px; + @include bold-19; + } + + &-body { + border-bottom: 1px solid white; + padding: 10px; + overflow: hidden; + max-height: 103px; + } + + &-name { + @include bold-19; + margin: 50px 0 10px 0; + } + +} diff --git a/app/assets/stylesheets/components/sms-message.scss b/app/assets/stylesheets/components/sms-message.scss index 0d8485f3d..a429edbaa 100644 --- a/app/assets/stylesheets/components/sms-message.scss +++ b/app/assets/stylesheets/components/sms-message.scss @@ -47,7 +47,7 @@ &-name { @include bold-19; - margin: 0 0 5px 0; + margin: 50px 0 10px 0; } } diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index 7343f9348..28ddc0ce4 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -44,6 +44,7 @@ @import 'components/browse-list'; @import 'components/management-navigation'; @import 'components/dropdown'; +@import 'components/email-message'; @import 'views/job'; diff --git a/app/main/views/_templates.py b/app/main/views/_templates.py index 94cb773d6..da7f97c32 100644 --- a/app/main/views/_templates.py +++ b/app/main/views/_templates.py @@ -1,20 +1,39 @@ -sms_templates = [ +templates = [ { + 'type': 'sms', + 'name': 'Confirmation', + 'body': 'Lasting power of attorney: We’ve received your application. Applications take between 8 and 10 weeks to process.' # noqa + }, + { + 'type': 'sms', 'name': 'Reminder', - 'body': """ - Vehicle tax: Your vehicle tax for ((registration number)) expires on ((date)). - Tax your vehicle at www.gov.uk/vehicle-tax + 'body': 'Vehicle tax: Your vehicle tax for ((registration number)) expires on ((date)). Tax your vehicle at www.gov.uk/vehicle-tax' # noqa + }, + { + 'type': 'sms', + 'name': 'Warning', + 'body': 'Vehicle tax: Your vehicle tax for ((registration number)) has expired. Tax your vehicle at www.gov.uk/vehicle-tax' # noqa + }, + { + 'type': 'email', + 'name': 'Application alert 06/2016', + 'subject': 'Your lasting power of attorney application', + 'body': """Dear ((name)), + +When you’ve made your lasting power of attorney (LPA), you need to register it \ +with the Office of the Public Guardian (OPG). + +You can apply to register your LPA yourself if you’re able to make your own decisions. + +Your attorney can also register it for you. You’ll be told if they do and you can \ +object to the registration. + +It takes between 8 and 10 weeks to register an LPA if there are no mistakes in the application. """ }, { - 'name': 'Warning', - 'body': """ - Vehicle tax: Your vehicle tax for ((registration number)) has expired. - Tax your vehicle at www.gov.uk/vehicle-tax - """ + 'type': 'sms', + 'name': 'Air quality alert', + 'body': 'Air pollution levels will be ((level)) in ((region)) tomorrow.' }, ] - -email_templates = [ - -] diff --git a/app/main/views/sms.py b/app/main/views/sms.py index 94682b3fd..bf276cee5 100644 --- a/app/main/views/sms.py +++ b/app/main/views/sms.py @@ -22,7 +22,11 @@ from app.main import main from app.main.forms import CsvUploadForm from app.main.uploader import s3upload -from ._templates import sms_templates +from ._templates import templates + +sms_templates = [ + template for template in templates if template['type'] == 'sms' +] @main.route("/services//sms/send", methods=['GET', 'POST']) diff --git a/app/main/views/templates.py b/app/main/views/templates.py index e8488ff1e..d21858230 100644 --- a/app/main/views/templates.py +++ b/app/main/views/templates.py @@ -4,7 +4,7 @@ from flask_login import login_required from app.main import main from app.main.forms import TemplateForm -from ._templates import sms_templates, email_templates +from ._templates import templates @main.route("/services//templates") @@ -13,8 +13,7 @@ def manage_templates(service_id): return render_template( 'views/manage-templates.html', service_id=service_id, - sms_templates=sms_templates, - email_templates=email_templates + templates=templates, ) @@ -35,14 +34,14 @@ def add_template(service_id): return redirect(url_for('.manage_templates', service_id=service_id)) -@main.route("/services//templates/", methods=['GET', 'POST']) +@main.route("/services//templates/", methods=['GET', 'POST']) @login_required def edit_template(service_id, template_id): form = TemplateForm() - form.template_name.data = 'Reminder' - form.template_body.data = 'Vehicle tax: Your vehicle tax for ((registration number)) expires on ((date)). Tax your vehicle at www.gov.uk/vehicle-tax' # noqa + form.template_name.data = templates[template_id - 1]['name'] + form.template_body.data = templates[template_id - 1]['body'] if request.method == 'GET': return render_template( diff --git a/app/templates/components/email-message.html b/app/templates/components/email-message.html new file mode 100644 index 000000000..2a8f65eb8 --- /dev/null +++ b/app/templates/components/email-message.html @@ -0,0 +1,19 @@ +{% macro email_message(subject, body, name=None, edit_link=None) %} + {% if name %} + + {% endif %} + +{% endmacro %} diff --git a/app/templates/components/sms-message.html b/app/templates/components/sms-message.html index baff74ef5..a04a47c62 100644 --- a/app/templates/components/sms-message.html +++ b/app/templates/components/sms-message.html @@ -1,9 +1,10 @@ {% macro sms_message(body, recipient=None, name=None, edit_link=None) %} {% if name %}

- {{ name }} {% if edit_link %} - Edit + {{ name }} + {% else %} + {{ name }} {% endif %}

{% endif %} diff --git a/app/templates/main_nav.html b/app/templates/main_nav.html index 3fcbd79d2..9594c8596 100644 --- a/app/templates/main_nav.html +++ b/app/templates/main_nav.html @@ -6,7 +6,7 @@
  • Send text messages
  • Send emails
  • Activity
    • -
  • Manage templates
    • +
  • Templates
    • API keys and documentation
      • diff --git a/app/templates/views/edit-template.html b/app/templates/views/edit-template.html index e0059b91b..dcb4cb109 100644 --- a/app/templates/views/edit-template.html +++ b/app/templates/views/edit-template.html @@ -15,8 +15,8 @@ GOV.UK Notify | Edit template {{ textbox(form.template_body, highlight_tags=True) }} {{ page_footer( 'Save and continue', - back_link=url_for('.dashboard', service_id=service_id), - back_link_text='Back to manage templates' + back_link=url_for('.manage_templates', service_id=service_id), + back_link_text='Back to templates' ) }} diff --git a/app/templates/views/manage-templates.html b/app/templates/views/manage-templates.html index 5d8518fd2..7ecc95ca9 100644 --- a/app/templates/views/manage-templates.html +++ b/app/templates/views/manage-templates.html @@ -1,5 +1,7 @@ {% extends "withnav_template.html" %} {% from "components/sms-message.html" import sms_message %} +{% from "components/email-message.html" import email_message %} +{% from "components/browse-list.html" import browse_list %} {% block page_title %} GOV.UK Notify | Manage templates @@ -7,28 +9,41 @@ GOV.UK Notify | Manage templates {% block maincolumn_content %} - -

      Manage templates

      - -

      SMS templates

      -
      - {% for template in sms_templates %} - {{ sms_message( - template.body, - name=template.name, - edit_link=url_for('.edit_template', service_id=service_id, template_id=1) - ) }} +

      Templates

      + + {% for template in templates %} + {% if template.type == 'sms' %} + {{ sms_message( + template.body, + name=template.name, + edit_link=url_for('.edit_template', service_id=service_id, template_id=loop.index) + ) }} + {% elif template.type == 'email' %} + {{ email_message( + template.subject, + template.body, + name=template.name, + edit_link=url_for('.edit_template', service_id=service_id, template_id=loop.index) + ) }} + {% endif %} {% endfor %}
      +
      + {{ browse_list([ + { + 'title': 'New text message template', + 'link': url_for('.add_template', service_id=service_id) + }, + { + 'title': 'New email template', + 'link': url_for('.add_template', service_id=service_id) + } + ]) }} +
      -

      - Add a new message template -

      - - {% endblock %}