Skip to content

Commit

Permalink
Merge pull request #81 from DFE-Digital/content-tweaks
Browse files Browse the repository at this point in the history 
Minor content changes
  • Loading branch information
@slawosz
slawosz authored Nov 16, 2023
2 parents 1934737 + f69b829 commit 9b61558
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 33 deletions.
20 changes: 5 additions & 15 deletions app/views/pages/cookies_policy.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
</p>

<p class="govuk-body">
We use cookies to make the Find a teaching school hub service (the service) work and collect information about how you use our service.
We use cookies to make the ‘Find a teaching school hub’ service work and collect information about how you use the service.
</p>

<h2 class="govuk-heading-m">Essential cookies</h2>

<p class="govuk-body">
Essential cookies keep your information secure while you use the service. We do not need to ask permission to use them.
Essential cookies keep your information secure while you use the service. We do not need to ask for your permission to use them.
</p>

<table class="govuk-table">
Expand All @@ -37,11 +37,6 @@
</tr>
</thead>
<tbody class="govuk-table__body">
<tr class="govuk-table__row">
<td class="govuk-table__cell">_tshf_session</td>
<td class="govuk-table__cell" width="50%">Used to keep you signed in and store application details</td>
<td class="govuk-table__cell">2 weeks</td>
</tr>

<tr class="govuk-table__row">
<td class="govuk-table__cell">consented-to-cookies</td>
Expand All @@ -60,7 +55,7 @@
<h2 class="govuk-heading-m ">Analytics cookies (optional)</h2>

<p class="govuk-body">
With your permission, we use Google Analytics to collect data about how you use the service. This information helps us to improve our service.
With your permission, we use Google Analytics to collect data about how you use the service. This information helps us to improve the service.
</p>

<p class="govuk-body">
Expand Down Expand Up @@ -88,16 +83,11 @@
</thead>
<tbody class="govuk-table__body">
<tr class="govuk-table__row">
<td class="govuk-table__cell">_ga</td>
<td class="govuk-table__cell" width="50%">Checks if you’ve visited the service before. This helps us count how many people visit our site.</td>
<td class="govuk-table__cell">_ga (there may be other variations of this name)</td>
<td class="govuk-table__cell" width="50%">Checks if you’ve visited the service before. This helps us count how many people visit the service.</td>
<td class="govuk-table__cell">1 year</td>
</tr>

<tr class="govuk-table__row">
<td class="govuk-table__cell">_ga_XXXXXX</td>
<td class="govuk-table__cell" width="50%">Checks if you’ve visited the service before. This helps us count how many people visit our site. There could be few cookies with similar name.</td>
<td class="govuk-table__cell">1 year</td>
</tr>
</tbody>
</table>

Expand Down
30 changes: 13 additions & 17 deletions app/views/pages/privacy_policy.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,14 @@
This privacy notice explains how the Department for Education (DfE) uses your personal data when you use ‘Find a teaching school hub’.
</p>

<p class="govuk-body">
Teaching school hubs provide or give advice on professional development for school teachers and leaders.
</p>

<h2 class="govuk-heading-l">Lawful basis for processing your personal data</h2>

<p class="govuk-body">
When you use ‘Find a teaching school hub’, DfE is the data controller for your personal data.
</p>

<p class="govuk-body">
Our lawful basis for processing your personal data is 'public task' (article 6(1)(e) UK GDPR). This means that we use your data to carry out a task in the public interest, and our duty to do so is laid down by law.
Our lawful basis for processing your personal data is ‘public task’ (article 6(1)(e) UK GDPR). This means that we use your data to carry out a task in the public interest, and our duty to do so is laid down by law.
</p>

<p class="govuk-body">
Expand Down Expand Up @@ -51,12 +47,12 @@
</p>

<div class="govuk-inset-text">
We keep your IP for no longer than 90 days for these purposes.
We keep your IP address for no longer than 90 days for these purposes.
</div>


<p class="govuk-body">
If you consent to our use of Google Analytics <%= link_to "cookies", pages_cookies_path %>, we can also use your IP to analyse how you use the service - but we do not identify you personally when we do this. Using your data this way allows us to:
If you consent to our use of Google Analytics <%= link_to "cookies", pages_cookies_path %>, we can also use your IP address to analyse how you use the service - but we do not identify you personally when we do this. Using your data this way allows us to:


<ul class="govuk-list govuk-list--bullet">
Expand Down Expand Up @@ -85,21 +81,21 @@
You have data collection rights, including the right to:

<ul class="govuk-list govuk-list--bullet">
<li>ask for a copy of the personal information we have about you – 'right of access'</li>
<li>ask for a copy of the personal information we have about you – ‘right of access’</li>

<li>ask us to change any information you think is not accurate or complete – 'right to rectification'</li>
<li>ask us to change any information you think is not accurate or complete – ‘right to rectification’</li>

<li>ask us to delete your personal information – 'right to erasure'</li>
<li>ask us to delete your personal information – ‘right to erasure’</li>

<li>ask us to stop using your information – 'right to restriction of processing'</li>
<li>ask us to stop using your information – ‘right to restriction of processing’</li>

<li>object to us processing your information – 'right to object to processing'</li>
<li>object to us processing your information – ‘right to object to processing’</li>
</ul>
</p>


<p class="govuk-body">
For more information on your rights, visit the <a target="_blank" href="https://ico.org.uk/for-organisations/uk-gdpr-guidance-and-resources/individual-rights/individual-rights/">Information Comissioner's Office website.</a>
For more information on your rights, visit the <a target="_blank" href="https://ico.org.uk/for-organisations/uk-gdpr-guidance-and-resources/individual-rights/individual-rights/">Information Comissioner’s Office website.</a>
</p>


Expand All @@ -110,7 +106,7 @@
</p>

<p class="govuk-body">
<a target="_blank" href="https://form.education.gov.uk/service/Contact_the_Department_for_Education">Contact DfE to make a subject access request.</a>
<a target="_blank" href="https://form.education.gov.uk/service/Contact_the_Department_for_Education">Contact DfE to make a subject access request</a>.
</p>


Expand All @@ -127,7 +123,7 @@
<br />
Department for Education (B2.28)
<br />
7 & 8 Wellington Place
7 and 8 Wellington Place
<br />
Wellington Street
<br />
Expand All @@ -139,14 +135,14 @@
</div>

<p class="govuk-body">
You can also <a target="_blank" href="https://ico.org.uk/make-a-complaint/data-protection-complaints/data-protection-complaints">contact the Information Comissioner's Office</a> online or write to them at:
You can also <a target="_blank" href="https://ico.org.uk/make-a-complaint/data-protection-complaints/data-protection-complaints">contact the Information Comissioner’s Office</a> online or write to them at:
</p>

<div class="govuk-grid-row">
<div class="govuk-grid-column govuk-!-margin-left-9">

<p class="govuk-body">
Information Commissioner's Office
Information Commissioner’s Office
<br />
Wycliffe House
<br />
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/session_store.rb
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Rails.application.configure do
config.session_store :cookie_store, key: "_tshf_session"
Rails.application.config.session_store :disabled
end

0 comments on commit 9b61558

Please sign in to comment.