Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add cookies and privacy policy pages #502

Merged
merged 4 commits into from
May 10, 2018
Merged

Conversation

dashouse
Copy link

@dashouse dashouse commented May 9, 2018

This PR replicates the (already merged) Cookies and Privacy policy pages on the beta version of the prototype kit.

This change:

  • Adds a cookies page
  • Adds a privacy policy page
  • Add links to cookies and privacy policy on the footer for the website (They will not appear in the footer for prototypes created with the kit)
  • Creates a link to the cookies page in the cookie banner when in promo mode

In addition there are some docs specific styles for table: fixed and an override for display: block in order to style these pages in the same way as on the beta version of the kit and the design system.

@edwardhorsford
Copy link
Contributor

@dashouse The other pr / kit isn't linked. Can you add some details to this PR description about this change?

CHANGELOG.md Outdated
@@ -7,7 +7,7 @@ Bug fixes:
# 6.3.0

New features:

- [#502 Add Cookies and Privacy policy text](https://github.com/alphagov/govuk_prototype_kit/pull/502)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should probably be listed above 6.3, under an 'Unreleased' heading.

</li>
</ul>
{% endif %}
<ul class="govuk-!-mb-r3 app-!-db">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like a govuk-frontend class - will this work in the kit as it stands?

@dashouse dashouse force-pushed the add-cookies-and-privacy-policy branch from 34c9406 to caee658 Compare May 9, 2018 14:26
@dashouse
Copy link
Author

dashouse commented May 9, 2018

@edwardhorsford Thanks for spotting Ed, updated.

CHANGELOG.md Outdated
@@ -4,10 +4,12 @@ Bug fixes:

- [#491 Remove redundant Google Analytics](https://github.com/alphagov/govuk_prototype_kit/pull/491)

Unreleased:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, just spotted there's already an unreleased heading. Do you consider this a new feature?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this is a drawback of having the kit and the site be the same thing. I think in the past we've called new things on the site 'features' so this is consistent.

CHANGELOG.md Outdated
@@ -4,10 +4,12 @@ Bug fixes:

- [#491 Remove redundant Google Analytics](https://github.com/alphagov/govuk_prototype_kit/pull/491)

Unreleased:
- [#502 Add Cookies and Privacy policy text](https://github.com/alphagov/govuk_prototype_kit/pull/502)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you think this (or perhaps the PR?) should explicitly state that this is for the Kit site (promo mode) rather than the kit in general?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we don't normally do that (see the PR just above) - we could consider starting to add a [Site] tag or something in future but I don't think it should block this PR

@dashouse dashouse force-pushed the add-cookies-and-privacy-policy branch from 6b47417 to a87497a Compare May 10, 2018 09:33
@dashouse
Copy link
Author

Updated changelog to add this as a "new feature"

@edwardhorsford
Copy link
Contributor

Thanks for these changes @dashouse.

Would it be possible to squash the commits?

Then I think it looks good to go.

@edwardhorsford
Copy link
Contributor

@dashouse you can ignore me. @joelanman points out that each of your commits make sense.

Looks good to go 👍

@dashouse dashouse merged commit 3be385e into master May 10, 2018
@dashouse
Copy link
Author

Merged, thanks @edwardhorsford @joelanman

@dashouse dashouse deleted the add-cookies-and-privacy-policy branch May 10, 2018 14:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants