- Before you can go live on GOV.UK Notify, your organisation needs to - accept to our data sharing and financial agreement. -
-- There are different agreements for crown and non-crown organisations. -
-- Get in touch to tell us - whether or not you work for a crown organisation. If you’re not sure - we’ll help you work it out. -
diff --git a/app/templates/views/agreement/_agreement-signed.html b/app/templates/views/agreement/_agreement-signed.html deleted file mode 100644 index e46564575..000000000 --- a/app/templates/views/agreement/_agreement-signed.html +++ /dev/null @@ -1,8 +0,0 @@ -- Your organisation ({{ current_service.organisation.name }}) has already accepted the GOV.UK - Notify data sharing and financial agreement. You can - download a copy. -
-- The agreement contains commercially sensitive information, so don’t share it more widely than you need to. -
diff --git a/app/templates/views/agreement/_agreement.html b/app/templates/views/agreement/_agreement.html deleted file mode 100644 index 2f79f7ab1..000000000 --- a/app/templates/views/agreement/_agreement.html +++ /dev/null @@ -1,17 +0,0 @@ -- To use GOV.UK Notify your organisation ({{ current_service.organisation.name }}) must accept the GOV.UK Notify data sharing and financial agreement. -
-- This agreement only needs to be accepted once and will then cover all Notify services from - {{ current_service.organisation.name }}. -
-- It needs to be accepted by, or on behalf of someone who can sign contracts for your organisation. -
-- Download a copy of the agreement. -
-- The agreement contains commercially sensitive information, so don’t share it more widely than you need to. -
-Continue diff --git a/app/templates/views/agreement/agreement-choose.html b/app/templates/views/agreement/agreement-choose.html deleted file mode 100644 index 9f0d6ae5f..000000000 --- a/app/templates/views/agreement/agreement-choose.html +++ /dev/null @@ -1,25 +0,0 @@ -{% extends "withoutnav_template.html" %} -{% from "components/sub-navigation.html" import sub_navigation %} - -{% block per_page_title %} - GOV.UK Notify data sharing and financial agreement -{% endblock %} - -{% block maincolumn_content %} - -+ Before you can go live on GOV.UK Notify, your organisation needs to + accept to our data sharing and financial agreement. +
++ There are different agreements for crown and non-crown organisations. +
++ Get in touch to tell us + whether or not you work for a crown organisation. If you’re not sure + we’ll help you work it out. +
diff --git a/app/templates/views/agreement/service-agreement-signed.html b/app/templates/views/agreement/service-agreement-signed.html index 9dac55925..09300bcfe 100644 --- a/app/templates/views/agreement/service-agreement-signed.html +++ b/app/templates/views/agreement/service-agreement-signed.html @@ -15,7 +15,14 @@ back_link=url_for('main.request_to_go_live', service_id=current_service.id) )}} - {% include 'views/agreement/_agreement-signed.html' %} ++ Your organisation ({{ current_service.organisation.name }}) has already accepted the GOV.UK + Notify data sharing and financial agreement. You can + download a copy. +
++ The agreement contains commercially sensitive information, so don’t share it more widely than you need to. +
diff --git a/app/templates/views/agreement/service-agreement.html b/app/templates/views/agreement/service-agreement.html index 2d147154d..ee6ad6f22 100644 --- a/app/templates/views/agreement/service-agreement.html +++ b/app/templates/views/agreement/service-agreement.html @@ -15,7 +15,23 @@ back_link=url_for('main.request_to_go_live', service_id=current_service.id) )}} - {% include 'views/agreement/_agreement.html'%} ++ To use GOV.UK Notify your organisation ({{ current_service.organisation.name }}) must accept the GOV.UK Notify data sharing and financial agreement. +
++ This agreement only needs to be accepted once and will then cover all Notify services from + {{ current_service.organisation.name }}. +
++ It needs to be accepted by, or on behalf of someone who can sign contracts for your organisation. +
++ Download a copy of the agreement. +
++ The agreement contains commercially sensitive information, so don’t share it more widely than you need to. +
+ Continue