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

now with even fewer letters

Browse Source
This commit is contained in:
stvnrlly
2022-10-18 15:27:13 +00:00
parent 44e8c0fe89
commit b6a6a14bc7
10 changed files with 37 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/forms.py
View File

@@ -1674,7 +1674,7 @@ class SupportRedirect(StripWhitespaceForm):
who = GovukRadiosField(
'What do you need help with?',
choices=[
('public-sector', 'I work in the public sector and need to send emails, text messages or letters'),
('public-sector', 'I work in the public sector and need to send emails or text messages'),
('public', 'I’m a member of the public with a question for the government'),
],
param_extensions={

24
app/main/views/sub_navigation_dictionaries.py
View File

@@ -12,10 +12,10 @@ def features_nav():
"name": "Text messages",
"link": "main.features_sms",
},
{
"name": "Letters",
"link": "main.features_letters",
},
# {
# "name": "Letters",
# "link": "main.features_letters",
# },
]
},
{
@@ -84,14 +84,14 @@ def using_notify_nav():
"name": "Send files by email",
"link": "main.send_files_by_email",
},
{
"name": "Upload a letter",
"link": "main.upload_a_letter",
},
{
"name": "Letter specification",
"link": "main.letter_specification",
},
# {
# "name": "Upload a letter",
# "link": "main.upload_a_letter",
# },
# {
# "name": "Letter specification",
# "link": "main.letter_specification",
# },
]
},
{

8
app/templates/views/features.html
View File

@@ -14,7 +14,7 @@
<ul class="list list-bullet">
<li><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.features_email') }}">emails</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.features_sms') }}">text messages</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.features_letters') }}">letters</a></li>
<!-- <li><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.features_letters') }}">letters</a></li> -->
</ul>
<p class="govuk-body">You do not need any technical knowledge to use Notify.</p>
{% if not current_user.is_authenticated %}
@@ -22,7 +22,7 @@
{% endif %}
<h2 class="heading-medium" id="templates">Reusable message templates</h2>
<p class="govuk-body">To send an email, text or letter with Notify, you need to create a reusable message template first.</p>
<p class="govuk-body">To send an email or text with Notify, you need to create a reusable message template first.</p>
<p class="govuk-body">Templates let you send the same thing to lots of people, as often as you need to, without writing a new message each time.</p>
<h2 class="heading-medium" id="personalised-messages">Personalised content</h2>
@@ -53,10 +53,10 @@
<p class="govuk-body">Notify commits to:</p>
<ul class="list list-bullet">
<li>sending 95% of emails and text messages within 10 seconds</li>
<li>printing and posting letters by 3pm the next working day (if you send them to us before 5:30pm)</li>
<!-- <li>printing and posting letters by 3pm the next working day (if you send them to us before 5:30pm)</li> -->
</ul>
<p class="govuk-body">We send messages through several different providers. If one provider fails, Notify switches to another so that your messages are not affected.</p>
<!-- <p class="govuk-body">We send messages through several different providers. If one provider fails, Notify switches to another so that your messages are not affected.</p> -->
<p class="govuk-body">Visit our <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.performance') }}">performance data</a> page to see how Notify is performing.</p>

8
app/templates/views/guidance/index.html
View File

@@ -10,7 +10,7 @@
<h1 class="heading-large">Guidance</h1>
<p class="govuk-body">This guidance is for teams using US Notify to send emails, text messages and letters.</p>
<p class="govuk-body">This guidance is for teams using US Notify to send emails and text messages.</p>
<p class="govuk-body">It explains how to:</p>
@@ -18,16 +18,16 @@
<li><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.edit_and_format_messages') }}">edit and format messages</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.branding_and_customisation') }}">add branding and customisation</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.send_files_by_email') }}">send files by email</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.upload_a_letter') }}">upload a letter</a></li>
<!-- <li><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.upload_a_letter') }}">upload a letter</a></li> -->
</ul>
<h2 class="heading-medium">More information</h2>
<p class="govuk-body">The US NotifyService Manual has advice on:</p>
<p class="govuk-body">The US Notify Service Manual has advice on:</p>
<ul class="list list-bullet">
<li><a class="govuk-link govuk-link--no-visited-state" href="https://www.gov.uk/service-manual/design/sending-emails-and-text-messages">planning and writing text messages and emails</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="https://www.gov.uk/service-manual/design/writing-effective-letters">writing effective letters</a></li>
<!-- <li><a class="govuk-link govuk-link--no-visited-state" href="https://www.gov.uk/service-manual/design/writing-effective-letters">writing effective letters</a></li> -->
<li><a class="govuk-link govuk-link--no-visited-state" href="https://www.gov.uk/service-manual/technology/how-to-email-your-users">sending emails from your service domain</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="https://www.gov.uk/service-manual/technology/sending-text-messages-securely">sending text messages securely</a></li>
</ul>

12
app/templates/views/pricing/index.html
View File

