darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-07 15:48:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #3238 from alphagov/cookies-update"

Browse Source 
This reverts commit eec4bec761, reversing
changes made to 64480e2fff.
This commit is contained in:
Leo Hemsted
2020-01-15 14:40:48 +00:00
parent 04b9fa8927
commit 66db735e09
36 changed files with 116 additions and 1610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/templates/admin_template.html
View File

@@ -1,6 +1,5 @@
{% extends "template.njk" %}
{% from "components/banner.html" import banner %}
{% from "components/cookie-banner.html" import cookie_banner %}
{% block headIcons %}
<link rel="shortcut icon" sizes="16x16 32x32 48x48" href="{{ asset_url('images/favicon.ico') }}" type="image/x-icon" />
@@ -31,7 +30,12 @@
{% block bodyStart %}
{% block cookie_message %}
{{ cookie_banner() }}
<div class="notify-cookie-message" id="global-cookie-message">
<p class="govuk-width-container">
GOV.UK Notify uses cookies to make the site simpler.
<a href="{{ url_for("main.cookies") }}">Find out more about cookies</a>
</p>
</div>
{% endblock %}
{% endblock %}
@@ -243,4 +247,12 @@
<!--[if gt IE 8]><!-->
<script type="text/javascript" src="{{ asset_url('javascripts/all.js') }}"></script>
<!--<![endif]-->
<script>
if (window.GOVUK.cookie('_ga') !== null) {
document.cookie = '_ga' + '=;expires=' + new Date() + ';domain=' + window.location.hostname.replace(/^www\./, '.') + ';path=/';
}
if (window.GOVUK.cookie('_gid') !== null) {
document.cookie = '_gid' + '=;expires=' + new Date() + ';domain=' + window.location.hostname.replace(/^www\./, '.') + ';path=/';
}
</script>
{% endblock %}

25
app/templates/components/cookie-banner.html
View File

@@ -1,25 +0,0 @@
{% macro cookie_banner(id='global-cookie-message') %}
<div id="{{ id }}" class="notify-cookie-banner" data-module="cookie-banner" role="region" aria-describedby="notify-cookie-banner__heading">
<div class="notify-cookie-banner__wrapper govuk-width-container">
<h2 class="notify-cookie-banner__heading govuk-heading-m" id="notify-cookie-banner__heading">Can we store analytics cookies on your device?</h2>
<p class="govuk-body">Analytics cookies help us understand how our website is being used.</p>
<div class="notify-cookie-banner__buttons">
<button class="govuk-button notify-cookie-banner__button notify-cookie-banner__button-accept" type="submit" data-accept-cookies="true" aria-describedby="notify-cookie-banner__heading">
Yes<span class="govuk-visually-hidden">, Notify can store analytics cookies on your device</span>
</button>
<button class="govuk-button notify-cookie-banner__button notify-cookie-banner__button-reject" type="submit" data-accept-cookies="false" aria-describedby="notify-cookie-banner__heading">
No<span class="govuk-visually-hidden">, Notify cannot store analytics cookies on your device</span>
</button>
<a class="govuk-link notify-cookie-banner__link" href="/cookies">How Notify uses cookies</a>
</div>
</div>
<div class="notify-cookie-banner__confirmation govuk-width-container" tabindex="-1">
<p class="notify-cookie-banner__confirmation-message govuk-body">
You can <a class="govuk-link" href="/cookies">change your cookie settings</a> at any time.
</p>
<button class="notify-cookie-banner__hide-button govuk-link" data-hide-cookie-banner="true" role="link">Hide</button>
</div>
</div>
{% endmacro %}

108
app/templates/views/cookies.html
View File

