darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-06-03 13:00:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Re-integrate partials

Browse Source 
Now that the content in these partials is only used on one page per
partial they no longer need to be partials. This commit re-integrates
them into the pages that were including them, making the content easier
to manage.
This commit is contained in:
Chris Hill-Scott
2019-07-15 10:51:15 +01:00
parent a256b9c33a
commit bc5d03ff22
8 changed files with 37 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/templates/views/agreement/_agreement-choose.html
View File

@@ -1,12 +0,0 @@
<p>
Before you can go live on GOV.UK Notify, your organisation needs to
accept to our data sharing and financial agreement.
</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
whether or not you work for a crown organisation. If you’re not sure
we’ll help you work it out.
</p>

8
app/templates/views/agreement/_agreement-signed.html
View File

@@ -1,8 +0,0 @@
<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>.
</p>
<p>
The agreement contains commercially sensitive information, so don’t share it more widely than you need to.
</p>

17
app/templates/views/agreement/_agreement.html
View File

@@ -1,17 +0,0 @@
<p>
To use GOV.UK Notify your organisation ({{ current_service.organisation.name }}) must accept the GOV.UK Notify 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 }}.
</p>
<p>
It needs to be accepted by, or on behalf of someone who can sign contracts for your organisation.
</p>
<p>
<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.
</p>
<a href="{{ url_for('main.service_accept_agreement', service_id=current_service.id) }}" class="button">Continue</a>

25
app/templates/views/agreement/agreement-choose.html
View File

@@ -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 %}
<div class="grid-row">
<div class="column-one-third">
{{ sub_navigation(navigation_links) }}
</div>
<div class="column-two-thirds">
<h1 class="heading-large">
GOV.UK Notify data sharing and financial agreement
</h1>
{% include 'views/agreement/_agreement-choose.html'%}
</div>
</div>
{% endblock %}

25
app/templates/views/agreement/agreement-signed.html
View File

@@ -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 %}
<div class="grid-row">
<div class="column-one-third">
{{ sub_navigation(navigation_links) }}
</div>
<div class="column-two-thirds">
<h1 class="heading-large">
GOV.UK Notify data sharing and financial agreement
</h1>
{% include 'views/agreement/_agreement-signed.html' %}
</div>
</div>
{% endblock %}

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

@@ -15,7 +15,18 @@
back_link=url_for('main.request_to_go_live', service_id=current_service.id)
)}}
{% include 'views/agreement/_agreement-choose.html'%}
<p>
Before you can go live on GOV.UK Notify, your organisation needs to
accept to our data sharing and financial agreement.
</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
whether or not you work for a crown organisation. If you’re not sure
we’ll help you work it out.
</p>
</div>
</div>

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

@@ -15,7 +15,14 @@
back_link=url_for('main.request_to_go_live', service_id=current_service.id)
)}}
{% include 'views/agreement/_agreement-signed.html' %}
<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>.
</p>
<p>
The agreement contains commercially sensitive information, so don’t share it more widely than you need to.
</p>
</div>
</div>

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

@@ -15,7 +15,23 @@
back_link=url_for('main.request_to_go_live', service_id=current_service.id)
)}}
{% include 'views/agreement/_agreement.html'%}
<p>
To use GOV.UK Notify your organisation ({{ current_service.organisation.name }}) must accept the GOV.UK Notify 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 }}.
</p>
<p>
It needs to be accepted by, or on behalf of someone who can sign contracts for your organisation.
</p>
<p>
<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.
</p>
<a href="{{ url_for('main.service_accept_agreement', service_id=current_service.id) }}" class="button">Continue</a>
</div>
</div>