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

Merge pull request #367 from alphagov/get-started-with-templates

Browse Source 
Make ‘get started’ work for emails and texts
This commit is contained in:
Chris Hill-Scott
2016-04-01 09:42:38 +01:00
parent 4aebd282ed 3d9aa931d4
commit 5f9605d605
4 changed files with 29 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/templates/views/choose-template.html
View File

@@ -15,6 +15,10 @@
<h1 class="heading-large">{{ page_heading }}</h1> <h1 class="heading-large">{{ page_heading }}</h1>
{% if current_user.has_permissions(permissions=['manage_templates'], any_=True) %} {% if current_user.has_permissions(permissions=['manage_templates'], any_=True) %}
<p class="bottom-gutter">
You need a template before you can send
{{ 'emails' if 'email' == template_type else 'text messages' }}
</p>
<a href="{{ url_for('.add_service_template', service_id=service_id, template_type=template_type) }}" class="button">Add a new template</a> <a href="{{ url_for('.add_service_template', service_id=service_id, template_type=template_type) }}" class="button">Add a new template</a>
{% else %} {% else %}
<p>You need to ask your service manager to add templates before you can send messages</p> <p>You need to ask your service manager to add templates before you can send messages</p>

9
app/templates/views/dashboard/dashboard.html
View File

@@ -10,12 +10,11 @@
{% include 'views/dashboard/trial-mode-banner.html' %} {% include 'views/dashboard/trial-mode-banner.html' %}
{% endif %} {% endif %}
{% if not jobs %} {% if not templates and current_user.has_permissions(['send_texts', 'send_emails', 'send_letters'], any_=True) %}
{% if current_user.has_permissions(['manage_templates','send_texts', 'send_emails', 'send_letters']) %} {% include 'views/dashboard/get-started.html' %}
{% include 'views/dashboard/get-started.html' %} {% endif %}
{% endif%}
{% else %}
{% if templates %}
<div <div
data-module="update-content" data-module="update-content"
data-resource="{{url_for(".service_dashboard_updates", service_id=service_id)}}" data-resource="{{url_for(".service_dashboard_updates", service_id=service_id)}}"

31
app/templates/views/dashboard/get-started.html
View File

@@ -1,19 +1,30 @@
{% from "components/banner.html" import banner_wrapper %} {% from "components/banner.html" import banner_wrapper %}
<h2 class="heading-medium">Get started</h2> <h2 class="heading-medium">Get started</h2>
<ol class="grid-row"> {% if current_user.has_permissions(['manage_templates']) %}
{% if current_user.has_permissions(['manage_templates']) %} <p>
You need to set up a template before you can send messages
</p>
<ol class="grid-row">
<li class="column-half"> <li class="column-half">
{% call banner_wrapper(type="tip", subhead='1.' if not templates else None, with_tick=templates|length) %} {% call banner_wrapper(type="tip") %}
<a href='{{ url_for(".add_service_template", service_id=service_id, template_type="sms") }}'>Add a template</a> <a href='{{ url_for(".add_service_template", service_id=service_id, template_type="sms") }}' style="white-space: nowrap;">
Set up a text message template
</a>
{% endcall %} {% endcall %}
</li> </li>
{% endif %}
{% if current_user.has_permissions(['send_texts', 'send_emails', 'send_letters']) %}
<li class="column-half"> <li class="column-half">
{% call banner_wrapper(type="tip", subhead='2.') %} {% call banner_wrapper(type="tip") %}
<a href='{{ url_for(".choose_template", service_id=service_id, template_type="sms") }}'>Send yourself a message</a> <a href='{{ url_for(".add_service_template", service_id=service_id, template_type="email") }}'>
Set up an email template
</a>
{% endcall %} {% endcall %}
</li> </li>
{% endif %} </ol>
</ol> {% else %}
<p>
<p>
You need to ask your service manager to set up some templates before you can send messages
</p>
</p>
{% endif %}

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

@@ -1,76 +0,0 @@
{% extends "withnav_template.html" %}
{% from "components/banner.html" import banner_wrapper %}
{% from "components/table.html" import list_table, field, right_aligned_field_heading %}
{% from "components/big-number.html" import big_number %}
{% block page_title %}
{{ session.get('service_name', 'Dashboard') }} – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
<ul class="grid-row job-totals">
<li class="column-half">
{{ big_number(
free_text_messages_remaining,
'free text messages remaining'
)}}
</li>
<li class="column-half">
{{ big_number(
'£' + spent_this_month,
'spent this month'
)}}
</li>
</ul>
{% if not template_count and not jobs %}
{% if current_user.has_permissions(['manage_templates', 'send_texts', 'send_emails', 'send_letters'], any_=True, admin_override=True) %}
{% call banner_wrapper(subhead='Get started', type="tip") %}
<ol>
{% if current_user.has_permissions(['manage_templates'], admin_override=True) %}
<li>
<a href='{{ url_for(".add_service_template", service_id=service_id, template_type="sms") }}'>Add a template</a>
</li>
{% endif %}
{% if current_user.has_permissions(['send_texts']) %}
<li>
<a href='{{ url_for(".choose_template", service_id=service_id, template_type="sms") }}'>Send yourself a text message</a>
</li>
{% endif %}
</ol>
{% endcall %}
{% endif %}
{% elif not jobs %}
{% call banner_wrapper(subhead='Next step', type="tip") %}
{% if current_user.has_permissions(permissions=['send_texts', 'send_emails', 'send_letters']) %}
<a href='{{ url_for(".choose_template", service_id=service_id, template_type="sms") }}'>Send yourself a text message</a>
{% endif %}
{% endcall %}
{% else %}
{% call(item) list_table(
jobs,
caption="Recent text messages",
empty_message='You haven’t sent any batch messages yet',
field_headings=['Job', 'Created', right_aligned_field_heading('completion')]
) %}
{% call field() %}
<a href="{{ url_for('.view_job', service_id=service_id, job_id=item.id) }}">{{ item.original_file_name }}</a>
{% endcall %}
{% call field() %}
{{ item.created_at|format_datetime }}
{% endcall %}
{% call field(align='right') %}
{{ (item.notifications_sent / item.notification_count * 100)|round|int }}%
{% endcall %}
{% endcall %}
{% if more_jobs_to_show %}
{% if current_user.has_permissions(permissions=['send_texts', 'send_emails', 'send_letters']) %}
<p class="table-show-more-link">
<a href="{{ url_for('.view_notifications', service_id=service_id) }}">See all sent batch messages</a>
</p>
{% endif %}
{% endif %}
{% endif %}
{% endblock %}