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

Merge branch 'master' into template_history_view

Browse Source 
Conflicts:
	requirements.txt
This commit is contained in:
Rebecca Law
2016-05-13 17:30:33 +01:00
parent 64e7a7b010 cccf2c4590
commit fcf277c413
10 changed files with 133 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,7 +81,7 @@
{{ item.to }}
</p>
<p class="hint">
<a href="{{ url_for('.view_template', service_id=current_service.id, template_id=item.template.id) }}">{{ item.template.name }}</a>
<a href="{{ url_for('.view_template_version', service_id=current_service.id, template_id=item.template.id, version=item.template_version) }}">{{ item.template.name }}</a>
sent from
{% if item.job %}
<a href="{{ url_for(".view_job", service_id=current_service.id, job_id=item.job.id) }}">{{ item.job.original_file_name }}</a>

6
app/templates/views/templates/_template_history.html
View File

@@ -31,6 +31,10 @@
<div class="column-one-third">
<div class="sms-message-use-links{% if show_title %}-with-title{% endif %}">
<p>Edited by {{ template.get_raw('created_by').name }}</p>
<p>Edited on {{ template.get_raw('created_at')|format_datetime }}</p>
<p>Created on {{ template.get_raw('created_at')|format_datetime }}</p>
<p>Edited on
{% if template.get_raw('updated_at') %}
{{ template.get_raw('updated_at')|format_datetime }}</p>
{% endif %}
</div>
</div>