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 intro and new formatting for Firefox PN and ToU #15982 #16009

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

stephaniehobson
Copy link
Contributor

@stephaniehobson stephaniehobson commented Feb 19, 2025

One-line summary

Add intro and new formatting for Firefox Privacy Notice and Terms of Use

Significant changes and points to review

  • Copy and Figma files are linked in the issue Terms of Service GTM (Strike Team) #15982
    • Formatting will not be an exact match because I had to ruthlessly prioritize. Still, nothing should look broken.
  • The existing privacy notice will be updated in place with new formatting
    • The view logic needs to be able to handle either notice being returned by legal docs.
    • The new intro content should only display when the firefox-tou switch is enabled
  • The existing terms are in firefox_about_rights.mdand will be replaced by a new file named firefox_terms_of_use.md
    • We will control which document displays with the firefox-tou switch

Issue / Bugzilla link

Fix #15982

Testing

Affected pages:

Steps for testing:

  1. make_preflight before you open your venv to make sure you have the most recent legal docs
  2. Set DEV=False in your .env file so you can test the switches
  3. Run bedrock and view the existing pages (linked above) to make sure nothing is broken
  4. Find the markdown content with the updated formatting on Slack
  5. Put the updated PN content in /data/legal_docs/firefox_privacy_notice.md
  6. Put the updated ToU content in /data/legal_docs/firefox_terms_of_use.md (create the file if it does not exist)
  7. Open the bedrock directory in your Terminal
  8. ./manage.py shell_plus
  9. LegalDoc.objects.refresh()
  10. View the pages again to make sure they are working
  11. Toggle the firefox-tou switch on and make sure everything is working
  12. You should now be in a position to review the updated templates and their associated CSS

If you run into trouble pmac can help you.

Fixes from #15997:

  • privacy/firefox.ftl file is included only where needed (instead of on all PN pages)
  • empty space between the new content and the PN is tightened up
  • side navigation is now ToC instead of main site nav

Missing

  • updated tests

- New page templates
- Switch logic
- New styles
@stephaniehobson stephaniehobson changed the title Terms Add intro and new formatting for Firefox PN and ToU #15982 Feb 21, 2025

<div class="mzp-l-content c-back">
<a href="{{ url('legal.index') }}">
<span class="mzp-c-button-icon-start" aria-hidden="true">
Copy link
Contributor Author

@stephaniehobson stephaniehobson Feb 21, 2025

Choose a reason for hiding this comment

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

The .mzp-c-button-icon-start class requires an inline SVG to work so I get to copy/paste it 6 times.

OTOH I'm horribly misusing it here and am not against pulling this out into a new class so the icon can be an image on the page.


{% block side_nav %}
<div class="c-toc">
<h3>{{ ftl('privacy-firefox-contents') }}</h3>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Blocking: This is broken.

{% endblock %}

{% block intro %}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Moved to an include.

@@ -34,6 +34,14 @@
@import '../m24/vars/fonts';
@import '../m24/vars/text';

// smooth scroll
html {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Making this site-wide behaviour. Pages shouldn't scroll differently from each other.

@stephaniehobson stephaniehobson marked this pull request as ready for review February 21, 2025 06:41
@stephaniehobson stephaniehobson requested review from a team as code owners February 21, 2025 06:41
@stephaniehobson
Copy link
Contributor Author

Opening for review but DNM because tests are broken.

@stephaniehobson stephaniehobson added Do Not Merge ⚠️ Needs Review Awaiting code review Review: M Code review time: 1-2 hours labels Feb 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Do Not Merge ⚠️ Needs Review Awaiting code review Review: M Code review time: 1-2 hours
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Terms of Service GTM (Strike Team)
1 participant