From 246023616a7f3a25778dd37c17e2602f67b272d3 Mon Sep 17 00:00:00 2001 From: Henry Hadlow Date: Mon, 4 Apr 2016 15:22:30 +0100 Subject: [PATCH 1/4] Split Help page into Trial Mode and Pricing pages - Add routes - Add footer links - Make heading size consistent on Cookies page --- app/main/views/index.py | 11 ++- app/templates/admin_template.html | 3 +- app/templates/views/cookies.html | 2 +- app/templates/views/help.html | 123 ---------------------------- app/templates/views/pricing.html | 58 +++++++++++++ app/templates/views/trial-mode.html | 80 ++++++++++++++++++ 6 files changed, 149 insertions(+), 128 deletions(-) delete mode 100644 app/templates/views/help.html create mode 100644 app/templates/views/pricing.html create mode 100644 app/templates/views/trial-mode.html diff --git a/app/main/views/index.py b/app/main/views/index.py index 5ced0670a..774400fe4 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -23,9 +23,14 @@ def cookies(): return render_template('views/cookies.html') -@main.route('/help') -def help(): - return render_template('views/help.html') +@main.route('/trial-mode') +def trial_mode(): + return render_template('views/trial-mode.html') + + +@main.route('/pricing') +def pricing(): + return render_template('views/pricing.html') @main.route('/terms') diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index 60d8b4494..168525842 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -84,7 +84,8 @@

About

diff --git a/app/templates/views/cookies.html b/app/templates/views/cookies.html index 6337c1f77..32bf2a31a 100644 --- a/app/templates/views/cookies.html +++ b/app/templates/views/cookies.html @@ -8,7 +8,7 @@
-

Cookies

+

Cookies

GOV.UK Notify puts small files (known as ‘cookies’) on to your computer. diff --git a/app/templates/views/help.html b/app/templates/views/help.html deleted file mode 100644 index edc181e9c..000000000 --- a/app/templates/views/help.html +++ /dev/null @@ -1,123 +0,0 @@ -{% extends "withoutnav_template.html" %} - -{% block page_title %} - Help – GOV.UK Notify -{% endblock %} - -{% block maincolumn_content %} - -

-
-

Help

- -

Trial mode

- -

- When you create a service on GOV.UK Notify, you start off in trial - mode. This means: -

-
    -
  • - you can only send messages to yourself and your team members -
    • -
  • - you can only send 50 messages per day -
    • -
- -

- Anyone working in central government can create an account on - GOV.UK Notify and try it out. So it’s important that you start off - with some restrictions in place. -

- -

To remove these restrictions

- -

- You need to request to go live: -

-
    -
  • - You’ll need to agree to our terms of use -
    • -
  • - If you plan to send more than 250,000 text messages per year, you’ll - need to agree to pay for what you use – take a look at our pricing -
    • -
  • - We’ll check your templates to make sure they’re consistent with our - design patterns, style guide and information security principles -
    • -
- -

- All other aspects of GOV.UK Notify are exactly the same -

- -

- You can still: -

-
    -
  • - upload a batch of recipients -
    • -
  • - do an API integration -
    • -
- -

- We’ll send the messages you have permission to send. The messages you - don’t have permission to send will still be listed on your - GOV.UK Notify dashboard but won’t actually get sent. This means you - can check that everything is fully working without accidentally sending - hundreds of text messages or emails. -

- -

Pricing

- -

Emails

- -

- Sending email through GOV.UK Notify is completely free. -

- -

Text messages

- -
    -
  • Free allowance: 250,000 SMS per service, per financial year
    • -
  • Standard rate: 1.8 pence per SMS
    • -
  • Fail-over rate: 2.5 pence per SMS
    • -
- -

- You only pay the fail-over rate if we can’t deliver your text message - through our primary SMS provider. -

- -

- We simply charge you the costs we pay to our delivery partners. - We don’t mark these costs up in any way. -

- -

SMS and text message length

-
    -
  • Up to 160 characters = 1 SMS
    • -
  • Up to 306 characters = 2 SMS
    • -
  • Up to 459 characters = 3 SMS
    • -
