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

Updating site to use USWDS styles (#509)

Browse Source 
* Updated header and footer
* Updated fonts
* Moved files around and updated gulpfile to correct the build process when it goes to production
* Adjusted grid templating
* Added images to assets
* Update app/templates/components/uk_components/footer/template.njk

Co-authored-by: Steven Reilly <stvnrlly@users.noreply.github.com>
This commit is contained in:
Jonathan Bobel
2023-06-06 15:28:24 -04:00
committed by GitHub
parent ff350fee00
commit f342e0fb6c
152 changed files with 1094 additions and 716 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/templates/views/pricing/billing-details-signed-out.html
View File

@@ -9,7 +9,7 @@
{{ page_header('Billing details') }}
<p class="govuk-body">
<p>
<a class="govuk-link" href="{{ url_for('.sign_in', next=url_for('.billing_details')) }}">Sign in</a> to see our:
</p>
@@ -19,7 +19,7 @@
<li>invoice address</li>
</ul>
<p class="govuk-body">
<p>
You can use this information to add the Cabinet Office as a supplier. Your organization may need to do this before you can raise a purchase order.
</p>

28
app/templates/views/pricing/billing-details.html
View File

@@ -11,11 +11,11 @@
{{ page_header('Billing details') }}
<p class="govuk-body">
<p>
You can use the information on this page to add the Cabinet Office as a supplier. Your organization may need to do this before you can raise a purchase order (PO).
</p>
<p class="govuk-body">
<p>
<a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.support') }}">Contact us</a> if you need any other details.
</p>
@@ -23,18 +23,18 @@
Supplier details
</h2>
<p class="govuk-body">
<p>
Cabinet Office
</p>
<p class="govuk-body">
<p>
The White Chapel Building <br>
10 Whitechapel High Street <br>
London <br>
E1 8QS
</p>
<h3 class="heading-small" id="email-addresses">
<h3 class="font-body-lg" id="email-addresses">
Email addresses
</h3>
@@ -46,7 +46,7 @@
{% endfor %}
</ul>
<h3 class="heading-small" id="vat-number">
<h3 class="font-body-lg" id="vat-number">
<abbr title="Value Added Tax">VAT</abbr> number
</h3>
@@ -61,7 +61,7 @@
Bank details
</h2>
<p class="govuk-body">
<p>
National Westminster Bank PLC (part of RBS group) <br>
Government Banking Services Branch <br>
2nd Floor <br>
@@ -70,15 +70,15 @@
EC2M 4RB
</p>
<h3 class="heading-small" id="account-name">
<h3 class="font-body-lg" id="account-name">
Account name
</h3>
<p class="govuk-body">
<p>
Cabinet Office
</p>
<h3 class="heading-small" id="account-number">
<h3 class="font-body-lg" id="account-number">
Account number
</h3>
@@ -89,7 +89,7 @@
) }}
</div>
<h3 class="heading-small" id="sort-code">
<h3 class="font-body-lg" id="sort-code">
Sort code
</h3>
@@ -101,7 +101,7 @@
</div>
<h3 class="heading-small" id="iban">
<h3 class="font-body-lg" id="iban">
<abbr title="International Bank Account Number">IBAN</abbr>
</h3>
<div class="govuk-!-margin-bottom-4">
@@ -111,7 +111,7 @@
) }}
</div>
<h3 class="heading-small" id="swift-code">
<h3 class="font-body-lg" id="swift-code">
Swift code
</h3>
@@ -126,7 +126,7 @@
Invoice address
</h2>
<p class="govuk-body">
<p>
SSCL – Accounts Receivable <br>
PO Box 221 <br>
Thornton-Cleveleys <br>

24
app/templates/views/pricing/how-to-pay.html
View File

