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

Merge branch 'master' into remove-stats-from-send

Browse Source
This commit is contained in:
Leo Hemsted
2016-08-09 14:41:00 +01:00
parent bdc6691cb9 981777a72a
commit 3f3463b1ff
55 changed files with 408 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/templates/components/email-message.html
View File

@@ -50,7 +50,7 @@
{% if not expanded %}
<div class="email-message-body-wrapper">
{% endif %}
{{ body|nl2br }}
{{ body }}
{% if not expanded %}
</div>
<div class='toggle' tabindex='0'>...<span class='visually-hidden'>show full email</span></div>

2
app/templates/main_nav.html
View File

@@ -2,7 +2,7 @@
{% if help %}
{% call banner_wrapper(type='tour') %}
<p class="heading-medium">Try this example</p>
<p class="heading-medium">Try sending yourself this example</p>
<div class="grid-row bottom-gutter" {% if help != '1' %}style="opacity: 0.6"{% endif %}>
<div class="column-one-sixth">
<p class="heading-large" style="float: left;">1.</p>

2
app/templates/partials/jobs/count.html
View File

@@ -1,5 +1,5 @@
{% from "components/pill.html" import pill %}
<div class="bottom-gutter">
{{ pill('Status', counts, status) }}
{{ pill('Status', counts, request.args.get('status', '')) }}
</div>

24
app/templates/partials/jobs/notifications.html
View File

@@ -4,12 +4,18 @@
<div class="dashboard-table">
{% endif %}
{% if notifications and not help %}
<p class="bottom-gutter">
<a href="{{ download_link }}" download="download" class="heading-small">Download this report</a>
&emsp;
<span id="time-left">{{ time_left }}</span>
</p>
{% if not help %}
{% if percentage_complete < 100 %}
<p class="bottom-gutter-1-2 hint">
Report is {{ "{:.0f}%".format(percentage_complete) }} complete…
</p>
{% elif notifications %}
<p class="bottom-gutter-1-2">
<a href="{{ download_link }}" download="download" class="heading-small">Download this report</a>
&emsp;
<span id="time-left">{{ time_left }}</span>
</p>
{% endif %}
{% endif %}
{% call(item, row_number) list_table(
@@ -44,6 +50,12 @@
{% endcall %}
{% endcall %}
{% if more_than_one_page %}
<p class="table-show-more-link">
Only showing the first 50 rows
</p>
{% endif %}
{% if notifications %}
</div>
{% endif %}

20
app/templates/partials/templates/guidance-character-count.html
View File

@@ -1,12 +1,8 @@
<details>
<summary class="button tertiary-button">Message length</summary>
<div id="guidance-personalisation">
<p>
If your message is long then it will
cost more.
</p>
<p>
See <a href="{{ url_for('.pricing') }}">pricing</a> for details.
</p>
</div>
</details>
<h2 class="heading-medium">Message length</h2>
<p>
If your message is long then it will
cost more.
</p>
<p>
See <a href="{{ url_for('.pricing') }}">pricing</a> for details.
</p>

27
app/templates/partials/templates/guidance-formatting.html Normal file
View File

@@ -0,0 +1,27 @@
<h2 class="heading-medium">Formatting</h2>
<p>
To put a title in your template, use a hash:
</p>
<div class="panel panel-border-wide">
<p>
# This is a title
</p>
</div>
<p>
To make bullet points, use asterisks:
</p>
<div class="panel panel-border-wide">
<p>
* point 1<br/>
* point 2<br/>
* point 3<br/>
</p>
</div>
<p>
To add a callout, use a caret:
</p>
<div class="panel panel-border-wide">
<p>
^ You must tell us if your circumstances change
</p>
</div>

17
app/templates/partials/templates/guidance-links.html
View File

@@ -1,8 +1,9 @@
<details>
<summary class="button tertiary-button">Links and URLs</summary>
<div id="guidance-personalisation">
<p>
Always use full URLs, starting with https://
</p>
</div>
</details>
<h2 class="heading-medium">Links and URLs</h2>
<p>
Always use full URLs, starting with https://
</p>
<div class="panel panel-border-wide">
<p>
Apply now at https://www.gov.uk/example
</p>
</div>

25
app/templates/partials/templates/guidance-personalisation.html
View File

@@ -1,14 +1,11 @@
<details>
<summary class="button tertiary-button">Personalisation</summary>
<div id="guidance-personalisation">
<p>
Use double brackets to add personalisation.
</p>
<p>
Correct: ((name))
</p>
<p>
Incorrect: ((Helen))
</p>
</div>
</details>
<h2 class="heading-medium">
Personalisation
</h2>
<p>
Use double brackets to personalise your message:
</p>
<div class="panel panel-border-wide">
<p>
Hello ((first name)), your reference is ((ref number))
</p>
</div>

2
app/templates/views/dashboard/_jobs.html
View File

@@ -23,7 +23,7 @@
{% endcall %}
{% call field() %}
{{ big_number(
item.get('notifications_sent', 0) - item.get('notifications_delivered', 0) - item.get('notifications_failed', 0),
item.get('notification_count', 0) - item.get('notifications_delivered', 0) - item.get('notifications_failed', 0),
smallest=True
) }}
{% endcall %}

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

@@ -19,7 +19,7 @@
{% if not templates %}
{% include 'views/dashboard/write-first-messages.html' %}
{% endif %}
{% elif not current_user.has_permissions(['send_texts', 'send_emails', 'send_letters'], any_=True) %}
{% elif not current_user.has_permissions(['send_texts', 'send_emails', 'send_letters', 'manage_api_keys'], any_=True) %}
{% include 'views/dashboard/no-permissions-banner.html' %}
{% endif %}

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

@@ -14,11 +14,11 @@
<form method="post">
<div class="grid-row">
<div class="column-two-thirds">
<div class="column-three-quarters">
{{ textbox(form.name, width='1-1', hint='Your recipients won’t see this', rows=10) }}
{{ textbox(form.subject, width='1-1', highlight_tags=True, rows=2) }}
</div>
<div class="column-two-thirds">
<div class="column-three-quarters">
{{ textbox(form.template_content, highlight_tags=True, width='1-1', rows=8) }}
{{ page_footer(
'Save',
@@ -26,8 +26,8 @@
delete_link_text='Delete this template'
) }}
</div>
<aside class="column-one-third">
<h2 style="margin: 0 0 5px 0;">Help</h2>
<aside class="column-whole">
{% include "partials/templates/guidance-formatting.html" %}
{% include "partials/templates/guidance-personalisation.html" %}
{% include "partials/templates/guidance-links.html" %}
</aside>

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

@@ -25,8 +25,7 @@
delete_link_text='Delete this template'
) }}
</div>
<aside class="column-one-third">
<h2 style="margin: 0 0 5px 0;">Help</h2>
<aside class="column-whole">
{% include "partials/templates/guidance-personalisation.html" %}
{% include "partials/templates/guidance-links.html" %}
{% include "partials/templates/guidance-character-count.html" %}

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