- -

No monthly charge or setup fee

-

- There are no other charges for using Notify. There’s no monthly charge - or setup fee. -

- -

- The Government Digital Service is funding the development and running - of Notify. We’re also covering the cost of the free emails and text messages. -

-
-
- -{% endblock %} diff --git a/app/templates/views/pricing.html b/app/templates/views/pricing.html new file mode 100644 index 000000000..010dcf96e --- /dev/null +++ b/app/templates/views/pricing.html @@ -0,0 +1,58 @@ +{% extends "withoutnav_template.html" %} + +{% block page_title %} + Pricing – GOV.UK Notify +{% endblock %} + +{% block maincolumn_content %} + +
+
+

Pricing

+ +

Emails

+ +

+ Sending email through GOV.UK Notify is completely free. +

+ +

Text messages

+ +
    +
  • Free allowance: 250,000 SMS per service, per financial year
    • +
  • Standard rate: 1.8 pence per SMS
    • +
  • Fail-over rate: 2.5 pence per SMS
    • +
+ +

+ You only pay the fail-over rate if we can’t deliver your text message + through our primary SMS provider. +

+ +

+ We simply charge you the costs we pay to our delivery partners. + We don’t mark these costs up in any way. +

+ +

SMS and text message length

+
    +
  • Up to 160 characters = 1 SMS
    • +
  • Up to 306 characters = 2 SMS
    • +
  • Up to 459 characters = 3 SMS
    • +
+ +

No monthly charge or setup fee

+

+ There are no other charges for using Notify. There’s no monthly charge + or setup fee. +

+ +

+ The Government Digital Service is funding the development and running + of Notify. We’re also covering the cost of the free emails and text messages. +

+ +
+
+ +{% endblock %} diff --git a/app/templates/views/trial-mode.html b/app/templates/views/trial-mode.html new file mode 100644 index 000000000..47068ba7e --- /dev/null +++ b/app/templates/views/trial-mode.html @@ -0,0 +1,80 @@ +{% extends "withoutnav_template.html" %} + +{% block page_title %} + Trial mode – GOV.UK Notify +{% endblock %} + +{% block maincolumn_content %} + +
+
+

Trial mode

+ +

+ All new accounts on Notify start off in trial mode. +

+

+ This means: +

+
    +
  • + you can only send messages to yourself +
    • +
  • + you can add people to your team, then you can send messages to them too +
    • +
  • + you can only send 50 messages per day +
    • +
+ +

+ When you’re ready we can remove these restrictions. +

+ + + +
+
+ +{% endblock %} From c23e22a0dfbff7ff670eabcff921fec15aed618f Mon Sep 17 00:00:00 2001 From: Henry Hadlow Date: Mon, 4 Apr 2016 15:29:54 +0100 Subject: [PATCH 2/4] Fix tests -- update link on Request to go live page --- app/templates/views/service-settings/request-to-go-live.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/service-settings/request-to-go-live.html b/app/templates/views/service-settings/request-to-go-live.html index 395c09e81..c8a45b5b3 100644 --- a/app/templates/views/service-settings/request-to-go-live.html +++ b/app/templates/views/service-settings/request-to-go-live.html @@ -18,7 +18,7 @@
  • You’ll need to agree to our terms of use
    • -
  • If you plan to send more than 250,000 text messages per year, you’ll need to agree to pay for what you use – take a look at our pricing
    • +
  • If you plan to send more than 250,000 text messages per year, you’ll need to agree to pay for what you use – take a look at our pricing
  • We’ll check your templates to make sure they’re consistent with our design patterns, style guide and information security principles