@@ -9,19 +9,19 @@
{{ page_header('How to pay') }}
<!-- <p class="govuk-body">
<!-- <p>
If you use U.S. Notify to send text messages, you may need to send us a <a class="govuk-link govuk-link--no-visited-state" href="#purchase-orders">purchase order</a>.
</p>
<h2 class="heading-medium" id="invoices">
<h2 class="font-body-lg" id="invoices">
Invoices
</h2>
<p class="govuk-body">
<p>
Notify is run by the Government Digital Service (GDS), part of the Cabinet Office.
</p>
<p class="govuk-body">
<p>
The Cabinet Office will send your organization an invoice each quarter if you:
</p>
@@ -29,35 +29,35 @@
<li>exceed the <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.pricing') }}">free text message allowance</a></li>
</ul>
<p class="govuk-body">
<p>
If your organization has more than one Notify service, you’ll see a breakdown of each service on your invoice.
</p>
<p class="govuk-body">
<p>
If the value of an invoice is less than £250 (before <abbr title="Value Added Tax">VAT</abbr>), it will be added to the total for the next quarter to save time and effort.
</p>
<p class="govuk-body">
<p>
You can pay by BACS, debit card, or credit card.
</p>
<p class="govuk-body">
<p>
Please start your payment reference with the invoice number.
</p>
<h2 class="heading-medium" id="purchase-orders">
<h2 class="font-body-lg" id="purchase-orders">
Purchase orders
</h2>
<p class="govuk-body">
<p>
If your organization’s total estimated spend is more than £500 per quarter (before <abbr title="Value Added Tax">VAT</abbr>), you need to raise a purchase order (PO).
</p>
<p class="govuk-body">
<p>
Your organization should raise a single <abbr title="purchase order">PO</abbr> for the estimated cost of all its services. You can update the <abbr title="purchase order">PO</abbr> any time if your usage increases.
</p>
<p class="govuk-body">
<p>
Your organization may need to <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.billing_details') }}">add the Cabinet Office as a supplier</a> before you can raise a <abbr title="purchase order">PO</abbr>.
</p> -->

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

