darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-09 00:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into celery-jobs

Browse Source
This commit is contained in:
Martyn Inglis
2016-02-25 11:30:28 +00:00
parent 87391f2aa1 b4fd7f4ffd
commit 10d595c7a9
4 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/main/views/templates.py
View File

@@ -31,7 +31,11 @@ def add_service_template(service_id, template_type):
if form.validate_on_submit(): if form.validate_on_submit():
tdao.insert_service_template( tdao.insert_service_template(
form.name.data, template_type, form.template_content.data, service_id, form.subject.data or None form.name.data,
template_type,
form.template_content.data,
service_id,
form.subject.data if hasattr(form, 'subject') else None
) )
return redirect( return redirect(
url_for('.choose_template', service_id=service_id, template_type=template_type) url_for('.choose_template', service_id=service_id, template_type=template_type)

6
app/templates/views/edit-email-template.html
View File

@@ -14,12 +14,8 @@
<div class="grid-row"> <div class="grid-row">
<div class="column-two-thirds"> <div class="column-two-thirds">
{{ textbox(form.name, width='1-1') }} {{ textbox(form.name, width='1-1') }}
{% if 'email' == template_type %} {{ textbox(form.subject, width='1-1') }}
{{ textbox(form.subject, width='1-1') }}
{% endif %}
</div> </div>
</div>
<div class="grid-row">
<div class="column-two-thirds"> <div class="column-two-thirds">
{{ textbox(form.template_content, highlight_tags=True, width='1-1') }} {{ textbox(form.template_content, highlight_tags=True, width='1-1') }}
</div> </div>

5
app/templates/views/edit-sms-template.html
View File

@@ -14,12 +14,7 @@
<div class="grid-row"> <div class="grid-row">
<div class="column-two-thirds"> <div class="column-two-thirds">
{{ textbox(form.name, width='1-1') }} {{ textbox(form.name, width='1-1') }}
{% if 'email' == template_type %}
{{ textbox(form.subject, width='1-1') }}
{% endif %}
</div> </div>
</div>
<div class="grid-row">
<div class="column-two-thirds"> <div class="column-two-thirds">
{{ textbox(form.template_content, highlight_tags=True, width='1-1') }} {{ textbox(form.template_content, highlight_tags=True, width='1-1') }}
</div> </div>

2
app/templates/views/service_dashboard.html
View File

@@ -35,7 +35,7 @@
</li> </li>
</ol> </ol>
""".format( """.format(
url_for(".add_service_template", service_id=service_id), url_for(".add_service_template", service_id=service_id, template_type="sms"),
url_for(".choose_template", service_id=service_id, template_type="sms") url_for(".choose_template", service_id=service_id, template_type="sms")
)|safe, )|safe,
subhead='Get started', subhead='Get started',