@@ -14,9 +14,9 @@
<h1 class="heading-large">
<span class="visually-hidden">
{%- if request_args.get('status') != 'delivered,failed' -%}
{%- if status != 'delivered,failed' -%}
{%- for label, option, _, _ in status_filters -%}
{%- if request_args.get('status', 'delivered,failed') == option -%}{{label}} {% endif -%}
{%- if status == option -%}{{label}} {% endif -%}
{%- endfor -%}
{%- endif -%}
</span>
@@ -29,15 +29,15 @@
{{ pill(
'Status',
status_filters,
request_args.get('status', '')
status
) }}
</div>
{% if notifications %}
<p class="bottom-gutter">
<a href="{{ download_link }}" download="download" class="heading-small">Download as a CSV file</a>
<p class="bottom-gutter-1-2">
<a href="{{ download_link }}" download="download" class="heading-small">Download this report</a>
&emsp;
Delivery information is available for 7 days
Data available for 7 days
</p>
{% endif %}

10
app/templates/views/weekly.html
View File

@@ -3,7 +3,7 @@
{% extends "withnav_template.html" %}
{% block page_title %}
Daily – GOV.UK Notify
Previous weeks – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
@@ -33,16 +33,16 @@
{% endif %}
{% endcall %}
{% call field(align='right') %}
{{ item.emails_requested }}
{{ item.email.requested }}
{% endcall %}
{% call field(align='right') %}
{{ item.emails_failure_rate }}%
{{ item.email.failure_rate }}%
{% endcall %}
{% call field(align='right') %}
{{ item.sms_requested }}
{{ item.sms.requested }}
{% endcall %}
{% call field(align='right') %}
{{ item.sms_failure_rate }}%
{{ item.sms.failure_rate }}%
{% endcall %}
{% endcall %}