7380 tips to protect free text #7576

danielfmiranda · 2021-10-06T19:25:36Z

Link to sample test page: https://foundation-s-7380-tips--u6dvkk.herokuapp.com/en/privacynotincluded/finally-live-program-yourself/

Steps to test:

Visit the test page above
Scroll down and note the new "Tips to protect yourself" section
If you would like to test out the editing functionality, please log into the cms using the credentials: (admin2/admin2)
Visit https://foundation-s-7380-tips--u6dvkk.herokuapp.com/en/privacynotincluded/economy-fine-theory-including-couple-cover-none/, to test out a page without any tips added. Please not that the "tips to protect yourself" section does not render
If everything works as expected, testing is complete!

Checklist

Changes in Models:

[Are my changes backward-compatible]

…ist items

network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html

…uct_page.html

Pomax

Super nice!

TheoChevalier

Hm, looks like there’s a migration snafu, new-env fails with

CommandError: Conflicting migrations detected; multiple leaf nodes in the migration graph: (0041_productpage_time_researched, 0041_productpage_tips_to_protect_yourself in wagtailpages).
To fix them run 'python manage.py makemigrations --merge'

TheoChevalier · 2021-10-07T07:05:29Z

network-api/networkapi/wagtailpages/pagemodels/products.py

@@ -665,9 +666,9 @@ def get_voting_json(self):
                FieldPanel('blurb'),
                ImageChooserPanel('image'),
                FieldPanel('worst_case'),
-                FieldPanel('mozilla_says'),
+                FieldPanel('tips_to_protect_yourself'),
+                FieldPanel('mozilla_says')


Typo, missing comma

Suggested change

FieldPanel('mozilla_says')

FieldPanel('mozilla_says'),

sabrinang

