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 pull request #3060 from alphagov/agreement-new-content

Browse Source 
Data sharing and financial agreement content
This commit is contained in:
Chris Hill-Scott
2019-07-19 16:43:16 +01:00
committed by GitHub
parent 753d8a174a 19fd89a2ee
commit bb99ff27c9
7 changed files with 43 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/main/forms.py
View File

@@ -1487,26 +1487,26 @@ class AcceptAgreementForm(StripWhitespaceForm):
)
version = StringField(
'Which version of the agreement are you accepting?'
'Which version of the agreement do you want to accept?'
)
who = RadioField(
'Who is accepting the agreement?',
'Who are you accepting the agreement for?',
choices=(
(
'me',
'I’m accepting the agreement',
'Yourself',
),
(
'someone-else',
'I’m accepting the agreement on behalf of someone else',
'Someone else',
),
),
validators=[DataRequired()],
)
on_behalf_of_name = StringField(
'Who are you accepting the agreement on behalf of?'
'What’s their name?'
)
on_behalf_of_email = email_address(

7
app/templates/views/agreement/agreement-accept.html
View File

@@ -7,7 +7,7 @@
{% from "components/page-header.html" import page_header %}
{% block per_page_title %}
Accept data sharing and financial agreement
Accept the data sharing and financial agreement
{% endblock %}
{% block maincolumn_content %}
@@ -16,13 +16,12 @@
<div class="column-five-sixths">
{{ page_header(
'Accept data sharing and financial agreement',
'Accept the data sharing and financial agreement',
back_link=url_for('main.service_agreement', service_id=current_service.id)
) }}
{% call form_wrapper(class='top-gutter') %}
{{ textbox(form.version, width='1-3', hint='The version number is on the front page, for example ‘3.6’') }}
{% call select_wrapper(form.who) %}
{% for option in form.who %}
{{ radio(option, data_target='on-behalf-of' if option.data == 'someone-else' else None) }}
@@ -32,6 +31,8 @@
{{ textbox(form.on_behalf_of_name, width='1-1') }}
{{ textbox(form.on_behalf_of_email, width='1-1') }}
</div>
{{ textbox(form.version, width='1-3', hint='The version number is on the front page, for example ‘3.6’') }}
{{ page_footer('Continue') }}
{% endcall %}

4
app/templates/views/agreement/agreement-confirm.html
View File

@@ -4,7 +4,7 @@
{% from "components/page-header.html" import page_header %}
{% block per_page_title %}
GOV.UK Notify data sharing and financial agreement
Confirm that you accept the agreement
{% endblock %}
{% block maincolumn_content %}
@@ -13,7 +13,7 @@
<div class="column-five-sixths">
{{ page_header(
'GOV.UK Notify data sharing and financial agreement',
'Confirm that you accept the agreement',
back_link=url_for('main.service_accept_agreement', service_id=current_service.id)
) }}

15
app/templates/views/agreement/service-agreement-choose.html
View File

@@ -2,7 +2,7 @@
{% from "components/page-header.html" import page_header %}
{% block service_page_title %}
GOV.UK Notify data sharing and financial agreement
Accept the data sharing and financial agreement
{% endblock %}
{% block maincolumn_content %}
@@ -11,19 +11,24 @@
<div class="column-five-sixths">
{{ page_header(
'GOV.UK Notify data sharing and financial agreement',
'Accept the data sharing and financial agreement',
back_link=url_for('main.request_to_go_live', service_id=current_service.id)
)}}
<p>
Before you can go live on GOV.UK Notify, your organisation needs to
accept to our data sharing and financial agreement.
Before you can use GOV.UK Notify, you need to accept our data sharing and financial agreement.
</p>
<p>
This must be done by, or on behalf of, someone with the authority to sign contracts for your organisation.
</p>
<p>
Once accepted, the agreement covers all Notify services from your organisation.
</p>
<p>
There are different agreements for crown and non-crown organisations.
</p>
<p>
<a href="{{ url_for('main.support') }}">Get in touch</a> to tell us
<a href="{{ url_for('main.support') }}">Contact us</a> to tell us
whether or not you work for a crown organisation. If you’re not sure
we’ll help you work it out.
</p>

13
app/templates/views/agreement/service-agreement-signed.html
View File

@@ -2,7 +2,7 @@
{% from "components/page-header.html" import page_header %}
{% block service_page_title %}
GOV.UK Notify data sharing and financial agreement
Your organisation has already accepted the agreement
{% endblock %}
{% block maincolumn_content %}
@@ -11,17 +11,18 @@
<div class="column-five-sixths">
{{ page_header(
'GOV.UK Notify data sharing and financial agreement',
'Your organisation has already accepted the agreement',
back_link=url_for('main.request_to_go_live', service_id=current_service.id)
)}}
<p>
Your organisation ({{ current_service.organisation.name }}) has already accepted the GOV.UK
Notify data sharing and financial agreement. You can
<a href="{{ url_for('main.service_download_agreement', service_id=current_service.id) }}">download a copy</a>.
{{ current_service.organisation.name }} has already accepted the GOV.UK
Notify data sharing and financial agreement.
</p>
<p>For more information, you can <a href="{{ url_for('main.service_download_agreement', service_id=current_service.id) }}">download a copy of the agreement</a>.
</p>
<p>
The agreement contains commercially sensitive information, so don’t share it more widely than you need to.
The agreement is confidential and should not be shared outside your organisation.
</p>
</div>

15
app/templates/views/agreement/service-agreement.html
View File

@@ -2,7 +2,7 @@
{% from "components/page-header.html" import page_header %}
{% block service_page_title %}
GOV.UK Notify data sharing and financial agreement
Accept the data sharing and financial agreement
{% endblock %}
{% block maincolumn_content %}
@@ -11,25 +11,24 @@
<div class="column-five-sixths">
{{ page_header(
'GOV.UK Notify data sharing and financial agreement',
'Accept the data sharing and financial agreement',
back_link=url_for('main.request_to_go_live', service_id=current_service.id)
)}}
<p>
To use GOV.UK Notify your organisation ({{ current_service.organisation.name }}) must accept the GOV.UK Notify data sharing and financial agreement.
Before you can use GOV.UK Notify, you need to accept our data sharing and financial agreement.
</p>
<p>
This agreement only needs to be accepted once and will then cover all Notify services from
{{ current_service.organisation.name }}.
This must be done by, or on behalf of, someone with the authority to sign contracts for {{ current_service.organisation.name }}.
</p>
<p>
It needs to be accepted by, or on behalf of someone who can sign contracts for your organisation.
Once accepted, the agreement covers all Notify services from {{ current_service.organisation.name }}.
</p>
<p>
<a href="{{ url_for('main.service_download_agreement', service_id=current_service.id) }}">Download a copy of the agreement</a>.
<a href="{{ url_for('main.service_download_agreement', service_id=current_service.id) }}">Download a copy of the data sharing and financial agreement</a>.
</p>
<p>
The agreement contains commercially sensitive information, so don’t share it more widely than you need to.
The agreement is confidential and should not be shared outside your organisation.
</p>
<a href="{{ url_for('main.service_accept_agreement', service_id=current_service.id) }}" class="button">Continue</a>