@@ -22,10 +22,10 @@
<p class="govuk-body">US Notify is free to use unless you:</p>
<ul class="list list-bullet">
<li>exceed your <a class="govuk-link govuk-link--no-visited-state" href="#text-messages">free text message allowance</a></li>
<li>send <a class="govuk-link govuk-link--no-visited-state" href="#letters">letters</a></li>
<!-- <li>send <a class="govuk-link govuk-link--no-visited-state" href="#letters">letters</a></li> -->
</ul>
<p class="govuk-body">You’ll only pay for the additional text messages or letters that you send. There’s no monthly charge, no setup fee and no procurement cost.</p>
<p class="govuk-body">You’ll only pay for the additional text messages that you send. There’s no monthly charge, no setup fee and no procurement cost.</p>
<p class="govuk-body">
{% if not current_user.is_authenticated %}
@@ -229,7 +229,7 @@
"html": smsIntRates
}) }}
<h2 class="heading-medium" id="letters">Letters</h2>
<!-- <h2 class="heading-medium" id="letters">Letters</h2>
<p class="govuk-body">The cost of sending a letter depends on the postage you choose and how many sheets of paper you need.</p>
<p class="govuk-body">Prices include:</p>
@@ -238,9 +238,9 @@
<li>postage</li>
<li>double-sided colour printing</li>
<li>C5 size envelopes with an address window</li>
</ul>
</ul> -->
<div>
<!-- <div>
{% call mapping_table(
caption='Letter pricing',
field_headings=['Paper', 'Second class', 'First class', 'International'],
@@ -262,6 +262,6 @@
{% endcall %}
{% endfor %}
{% endcall %}
</div>
</div> -->
{% endblock %}

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

@@ -19,7 +19,7 @@
<h2 class="heading-medium" id="who-we-are">Who we are</h2>
<p class="govuk-body">US Notify is a service that lets public service teams in the UK send emails, text messages, and letters
<p class="govuk-body">US Notify is a service that lets public service teams in the United States send text messages
to users of their service.</p>
<p class="govuk-body">US Notify is provided by the Government Digital Service (GDS) which is part of the Cabinet Office.</p>

18
app/templates/views/signedout.html
View File

@@ -2,7 +2,7 @@
{% from "components/button/macro.njk" import govukButton %}
{% block meta %}
<meta name="description" content="US Notify lets you send emails, text messages and letters to your users. Try it now if you work in federal, state or local government.">
<meta name="description" content="US Notify lets you send text messages and email to your users. Try it now if you work in federal, state or local government.">
{% endblock %}
{% block pageTitle %}
@@ -26,7 +26,7 @@
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<h1>
Send emails, text messages and letters to your users
Send text messages and email to your users
</h1>
<p class="govuk-body">
Try US Notify now if you work in federal, state or local government.
@@ -115,16 +115,6 @@
</div>
</div>
</div>
<div class="product-page-section">
<h2 class="with-keyline">
Introducing US Notify
</h2>
<div class="responsive-embed responsive-embed--16by9 responsive-embed--bordered bottom-gutter-2">
<div class="responsive-embed__wrapper">
<iframe title="US Notify introduction video" width="560" height="315" src="https://www.youtube-nocookie.com/embed/_90cv1YgQo4" frameborder="0" allowfullscreen></iframe>
</div>
</div>
</div>
<div class="product-page-section">
<div class="with-keyline bottom-gutter-2" id="whos-using-notify">
<h2>Who’s using US Notify</h2>
@@ -147,7 +137,7 @@
</p>
</div>
</div>
<div class="product-page-section">
<!-- <div class="product-page-section">
<div class="with-keyline bottom-gutter-2">
<h2>Pricing</h2>
<div class="govuk-grid-row bottom-gutter">
@@ -176,7 +166,7 @@
</div>
</div>
</div>
</div>
</div> -->
<div class="product-page-section">
<div class="govuk-grid-row">
<div class="govuk-grid-column-one-half">

2
app/templates/views/trial-mode.html
View File

@@ -13,7 +13,7 @@
<ul class="list list-bullet">
<li>send 50 text messages and emails per day</li>
<li>send messages to yourself and other people in your team</li>
<li>create letter templates, but not send them</li>
<!-- <li>create letter templates, but not send them</li> -->
</ul>
{% if current_service and current_service.trial_mode %}

2
tests/app/main/views/test_feedback.py
View File

@@ -51,7 +51,7 @@ def test_get_support_index_page_when_signed_out(
assert normalize_spaces(
page.select_one('form label[for=who-0]').text
) == (
'I work in the public sector and need to send emails, text messages or letters'
'I work in the public sector and need to send emails or text messages'
)
assert page.select_one('form input#who-0')['value'] == 'public-sector'
assert normalize_spaces(

5
tests/app/main/views/test_index.py
View File

@@ -17,7 +17,7 @@ def test_non_logged_in_user_can_see_homepage(
page = client_request.get('main.index', _test_page_title=False)
assert page.h1.text.strip() == (
'Send emails, text messages and letters to your users'
'Send text messages and email to your users'
)
assert page.select_one('a[role=button][draggable=false]')['href'] == url_for(
@@ -25,7 +25,7 @@ def test_non_logged_in_user_can_see_homepage(
)
assert page.select_one('meta[name=description]')['content'].strip() == (
'US Notify lets you send emails, text messages and letters '
'US Notify lets you send text messages and email '
'to your users. Try it now if you work in federal, state or local government.'
)
@@ -360,6 +360,7 @@ def test_font_preload(
@pytest.mark.parametrize('current_date, expected_rate', (
('2022-05-01', '1.72'),
))
@pytest.mark.skip(reason="Currently hidden for TTS")
def test_sms_price(
client_request,
mock_get_service_and_organisation_counts,