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

added mozilla says section #7446

Merged
merged 8 commits into from
Sep 24, 2021
Merged

Conversation

danielfmiranda
Copy link
Collaborator

@danielfmiranda danielfmiranda commented Sep 21, 2021

Closes #7378

Link to sample test pages:

Test Page with "Mozilla says" set to Unknown, (Sideways): https://foundation-s-7378-mozil-a7zqkp.herokuapp.com/en/privacynotincluded/write-poor-nature-kind-stage-daughter/
Test Page with "Mozilla says" set to Yes, (Thumbs-Up): https://foundation-s-7378-mozil-a7zqkp.herokuapp.com/en/privacynotincluded/entire-economic-course-writer-most-little-notice/
Test Page with "Mozilla says" set to No, (Thumbs-Down): https://foundation-s-7378-mozil-a7zqkp.herokuapp.com/en/privacynotincluded/guess-sit-take-game-instead-store-example-realize/

Steps to test*:

  1. Visit the three links above, each page should have either a thumbs up, down, or sideways.
  2. If it appears that they are rendering correctly, testing is complete!
    Note: Please note that this section might look a little empty until we add the two other subsections (time researched, people voted section). This, as well as the dividers will be updated/added in future PR's.

@mofodevops mofodevops temporarily deployed to foundation-s-7378-mozil-gliqw7 September 21, 2021 21:53 Inactive
@mofodevops mofodevops temporarily deployed to foundation-s-7378-mozil-a7zqkp September 21, 2021 22:08 Inactive
@danielfmiranda danielfmiranda temporarily deployed to foundation-s-7378-mozil-gliqw7 September 21, 2021 22:08 Inactive
@danielfmiranda danielfmiranda temporarily deployed to foundation-s-7378-mozil-a7zqkp September 21, 2021 22:45 Inactive
@danielfmiranda danielfmiranda temporarily deployed to foundation-s-7378-mozil-a7zqkp September 21, 2021 22:46 Inactive
Copy link
Contributor

@TheoChevalier TheoChevalier left a comment

Choose a reason for hiding this comment

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

Let’s translate this please 😉
I’ve also added additional context for translators since the concatenated icon is important context to have in mind and isn’t clear from the string alone

Copy link
Collaborator

@nancyt1 nancyt1 left a comment

Choose a reason for hiding this comment

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

Looks good! Can "says" be all lowercase though?

@danielfmiranda danielfmiranda temporarily deployed to foundation-s-7378-mozil-a7zqkp September 22, 2021 17:07 Inactive
@danielfmiranda danielfmiranda temporarily deployed to foundation-s-7378-mozil-a7zqkp September 22, 2021 17:10 Inactive
@danielfmiranda
Copy link
Collaborator Author

Awesome catch @TheoChevalier! I have added your suggested feedback and re-requested review 😄
And thanks @nancyt1! Updated 👍

Copy link
Contributor

@Pomax Pomax left a comment

Choose a reason for hiding this comment

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

This looks good to me, with the updated template using {% trans ".." %}

Copy link
Contributor

@TheoChevalier TheoChevalier left a comment

Choose a reason for hiding this comment

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

Hmm, looks like the rebase didn’t go so well?

@danielfmiranda danielfmiranda temporarily deployed to foundation-s-7378-mozil-a7zqkp September 23, 2021 18:02 Inactive
@danielfmiranda danielfmiranda temporarily deployed to foundation-s-7378-mozil-a7zqkp September 23, 2021 18:03 Inactive
@danielfmiranda danielfmiranda temporarily deployed to foundation-s-7378-mozil-a7zqkp September 23, 2021 21:24 Inactive
@danielfmiranda danielfmiranda temporarily deployed to foundation-s-7378-mozil-a7zqkp September 23, 2021 21:56 Inactive
@danielfmiranda
Copy link
Collaborator Author

Sorry about the confusion with the rebase @TheoChevalier! I have updated it and re-requested review :D

@danielfmiranda danielfmiranda temporarily deployed to foundation-s-7378-mozil-a7zqkp September 24, 2021 00:17 Inactive
Copy link
Contributor

@TheoChevalier TheoChevalier left a comment

Choose a reason for hiding this comment

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

Looks good!

@danielfmiranda danielfmiranda temporarily deployed to foundation-s-7378-mozil-a7zqkp September 24, 2021 18:40 Inactive
@danielfmiranda danielfmiranda merged commit 9e8b552 into pni-q3-2021 Sep 24, 2021
@danielfmiranda danielfmiranda deleted the 7378-mozilla-says-section branch September 24, 2021 18:51
Pomax pushed a commit that referenced this pull request Oct 19, 2021
… 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
fessehaye pushed a commit that referenced this pull request Oct 20, 2021
* 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>
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.

None yet

5 participants