From ac576c652959dae634a381c51d021073aa653a5f Mon Sep 17 00:00:00 2001 From: Henry Hadlow Date: Mon, 4 Apr 2016 15:22:30 +0100 Subject: [PATCH 3/4] Split Help page into Trial Mode and Pricing pages - Add routes - Add footer links - Make heading size consistent on Cookies page --- app/main/views/index.py | 11 +- app/templates/admin_template.html | 3 +- app/templates/views/cookies.html | 2 +- .../views/dashboard/trial-mode-banner.html | 2 +- app/templates/views/help.html | 123 ------------------ app/templates/views/pricing.html | 58 +++++++++ .../service-settings/request-to-go-live.html | 2 +- app/templates/views/trial-mode.html | 80 ++++++++++++ 8 files changed, 151 insertions(+), 130 deletions(-) delete mode 100644 app/templates/views/help.html create mode 100644 app/templates/views/pricing.html create mode 100644 app/templates/views/trial-mode.html diff --git a/app/main/views/index.py b/app/main/views/index.py index 5ced0670a..774400fe4 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -23,9 +23,14 @@ def cookies(): return render_template('views/cookies.html') -@main.route('/help') -def help(): - return render_template('views/help.html') +@main.route('/trial-mode') +def trial_mode(): + return render_template('views/trial-mode.html') + + +@main.route('/pricing') +def pricing(): + return render_template('views/pricing.html') @main.route('/terms') diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index 60d8b4494..168525842 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -84,7 +84,8 @@

About

diff --git a/app/templates/views/cookies.html b/app/templates/views/cookies.html index 6337c1f77..32bf2a31a 100644 --- a/app/templates/views/cookies.html +++ b/app/templates/views/cookies.html @@ -8,7 +8,7 @@
-

Cookies

+

Cookies

GOV.UK Notify puts small files (known as ‘cookies’) on to your computer. diff --git a/app/templates/views/dashboard/trial-mode-banner.html b/app/templates/views/dashboard/trial-mode-banner.html index 2265c1d10..44d02571e 100644 --- a/app/templates/views/dashboard/trial-mode-banner.html +++ b/app/templates/views/dashboard/trial-mode-banner.html @@ -7,7 +7,7 @@ Your service is in trial mode

- +
{% endcall %} diff --git a/app/templates/views/help.html b/app/templates/views/help.html deleted file mode 100644 index edc181e9c..000000000 --- a/app/templates/views/help.html +++ /dev/null @@ -1,123 +0,0 @@ -{% extends "withoutnav_template.html" %} - -{% block page_title %} - Help – GOV.UK Notify -{% endblock %} - -{% block maincolumn_content %} - -
-
-

Help

- -

Trial mode

- -

- When you create a service on GOV.UK Notify, you start off in trial - mode. This means: -

-
    -
  • - you can only send messages to yourself and your team members -
    • -
  • - you can only send 50 messages per day -
    • -
- -

- Anyone working in central government can create an account on - GOV.UK Notify and try it out. So it’s important that you start off - with some restrictions in place. -

- -

To remove these restrictions

- -

- You need to request to go live: -

-
    -
  • - You’ll need to agree to our terms of use -
    • -
  • - If you plan to send more than 250,000 text messages per year, you’ll - need to agree to pay for what you use – take a look at our pricing -
    • -
  • - We’ll check your templates to make sure they’re consistent with our - design patterns, style guide and information security principles -
    • -
- -

- All other aspects of GOV.UK Notify are exactly the same -

- -

- You can still: -

-
    -
  • - upload a batch of recipients -
    • -
  • - do an API integration -
    • -
- -

- We’ll send the messages you have permission to send. The messages you - don’t have permission to send will still be listed on your - GOV.UK Notify dashboard but won’t actually get sent. This means you - can check that everything is fully working without accidentally sending - hundreds of text messages or emails. -

- -

Pricing

- -

Emails

- -

- Sending email through GOV.UK Notify is completely free. -

- -

Text messages

- -
    -
  • Free allowance: 250,000 SMS per service, per financial year
    • -
  • Standard rate: 1.8 pence per SMS
    • -
  • Fail-over rate: 2.5 pence per SMS
    • -
- -

- You only pay the fail-over rate if we can’t deliver your text message - through our primary SMS provider. -

- -

- We simply charge you the costs we pay to our delivery partners. - We don’t mark these costs up in any way. -

- -

SMS and text message length

-
    -
  • Up to 160 characters = 1 SMS
    • -
  • Up to 306 characters = 2 SMS
    • -
  • Up to 459 characters = 3 SMS
    • -