@@ -11,7 +11,7 @@
{% block content_column_content %}
<h1 class="heading-large">Pricing</h1>
<h1 class="font-body-2xl margin-bottom-3">Pricing</h1>
{{ content_metadata(
data={
@@ -19,14 +19,14 @@
}
) }}
<p class="govuk-body">U.S. Notify is free to use unless you:</p>
<p>U.S. 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>
</ul>
<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>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">
<p>
{% if not current_user.is_authenticated %}
<a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.register') }}">Create an account,</a> then add your unique service(s).</p>
{% else %}
@@ -34,36 +34,36 @@
{% endif %}
</p>
<p class="govuk-body">When you add a new service it will start in <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.trial_mode_new') }}">trial mode</a>.</p>
<p>When you add a new service it will start in <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.trial_mode_new') }}">trial mode</a>.</p>
<!-- <h2 class="heading-medium" id="emails">Emails</h2>
<p class="govuk-body">It’s free to send emails through Notify.</p> -->
<!-- <h2 class="font-body-lg" id="emails">Emails</h2>
<p>It’s free to send emails through Notify.</p> -->
<h2 class="heading-medium" id="text-messages">Text messages</h2>
<p class="govuk-body">During pilot phase, each service has an annual allowance of 250,000 free text messages. Once this allowance is met, the application will stop delivering messages.</p>
<!-- <p class="govuk-body">When a service has used its annual allowance, it costs {{ sms_rate }} pence (plus VAT) for each text message you send.</p> -->
<p class="govuk-body">You’ll use more messages towards the allowance, if you send <a class="govuk-link govuk-link--no-visited-state" href="#long-text-messages">text messages longer than 160 characters</a>.</p>
<p class="govuk-body">You may also use more messages if you:</p>
<h2 class="font-body-lg" id="text-messages">Text messages</h2>
<p>During pilot phase, each service has an annual allowance of 250,000 free text messages. Once this allowance is met, the application will stop delivering messages.</p>
<!-- <p>When a service has used its annual allowance, it costs {{ sms_rate }} pence (plus VAT) for each text message you send.</p> -->
<p>You’ll use more messages towards the allowance, if you send <a class="govuk-link govuk-link--no-visited-state" href="#long-text-messages">text messages longer than 160 characters</a>.</p>
<p>You may also use more messages if you:</p>
<ul class="list list-bullet">
<li>use certain <a class="govuk-link govuk-link--no-visited-state" href="#symbols">signs and symbols</a></li>
<li>use <a class="govuk-link govuk-link--no-visited-state" href="#accents">accents and accented letters</a></li>
<li>send text messages to <a class="govuk-link govuk-link--no-visited-state" href="#international-numbers">international numbers</a></li>
</ul>
<!-- <p class="govuk-body">See <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.how_to_pay') }}">how to pay</a>.
<!-- <p>See <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.how_to_pay') }}">how to pay</a>.
<h3 class="heading-small" id="free-text-message-allowance">Free text message allowance</h3>
<h3 class="font-body-lg" id="free-text-message-allowance">Free text message allowance</h3>
<p class="govuk-body">The current allowance is:</p>
<p>The current allowance is:</p>
<ul class="list list-bullet">
<li>40,000 free text messages for national services</li>
<li>20,000 free text messages for regional services</li>
<li>10,000 free text messages for state-funded schools and GP practices</li>
</ul>
<p class="govuk-body">Each unique service you add has a separate allowance.</p> -->
<p>Each unique service you add has a separate allowance.</p> -->
<h3 class="heading-small" id="long-text-messages">Long text messages</h3>
<p class="govuk-body">If a text message is longer than 160 characters (including spaces), it counts as more than one message.</p>
<h3 class="font-body-lg" id="long-text-messages">Long text messages</h3>
<p>If a text message is longer than 160 characters (including spaces), it counts as more than one message.</p>
<div class="bottom-gutter-3-2">
{% call mapping_table(
@@ -88,19 +88,19 @@
{% endcall %}
</div>
<h3 class="heading-small" id="symbols">Signs and symbols</h3>
<h3 class="font-body-lg" id="symbols">Signs and symbols</h3>
<p class="govuk-body">
<p>
The following signs and symbols count as 2 characters each:<br />
<span class="extended-gsm-characters">[]{}^\|~$</span>
</p>
<p class="govuk-body">Using them can increase the cost of sending text messages.</p>
<p>Using them can increase the cost of sending text messages.</p>
<h3 class="heading-small" id="accents">Accents and accented characters</h3>
<p class="govuk-body">Some languages use accented characters.</p>
<p class="govuk-body">The following accented characters do not affect the cost of sending text messages: Ä, É, Ö, Ü, à, ä, é, è, ì, ò, ö, ù, ü.</p>
<p class="govuk-body">Using other accented characters can increase the cost of sending text messages.<p class="govuk-body">
<h3 class="font-body-lg" id="accents">Accents and accented characters</h3>
<p>Some languages use accented characters.</p>
<p>The following accented characters do not affect the cost of sending text messages: Ä, É, Ö, Ü, à, ä, é, è, ì, ò, ö, ù, ü.</p>
<p>Using other accented characters can increase the cost of sending text messages.<p>
{% set accentedChars %}
<div class="bottom-gutter-3-2">
{% call mapping_table(
@@ -189,8 +189,8 @@
{% endcall %}
</div>
<h3 class="heading-small" id="international-numbers">Sending text messages to international numbers</h3>
<p class="govuk-body">It might cost more to send text messages to international numbers than U.S. ones, depending on the country.</p>
<h3 class="font-body-lg" id="international-numbers">Sending text messages to international numbers</h3>
<p>It might cost more to send text messages to international numbers than U.S. ones, depending on the country.</p>
<!-- {% set smsIntRates %}
{{ live_search(target_selector='#international-pricing .table-row', show=True, form=search_form, label='Search by country name or code') }}