@@ -1,34 +1,29 @@
{% extends "withoutnav_template.html" %}
{% from "components/banner.html" import banner %}
{% block per_page_title %}
Cookies
{% endblock %}
{% block cookie_message %}{% endblock %}
{% block maincolumn_content %}
<div class="grid-row">
<div class="column-two-thirds">
<div class="cookie-settings__confirmation banner banner-with-tick" data-cookie-confirmation="true" role="group" tabindex="-1">
<h2 class="banner-title">Your cookie settings were saved</h2>
<a class="govuk_link cookie-settings__prev-page govuk-!-margin-top-1" href="#" data-module="track-click" data-track-category="cookieSettings" data-track-action="Back to previous page">
Go back to the page you were looking at
</a>
</div>
<h1 class="heading-large">Cookies</h1>
<p class="summary">
Cookies are small files saved on your phone, tablet or computer when you visit a website.
GOV.UK Notify puts small files (known as ‘cookies’)
onto your computer.
</p>
<p>We use cookies to make GOV.UK Notify work and collect information about how you use our service.</p>
<h2 class="heading-medium">Essential cookies</h2>
<p>These cookies are used to remember you once you’ve logged in.</p>
<p>
Essential cookies keep your information secure while you use Notify. We do not need to ask permission to use them.
Find out <a href="https://ico.org.uk/for-the-public/online/cookies/">how to manage cookies</a>.
</p>
<h2 class="heading-medium">Session cookies</h2>
<p>
We store session cookies on your computer to help keep your information
secure while you use the service.
</p>
<table>
<caption class="govuk-visually-hidden">Essential cookies</caption>
<thead>
<tr>
<th>Name</th>
@@ -42,43 +37,22 @@
notify_admin_session
</td>
<td width="50%">
Used to keep you signed in
Used to keep you logged in
</td>
<td>
20 hours
</td>
</tr>
<tr>
<td>
cookie_policy
</td>
<td width="50%">
Saves your cookie consent settings
</td>
<td>
1 year
</td>
</tr>
</tbody>
</table>
<h2 class="heading-medium">Analytics cookies (optional)</h2>
<h2 class="heading-medium">Introductory message cookie</h2>
<p>
With your permission, we use Google Analytics to collect data about how you use Notify. This information helps us to improve our service.
When you first use the service, you may see a pop-up ‘welcome’ message.
Once you’ve seen the message, we store a cookie on your computer so it
knows not to show it again.
</p>
<p>
Google is not allowed to use or share our analytics data with anyone.
</p>
<p>
Google Analytics stores anonymised information about:
</p>
<ul class="govuk-list govuk-list--bullet">
<li>how you got to GOV.UK Notify</li>
<li>the pages you visit on Notify and how long you spend on them</li>
<li>any errors you see while using Notify</li>
</ul>
<table>
<caption class="govuk-visually-hidden">Google Analytics cookies</caption>
<thead>
<tr>
<th>Name</th>
@@ -89,62 +63,18 @@
<tbody>
<tr>
<td>
_ga
seen_cookie_message
</td>
<td width="50%">
Checks if you’ve visited Notify before. This helps us count how many people visit our site.
Saves a message to let us know that you have seen our cookie
message
</td>
<td>
2 years
</td>
</tr>
<tr>
<td>
_gid
</td>
<td width="50%">
Checks if you’ve visited Notify before. This helps us count how many people visit our site.
</td>
<td>
24 hours
1 month
</td>
</tr>
</tbody>
</table>
<div class="cookie-settings__no-js">
<h2 class="govuk-heading-s govuk-!-margin-top-6">Do you want to accept analytics cookies?</h2>
<p>We use Javascript to set our analytics cookies. Unfortunately Javascript is not running on your browser, so you cannot change your settings. You can try:</p>
<ul class="govuk-list govuk-list--bullet">
<li>reloading the page</li>
<li>turning on Javascript in your browser</li>
</ul>
</div>
<div class="cookie-settings__form-wrapper">
<form data-module="cookie-settings">
<div class="govuk-form-group govuk-!-margin-top-6">
<fieldset class="govuk-fieldset" aria-describedby="changed-name-hint">
<legend class="govuk-fieldset__legend govuk-fieldset__legend--s">
Do you want to accept analytics cookies?
</legend>
<div class="govuk-radios govuk-radios--inline">
<div class="govuk-radios__item">
<input class="govuk-radios__input" id="cookies-analytics-yes" name="cookies-analytics" type="radio" value="on">
<label class="govuk-label govuk-radios__label" for="cookies-analytics-yes">
Yes
</label>
</div>
<div class="govuk-radios__item">
<input class="govuk-radios__input" id="cookies-analytics-no" name="cookies-analytics" type="radio" value="off">
<label class="govuk-label govuk-radios__label" for="cookies-analytics-no">
No
</label>
</div>
</div>
</fieldset>
</div>
<button class="govuk-button" type="submit">Save cookie settings</button>
</form>
</div>
</div>
</div>

2
app/templates/views/privacy.html
View File

@@ -61,7 +61,7 @@
<p>We will retain your personal data for as long as you have a GOV.UK Notify account.</p>
<h2 class="heading-medium">Where your data is processed and stored</h2>
<h2 class="heading-medium">Where your data is processed and stores</h2>
<p>We design, build and run our systems to make sure that your data is as safe as possible at any stage, both while it’s
processed and when it’s stored.</p>