- -

No monthly charge or setup fee

-

- There are no other charges for using Notify. There’s no monthly charge - or setup fee. -

- -

- The Government Digital Service is funding the development and running - of Notify. We’re also covering the cost of the free emails and text messages. -

-
-
- -{% endblock %} diff --git a/app/templates/views/pricing.html b/app/templates/views/pricing.html new file mode 100644 index 000000000..010dcf96e --- /dev/null +++ b/app/templates/views/pricing.html @@ -0,0 +1,58 @@ +{% extends "withoutnav_template.html" %} + +{% block page_title %} + Pricing – GOV.UK Notify +{% endblock %} + +{% block maincolumn_content %} + +
+
+

Pricing

+ +

Emails

+ +

+ Sending email through GOV.UK Notify is completely free. +

+ +

Text messages

+ +
    +
  • Free allowance: 250,000 SMS per service, per financial year
    • +
  • Standard rate: 1.8 pence per SMS
    • +
  • Fail-over rate: 2.5 pence per SMS
    • +
+ +

+ You only pay the fail-over rate if we can’t deliver your text message + through our primary SMS provider. +

+ +

+ We simply charge you the costs we pay to our delivery partners. + We don’t mark these costs up in any way. +

+ +

SMS and text message length

+
    +
  • Up to 160 characters = 1 SMS
    • +
  • Up to 306 characters = 2 SMS
    • +
  • Up to 459 characters = 3 SMS
    • +
+ +

No monthly charge or setup fee

+

+ There are no other charges for using Notify. There’s no monthly charge + or setup fee. +

+ +

+ The Government Digital Service is funding the development and running + of Notify. We’re also covering the cost of the free emails and text messages. +

+ +
+
+ +{% endblock %} diff --git a/app/templates/views/service-settings/request-to-go-live.html b/app/templates/views/service-settings/request-to-go-live.html index 395c09e81..c8a45b5b3 100644 --- a/app/templates/views/service-settings/request-to-go-live.html +++ b/app/templates/views/service-settings/request-to-go-live.html @@ -18,7 +18,7 @@
  • You’ll need to agree to our terms of use
    • -
  • If you plan to send more than 250,000 text messages per year, you’ll need to agree to pay for what you use – take a look at our pricing
    • +
  • If you plan to send more than 250,000 text messages per year, you’ll need to agree to pay for what you use – take a look at our pricing
  • We’ll check your templates to make sure they’re consistent with our design patterns, style guide and information security principles
diff --git a/app/templates/views/trial-mode.html b/app/templates/views/trial-mode.html new file mode 100644 index 000000000..47068ba7e --- /dev/null +++ b/app/templates/views/trial-mode.html @@ -0,0 +1,80 @@ +{% extends "withoutnav_template.html" %} + +{% block page_title %} + Trial mode – GOV.UK Notify +{% endblock %} + +{% block maincolumn_content %} + +
+
+

Trial mode

+ +

+ All new accounts on Notify start off in trial mode. +

+

+ This means: +

+
    +
  • + you can only send messages to yourself +
    • +
  • + you can add people to your team, then you can send messages to them too +
    • +
  • + you can only send 50 messages per day +
    • +
+ +

+ When you’re ready we can remove these restrictions. +

+ + + +
+
+ +{% endblock %} From 19c01101c32bc1c86d41ee7117546544cdaf7b3f Mon Sep 17 00:00:00 2001 From: Henry Hadlow Date: Mon, 4 Apr 2016 16:28:21 +0100 Subject: [PATCH 4/4] Remove commented content -- still in git history --- app/templates/views/trial-mode.html | 42 ----------------------------- 1 file changed, 42 deletions(-) diff --git a/app/templates/views/trial-mode.html b/app/templates/views/trial-mode.html index 47068ba7e..6e90318cb 100644 --- a/app/templates/views/trial-mode.html +++ b/app/templates/views/trial-mode.html @@ -32,48 +32,6 @@ When you’re ready we can remove these restrictions.

- -