overall, text editing features (bold, italic, links) work well
adjust width to align with end of column 2 and 11 (see mockup grid and it prob is related to 7393 - Update content width #7405)

padding for top/bottom of box should be closer to 24px (1.5 rem) currently 15px

…oundation.mozilla.org into 7380-tips-to-protect-free-text

danielfmiranda · 2021-10-07T21:54:24Z

Hi @sabrinang I have implemented the feedback and re-requested review. Thank you!

sabrinang

Thanks for making the adjustments Daniel! 👍

TheoChevalier

The tips_to_protect_yourself field needs to be added to the translatable_fields variable down below in the products.py file so that it gets translated

danielfmiranda · 2021-10-08T18:10:10Z

Hi @TheoChevalier! Just added it to the translatable fields, thanks!

TheoChevalier

Thanks @danielfmiranda, looks good now!

… slider (#7402) CI looks stuck - overriding added external link icon and removed price/dollar-sign (#7394) * added external link icon and removed price/dollar-sign * Update product.scss * Update product.scss Co-authored-by: Daniel Miranda <daniel@mozillafoundation.org> Update continous-integration.yml Update prod-like-ci.yml added new date format to match figma file (#7395) * added new date format to match figma file Co-authored-by: Pomax <pomax@nihongoresources.com> Co-authored-by: Daniel Miranda <daniel@mozillafoundation.org> Updated order of items, as well as renamed Updates section to News (#7400) * Updated order of items, as well as renamed Updates section to News Co-authored-by: Pomax <pomax@nihongoresources.com> Co-authored-by: Daniel Miranda <daniel@mozillafoundation.org> Create README.md Delete README.md 7374 - Added Category Bubbles Added padding hide the softwareproductpage child page type (#7419) removed company contact information fields from template and cms/models (#7401) * removed company contact information fields from template and cms/models Co-authored-by: Pomax <pomax@nihongoresources.com> Co-authored-by: Daniel Miranda <daniel@mozillafoundation.org> prettier 7294 - PNI category name untranslated in page title (#7455) * 7294 - PNI category name untranslated in page title linting fix * Update network-api/networkapi/wagtailpages/pagemodels/products.py Co-authored-by: Pomax <pomax@nihongoresources.com> Co-authored-by: Pomax <pomax@nihongoresources.com> updated dotted background bar to be around comments (#7450) Co-authored-by: Daniel Miranda <daniel@mozillafoundation.org> 7374 - Added Category Bubbles Added padding 7387-update typesetting styling added mozilla says section (#7446) * rebase * updated migrations * Update product_page.html * Update network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html Co-authored-by: Théo Chevalier <theo.chevalier11@gmail.com> * Update product_page.html * updated rebase and commits Co-authored-by: Daniel Miranda <daniel@mozillafoundation.org> Co-authored-by: Théo Chevalier <theo.chevalier11@gmail.com> ai product fields (#7488) * added fields to be used in the AI panel * Update products.py Co-authored-by: Daniel Miranda <daniel@mozillafoundation.org> Localize PNI category name in page title (#7478) * Localize PNI category name in page title * Line too long 7492 additional ai fields (#7513) * added new fields, however, need to ask whether or not we want the helptext fields to go along or if they are static: * updated AI fields, as well as reordered them in the code and CMS to match new PNI product page template Co-authored-by: Daniel Miranda <daniel@mozillafoundation.org> 7389 section hrs (#7452) * added new section dividers for news and related products * updated spacing between news heading and section Co-authored-by: Daniel Miranda <daniel@mozillafoundation.org> update the ProductUpdate meta class to include ordering (#7530) Localize category badge (#7565) 7472 - Search - update placeholder text added new lead in paragraph under the comments heading (#7572) * added new lead in paragraph under the comments heading * Update product_page.html Co-authored-by: Daniel Miranda <daniel@mozillafoundation.org> 7382 - product tabs component Added sticky Fixes update Design revisions Refactor Addressed fixes fixes 7377 mozilla researched (#7539) * added new template to house all of the research details * Update research_details.html * New localization approach for Mozilla researched (#7553) Co-authored-by: Daniel Miranda <daniel@mozillafoundation.org> Co-authored-by: Théo Chevalier <theo.chevalier11@gmail.com> 7473 change "all" category on mobile to a more indicative text (#7570) fix 7379 people voted (#7541) * added migrations for mozilla researched * merge with q3 branch * merge with q3 branch * updated migrations * saving to ask design for what to do on the medium breakpoint for the mozilla says and researched section. * updated to use tailwind * added new template to house all of the research details * updated migrations * Update research_details.html * 7379-people-voted * New localization approach for Mozilla researched (#7553) * New localization approach for Mozilla researched * Remove extra spaces and simplify string * added requested changes from design and review * New localization approach for People voted (#7554) * New localization approach for People voted * remove extra spaces * Simplify string * Update most_voted_rating.html * spacing * Update research_details.html * comments * removed % sign, implemented feedback from review * Removed rogue space * Update network-api/networkapi/wagtailpages/templates/fragments/most_voted_rating.html Co-authored-by: Théo Chevalier <theo.chevalier11@gmail.com> * merging with q3 Co-authored-by: Daniel Miranda <daniel@mozillafoundation.org> Co-authored-by: Théo Chevalier <theo.chevalier11@gmail.com> Co-authored-by: Pomax <pomax@nihongoresources.com> 7393 - Update Content Width Fixed 7380 tips to protect free text (#7576) * tips to protect yourself using richtext field Co-authored-by: Daniel Miranda <daniel@mozillafoundation.org> Co-authored-by: Pomax <pomax@nihongoresources.com> updated blurb and worst case to rich text fields with 5000 char limit (#7605) Co-authored-by: Daniel Miranda <daniel@mozillafoundation.org> 7470/7474 relocate search bar (#7591) * removed unneeded JS, updated CSS, and relocated search bar to hero section of the page * updated use of variable for color white Co-authored-by: Daniel Miranda <daniel@mozillafoundation.org> Co-authored-by: Pomax <pomax@nihongoresources.com> 7383 - Product page - add "information" links to certain fields Update network-api/networkapi/wagtailpages/templates/fragments/product_criterion_primary_info.html Co-authored-by: Théo Chevalier <theo.chevalier11@gmail.com> Update network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html Co-authored-by: Théo Chevalier <theo.chevalier11@gmail.com> 7386 - Content Update fixes Update network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html Co-authored-by: Théo Chevalier <theo.chevalier11@gmail.com> Changes vote now button enabled on-click (#7627) * vote now button enabled on-click * removed box shadow while disabled * transition Co-authored-by: Daniel Miranda <daniel@mozillafoundation.org> updated styling of search bar (#7604) * removed unneeded JS, updated CSS, and relocated search bar to hero section of the page * updated use of variable for color white * updated styling of search bar to be round with 1px black border, 6 col width * css changes requested by design Co-authored-by: Daniel Miranda <daniel@mozillafoundation.org> 7441 category share data (#7606) * added new image field, then checking if we can use them for share data * comment * migrations and Theo's localization feedback * formatting * updated migrations * localization of category share data * Removing slug from editable panels Co-authored-by: Daniel Miranda <daniel@mozillafoundation.org> Add subcategory functionality to PNI categories. (#7641) * add "subcategories" by letting categories specify a parent. migration fix

* tips to protect yourself using richtext field Co-authored-by: Daniel Miranda <daniel@mozillafoundation.org> Co-authored-by: Pomax <pomax@nihongoresources.com>

Daniel Miranda added 3 commits September 23, 2021 19:13

tips to protect yourself using richtext field

5628c49

updated to use freetext field and convert p elements to behave like l…

9a2544a

…ist items

migrations

24b3647

mofodevops temporarily deployed to foundation-s-7380-tips--u6dvkk October 6, 2021 19:25 Inactive

removed redundant import of richtextfield

b760bb2

danielfmiranda temporarily deployed to foundation-s-7380-tips--u6dvkk October 6, 2021 19:47 Inactive

danielfmiranda requested review from Pomax, sabrinang and TheoChevalier October 6, 2021 21:26

Merge branch 'pni-q3-2021' into 7380-tips-to-protect-free-text

b714762

danielfmiranda temporarily deployed to foundation-s-7380-tips--u6dvkk October 6, 2021 23:12 Inactive

Pomax reviewed Oct 6, 2021

View reviewed changes

network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html Outdated Show resolved Hide resolved

Update network-api/networkapi/wagtailpages/templates/buyersguide/prod…

a8dc44c

…uct_page.html

Pomax approved these changes Oct 6, 2021

View reviewed changes

Pomax temporarily deployed to foundation-s-7380-tips--u6dvkk October 6, 2021 23:30 Inactive

Merge branch 'pni-q3-2021' into 7380-tips-to-protect-free-text

d593f02

danielfmiranda had a problem deploying to foundation-s-7380-tips--u6dvkk October 7, 2021 04:04 Failure

TheoChevalier requested changes Oct 7, 2021

View reviewed changes

sabrinang requested changes Oct 7, 2021

View reviewed changes

danielfmiranda mentioned this pull request Oct 7, 2021

WIP: tips to protect yourself streamfield #7477

Closed

1 task

implemented feedback

01462f8

danielfmiranda temporarily deployed to foundation-s-7380-tips--u6dvkk October 7, 2021 20:07 Inactive

Daniel Miranda and others added 2 commits October 7, 2021 13:48

implemented feedback

c9ae62e

Merge branch 'pni-q3-2021' into 7380-tips-to-protect-free-text

bbb3a9f

danielfmiranda temporarily deployed to foundation-s-7380-tips--u6dvkk October 7, 2021 20:48 Inactive

danielfmiranda requested a review from TheoChevalier October 7, 2021 20:59

Daniel Miranda added 3 commits October 7, 2021 14:10

implemented design feedback

1105ba4

added design feedback

a21aaaf

Merge branch '7380-tips-to-protect-free-text' of github.com:mozilla/f…

69f1fff

…oundation.mozilla.org into 7380-tips-to-protect-free-text

danielfmiranda temporarily deployed to foundation-s-7380-tips--u6dvkk October 7, 2021 21:41 Inactive

danielfmiranda requested a review from sabrinang October 7, 2021 21:45

sabrinang mentioned this pull request Oct 7, 2021

[PNI Website] Design support & reviews for dev work cont. #7489

Closed

updating padding for tips to 1.5rem

bb90d0e

danielfmiranda temporarily deployed to foundation-s-7380-tips--u6dvkk October 7, 2021 21:51 Inactive

sabrinang approved these changes Oct 7, 2021

View reviewed changes

TheoChevalier requested changes Oct 8, 2021

View reviewed changes

Update products.py

ba4972d

danielfmiranda temporarily deployed to foundation-s-7380-tips--u6dvkk October 8, 2021 18:09 Inactive

danielfmiranda requested a review from TheoChevalier October 8, 2021 18:09

TheoChevalier approved these changes Oct 11, 2021

View reviewed changes

richbrennan mentioned this pull request Oct 11, 2021

[PNI] Product page - update Blurb and Worst case blocks to rich text #7449

Closed

1 task

Merge branch 'pni-q3-2021' into 7380-tips-to-protect-free-text

33c0877

danielfmiranda temporarily deployed to foundation-s-7380-tips--u6dvkk October 11, 2021 16:29 Inactive

danielfmiranda merged commit ca8b6eb into pni-q3-2021 Oct 11, 2021

danielfmiranda deleted the 7380-tips-to-protect-free-text branch October 11, 2021 16:43

fessehaye pushed a commit that referenced this pull request Oct 20, 2021

7380 tips to protect free text (#7576)

0338082

* tips to protect yourself using richtext field Co-authored-by: Daniel Miranda <daniel@mozillafoundation.org> Co-authored-by: Pomax <pomax@nihongoresources.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

7380 tips to protect free text #7576

7380 tips to protect free text #7576

danielfmiranda commented Oct 6, 2021 •

edited

Pomax left a comment

TheoChevalier left a comment

TheoChevalier Oct 7, 2021

sabrinang left a comment

danielfmiranda commented Oct 7, 2021

sabrinang left a comment

TheoChevalier left a comment

danielfmiranda commented Oct 8, 2021

TheoChevalier left a comment

7380 tips to protect free text #7576

7380 tips to protect free text #7576

Conversation

danielfmiranda commented Oct 6, 2021 • edited

Checklist

Pomax left a comment

Choose a reason for hiding this comment

TheoChevalier left a comment

Choose a reason for hiding this comment

TheoChevalier Oct 7, 2021

Choose a reason for hiding this comment

sabrinang left a comment

Choose a reason for hiding this comment

danielfmiranda commented Oct 7, 2021

sabrinang left a comment

Choose a reason for hiding this comment

TheoChevalier left a comment

Choose a reason for hiding this comment

danielfmiranda commented Oct 8, 2021

TheoChevalier left a comment

Choose a reason for hiding this comment

danielfmiranda commented Oct 6, 2021 •

edited