diff --git a/src/components/footer/www/footer.jsx b/src/components/footer/www/footer.jsx index 5603f76b2..a195702a2 100644 --- a/src/components/footer/www/footer.jsx +++ b/src/components/footer/www/footer.jsx @@ -85,22 +85,16 @@ const Footer = props => ( -
- - - -
- - + +
-
@@ -152,6 +146,16 @@ const Footer = props => ( +
+ + + +
+
+ + + +
@@ -204,12 +208,6 @@ const Footer = props => ( -
- - - -
-
diff --git a/src/components/page/www/donor-recognition.jsx b/src/components/page/www/donor-recognition.jsx index 6b4a120fd..5fc28eb70 100644 --- a/src/components/page/www/donor-recognition.jsx +++ b/src/components/page/www/donor-recognition.jsx @@ -12,7 +12,7 @@ const DonorRecognition = () => ( values={{ donorLink: ( @@ -26,8 +26,7 @@ const DonorRecognition = () => ( values={{ donor1: 'Massachusetts Institute of Technology', donor2: 'National Science Foundation', - donor3: 'Siegel Family Endowment', - donor4: 'LEGO Foundation' + donor3: 'Siegel Family Endowment' }} /> diff --git a/src/l10n.json b/src/l10n.json index bdc2313d6..7e03529a5 100644 --- a/src/l10n.json +++ b/src/l10n.json @@ -22,8 +22,7 @@ "general.conferences": "Conferences", "general.country": "Country", "general.create": "Create", - "general.credits": "Our Team", - "general.donors": "Donors", + "general.credits": "Credits", "general.dmca": "DMCA", "general.emailAddress": "Email address", "general.english": "English", @@ -90,7 +89,7 @@ "general.startOver": "Start over", "general.statistics": "Statistics", "general.studios": "Studios", - "general.support": "Resources", + "general.support": "Support", "general.ideas": "Ideas", "general.tipsWindow": "Tips Window", "general.termsOfUse": "Terms of Use", @@ -127,9 +126,9 @@ "footer.discuss": "Discussion Forums", "footer.scratchFamily": "Scratch Family", - "footer.donorRecognition": "Scratch is available for free thanks to support from our {donorLink}. We are grateful to our Founding Partners:", + "footer.donorRecognition": "Scratch is available for free thanks to generous support from our {donorLink}. We are grateful to our Founding Partners:", "footer.donors": "donors", - "footer.donorList": "{donor1}, {donor2}, {donor3}, and {donor4}.", + "footer.donorList": "{donor1}, {donor2}, and {donor3}.", "form.validationRequired": "This field is required", diff --git a/src/views/about/about.jsx b/src/views/about/about.jsx index 0fd7dfc5d..2ded06a68 100644 --- a/src/views/about/about.jsx +++ b/src/views/about/about.jsx @@ -2,7 +2,6 @@ const React = require('react'); const FormattedMessage = require('react-intl').FormattedMessage; const render = require('../../lib/render.jsx'); -const Button = require('../../components/forms/button.jsx'); const Page = require('../../components/page/www/page.jsx'); const Video = require('../../components/video/video.jsx'); @@ -66,11 +65,7 @@ const About = () => ( values={{ languageCount: 60, translationLink: ( - + ) @@ -86,9 +81,9 @@ const About = () => (

- + scratchedLink: ( + + ) }} @@ -131,38 +126,10 @@ const About = () => ( ), - lifelongKindergartenGroupLink: ( - - - - ), - codingAtACrossroadsLink: ( - - - - ), - lifelongKindergartenBookLink: ( - - - - ), statisticsLink: ( - ), - annualReportLink: ( - - - ) }} />

@@ -194,26 +161,14 @@ const About = () => (

- - - ), - annualReportLink: ( - - + supportersList: 'National Science Foundation, Scratch Foundation, Siegel Family Endowment, Google, LEGO Foundation, Intel, Cartoon Network, Lemann Foundation, MacArthur Foundation', // eslint-disable-line max-len + creditsLink: ( + + ), donateLink: ( - + ), @@ -224,11 +179,6 @@ const About = () => ( ) }} />

- - - diff --git a/src/views/about/about.scss b/src/views/about/about.scss index 6360b9db8..a2fee0787 100644 --- a/src/views/about/about.scss +++ b/src/views/about/about.scss @@ -72,24 +72,3 @@ } } } - -.about-button { - margin-right: .75rem; - background-color: $ui-blue; - color: $ui-white; - font-size: 1rem; - - img { - margin-right: 1rem; - height: 1.5rem; - vertical-align: middle; - } - - a { - color: $ui-white; - } - - span { - vertical-align: middle; - } -} diff --git a/src/views/about/l10n.json b/src/views/about/l10n.json index bad3bd539..af183c496 100644 --- a/src/views/about/l10n.json +++ b/src/views/about/l10n.json @@ -1,7 +1,7 @@ { "about.introOne": "With Scratch, you can program your own interactive stories, games, and animations — and share your creations with others in the online community.", "about.introTwo": "Scratch helps young people learn to think creatively, reason systematically, and work collaboratively — essential skills for life in the 21st century.", - "about.introThree": "Scratch is designed, developed, and moderated by the Scratch Foundation, a nonprofit organization. It is provided free of charge.", + "about.introThree": "Scratch is a project of the Lifelong Kindergarten Group at the MIT Media Lab. It is provided free of charge.", "about.introParents": "Info for parents", "about.introEducators": "Info for educators", "about.whoUsesScratch": "Who Uses Scratch?", @@ -16,26 +16,20 @@ "about.learnMoreHelp": "Ideas Page", "about.learnMoreFaq": "Frequently Asked Questions", "about.learnMoreParents": "Information for Parents", - "about.learnMoreCredits": "Our Team", + "about.learnMoreCredits": "Credits", "about.learnMoreAnnualReport": "Annual Report 2019", "about.literacy": "Learn to Code, Code to Learn", "about.literacyDescription": "The ability to code computer programs is an important part of literacy in today’s society. When people learn to code in Scratch, they learn important strategies for solving problems, designing projects, and communicating ideas.", "about.schools": "Scratch in Schools", - "about.schoolsDescription": "Students are learning with Scratch at all levels (from elementary school to college) and across disciplines (such as math, computer science, language arts, social studies). Educator resources are available on the {scratchForEducatorsLink} page.", - "about.scratchForEducatorsLinkText": "Scratch For Educators", + "about.schoolsDescription": "Students are learning with Scratch at all levels (from elementary school to college) and across disciplines (such as math, computer science, language arts, social studies). Educators share stories, exchange resources, ask questions, and find people on the {scratchedLink}.", "about.scratchedLinkText": "ScratchEd website", "about.research": "Research", - "about.researchDescription": "The {lifelongKindergartenGroupLink} and collaborators are researching how young people create, collaborate, and learn with Scratch. For an overview, see the article {codingAtACrossroadsLink} and the book {lifelongKindergartenBookLink}. To find out more about the use of Scratch, see the {statisticsLink} page and the Scratch {annualReportLink}.", + "about.researchDescription": "The MIT Scratch Team and collaborators are researching how people use and learn with Scratch (for an introduction, see {spfaLink}). Find out more about Scratch {researchLink} and {statisticsLink} about Scratch.", "about.spfaLinkText": "Scratch: Programming for All", "about.researchLinkText": "research", "about.statisticsLinkText": "statistics", - "about.lifelongKindergartenGroupLinkText": "Lifelong Kindergarten group", - "about.codingAtACrossroadsLinkText": "Coding at a Crossroads", - "about.lifelongKindergartenBookLinkText": "Lifelong Kindergarten", - "about.annualReportLinkText": "Annual Report", "about.support": "Support and Funding", - "about.supportDescription": "Scratch is available for free, thanks to support from our {donorsLink}. For more information, see our {annualReportLink}. You can support Scratch by making a donation.", - "about.donorsLinkText": "donors", + "about.supportDescription": "The Scratch project has received financial support from the following organizations: {supportersList}. See the {creditsLink} for more information. If you'd like to support Scratch, please see the Scratch Foundation {donateLink}, or contact us at {donateemail}.", "about.donateLinkText": "donations page", - "about.donateButton": "Donate" + "about.creditsLinkText": "credits page" } diff --git a/src/views/credits/credits.jsx b/src/views/credits/credits.jsx index 941cd2028..1c3673747 100644 --- a/src/views/credits/credits.jsx +++ b/src/views/credits/credits.jsx @@ -5,15 +5,22 @@ const injectIntl = require('react-intl').injectIntl; const Page = require('../../components/page/www/page.jsx'); const People = require('./people.json'); const PeopleGrid = require('../../components/people-grid/people-grid.jsx'); +const Supporters = require('./supporters.json'); +const TitleBanner = require('../../components/title-banner/title-banner.jsx'); require('./credits.scss'); const Credits = () => (
+ +

+ +

+
-

Our Team

+

MIT Scratch Team

@@ -26,109 +33,62 @@ const Credits = () => ( >

- +

- - - - ) - }} - /> - {' '} - - {' '} - - Brenda Nyaringita (Kiswahili), Hans de Jong (Nederlands), - Farshid Meidani (فارسی‎), Karin Colsman (Gàidhlig). - +

+
+ {Supporters.map((supporter, index) => ( + + {supporter.logoDestination ? ( + {supporter.logoSrc ? ( + + ) : ( +
+ {supporter.textLogo} +
+ )} +
) : (supporter.logoSrc ? ( + + ) : ( +
+ {supporter.textLogo} +
+ )) + } +
+ ))} +
-
-

- +

- + translatorsLink: ( + + ) }} />

-

- -

-

- - - - ), - nsfGrantLink: ( - - - - ) - }} - /> -

-

- -

-

- -

-

- Yusuf Ahmad, Ben Berg, Amos Blanton, Paula Bontá, Karen Brennan, - Juanita Buitrago, Leo Burd, Gaia Carini, Kasia Chmielinski, - Michelle Chung, Shane Clements, Hannah Cole, Sayamindu Dasgupta, - Margarita Dekoli, Manuj Dhariwal, Shruti Dhariwal, Dave Feinberg, - Linda Fernsel, Elizabeth Foster, Lily Gabaree, Stephanie Gayle, - Chris Graves, Joel Gritter, Megan Haddadi, Kreg Hanning, - Sean Hickey, Christina Huang, Cori Hudson, Tony Hwang, - Abdulrahman Idlbi, Rupal Jain, Randy Jou, Lily Kim, Tauntaun Kim, - Saskia Leggett, John Maloney, Tim Mickel, Amon Millner, - Andrés Monroy-Hernández, Marian Muthui, My Nguyen, Lisa O'Brien, - Abisola Okuk, Carmelo Presicce, Tina Quach, Mitchel Resnick, - Ricarose Roque, Natalie Rusk, Andrea Saxman, Jay Silver, - Brian Silverman, Andrew Sliwinski, Tammy Stern, Lis Sylvan, - Hanako Tjia, Jaleesa Trapp, Moran Tsur, Claudia Urrea, - Julia Zimmerman, Oren Zuckerman. -

@@ -136,9 +96,8 @@ const Credits = () => (

- Natalie Rosalinda Hall, Wren McDonald, Leigh McG, Andrew Rae, Daria - Skrybchenko, Robert Hunter, Alex Eben Meyer, Ding Ding Hu, Owen - Davey, Zoë Bentley, DD Liu, Kristin Osiecki, Kathy Wu. + Natalie Rosalinda Hall, Wren McDonald, Leigh McG, Andrew Rae, Daria Skrybchenko, + Robert Hunter, Alex Eben Meyer, Ding Ding Hu, Owen Davey.

@@ -155,27 +114,80 @@ const Credits = () => ( lonemonk, rhodesmas, sandyrb, themfish, tyops.

- + +

+

+ +

+

+ + {' '} + Ben Berg, Amos Blanton, Karen Brennan, Juanita Buitrago, + Leo Burd, Gaia Carini, Kasia Chmielinski, Michelle Chung, + Shane Clements, Hannah Cole, Sayamindu Dasgupta, + Margarita Dekoli, Dave Feinberg, Linda Fernsel, Elizabeth Foster, + Chris Graves, Joel Gritter, Megan Haddadi, Connor Hudson, + Christina Huang, Tony Hwang, Abdulrahman Idlbi, Randy Jou, + Lily Kim, Tauntaun Kim, Saskia Leggett, Tim Mickel, + Amon Millner, My Nguyen, Lisa O'Brien, Abisola Okuk, + Tina Quach, Ricarose Roque, Andrea Saxman, Jay Silver, + Andrew Sliwinski, Tammy Stern, Lis Sylvan, Hanako Tjia, + Claudia Urrea, Julia Zimmerman, Oren Zuckerman. +

+

+ +

+

+ +

+

+ + + + ) + }} + /> +

+

+ + + + ), + scratchEdLink: ( + + + + ) + }} + /> +

+

+

- Susan Abend, Robbie Berg, Lauren Bessen, Keith Braadfladt, - Katie Broida, Susan Carillo, Will Denton, Nathan Dinsmore, - Catherine Feldman, Rachel Fenichel, Jodi Finch, Ioana Fineberg, - Corey Frang, JT Galla, Rachel Garber, Cassy Gibbs, Z Goddard, - Brian Harvey, Roland Hebert, Tracy Ho, Benjamin Howe, - Yasmin Kafai, Kapaya Katongo, Evan Karatzas, Christine Kim, - Joren Lauwers, Mike Lee, Jeff Lieberman, Mark Loughridge, - Kelly Liu, Anthony Lu, Danny Lutz, David Malan Wayne Marshall, - John McIntosh, Paul Medlock-Walton, Dongfang (Tian) Mi, - Ximena Miranda, Jens Moenig, Evan Moore, Geetha Narayanan, - Kate Nazemi, Liddy Nevile, Wing Ngan, Derek O'Connell, - Tim Radvan, Karen Randall, Ian Reynolds, Miriam Ruiz, - Boaz Sender, Chinua Shaw, Ed Shems, Cynthia Solomon, - Marie Staver, Daniel Strimpel, Kilmer Sweazy, - John Henry Thompson, Ubong Ukoh, Vladimir Vuksan, Han Xu. + Susan Abend, Robbie Berg, Lauren Bessen, Keith Braadfladt, Katie Broida, + Susan Carillo, Will Denton, Nathan Dinsmore, Catherine Feldman, Rachel Fenichel, + Jodi Finch, Ioana Fineberg, Corey Frang, JT Galla, Rachel Garber, Cassy Gibbs, + Z Goddard, Brian Harvey, Roland Hebert, Tracy Ho, Benjamin Howe, Kapaya Katongo, + Evan Karatzas, Christine Kim, Joren Lauwers, Mike Lee, Jeff Lieberman, + Mark Loughridge, Kelly Liu, Anthony Lu, Danny Lutz, David Malan + Wayne Marshall, John McIntosh, Paul Medlock-Walton, Dongfang (Tian) Mi, + Ximena Miranda, Jens Moenig, Evan Moore, Geetha Narayanan, Kate Nazemi, + Liddy Nevile, Wing Ngan, Derek O'Connell, Tim Radvan, Karen Randall, + Ian Reynolds, Miriam Ruiz, Boaz Sender, Chinua Shaw, Ed Shems, Cynthia Solomon, + Marie Staver, Daniel Strimpel, Kilmer Sweazy, John Henry Thompson, Ubong Ukoh, + Vladimir Vuksan, Han Xu.

diff --git a/src/views/credits/credits.scss b/src/views/credits/credits.scss index 5a4d825e3..c64c61114 100644 --- a/src/views/credits/credits.scss +++ b/src/views/credits/credits.scss @@ -9,10 +9,6 @@ .content { padding-top: 40px; } - - #acknowledgements { - background-color: rgba(77, 151, 255, 0.15); - } .avatar-grid { padding: 64px 0; @@ -65,7 +61,9 @@ } .supporters { - padding: 0 0 5.25rem; + $bg-grey: #f7f6f8; + background-color: $bg-grey; + padding: 5.25rem 0; } .logo { @@ -83,11 +81,6 @@ font-size: 2rem; } - #donors { - max-width: 980px; - margin-left: auto; - margin-right: auto; - } } @media only screen and (min-width: 477px) and (max-width: 768px) { diff --git a/src/views/credits/l10n.json b/src/views/credits/l10n.json index de3447892..216b98c49 100644 --- a/src/views/credits/l10n.json +++ b/src/views/credits/l10n.json @@ -1,6 +1,6 @@ { "credits.title": "Scratch Credits & Contributors", - "credits.developers": "Scratch is designed, developed, and moderated by the staff of the Scratch Foundation, a nonprofit organization.", + "credits.developers": "Scratch is designed, developed, and moderated by the Lifelong Kindergarten Group at MIT Media Lab:", "credits.moderators": "The team of Scratch moderators manages, supports, and improves the Scratch online community:", "credits.previousTitle": "Previous MIT Scratch Team Members", "credits.previousBody": "Many important contributions have been made by previous Scratch Team members, including John Maloney (who led software development for the first decade of Scratch) and Andrés Monroy-Hernández (who led the development of the first Scratch community website). Other contributors include:", @@ -15,13 +15,7 @@ "credits.researchScratchEdLinkText" : "ScratchEd project", "credits.acknowledgementsTitle": "Acknowledgements", "credits.acknowledgementsContributors": "The following people have also contributed to the development and support of Scratch over the years:", - "credits.acknowledgementsDonors": "The Scratch Foundation is a 501(c)(3) non-profit that relies on tax-deductible donations to support Scratch and keep it free for all. For a list of donors to the Scratch Foundation, please visit the {donorsLink}.", - "credits.acknowledgementsDonorsLinkText": "Supporters page", - "credits.acknowledgementsLifelongKindergarten": "The {lifelongKindergartenLink} at the MIT Media Lab initiated the Scratch project in 2002, and received a {nsfGrantLink} to support it a year later. The group publicly launched Scratch in 2007 and developed it through 2019, when the Scratch Team moved to the Scratch Foundation. The Lifelong Kindergarten group, led by Professor Mitchel Resnick, continues to collaborate with the Scratch Team to research and support creative learning with Scratch around the world.", - "credits.acknowledgementsLifelongKindergartenLinkText": "Lifelong Kindergarten research group", - "credits.acknowledgementsNSFGrantLinkText": "National Science Foundation Grant", "credits.acknowledgementsTranslators": "With the help of {translatorsLink} around the world, Scratch is available in many languages.", - "credits.acknowledgementsLanguageOrganizers": "Many thanks to the following language organizers for helping to coordinate Scratch translators in their language:", "credits.acknowledgementsTranslatorsLinkText": "Scratch Translators", "credits.acknowledgementsCommunity": "We greatly appreciate all of the contributions by members of the worldwide Scratch community, who have shaped the direction of Scratch by sharing their projects, comments, and ideas.", "credits.acknowledgementsInfluencers": "The ideas of Seymour Papert and Alan Kay have deeply inspired and influenced our work on Scratch.", @@ -31,15 +25,12 @@ "credits.supportersOpenHeader": "Scratch would not be possible without free and open source software, including:", "credits.currentSponsors": "Current Sponsors", "credits.currentFinancialSupport": "The following organizations are providing major financial support for Scratch:", - "credits.donorsTitle": "Donors", - "credits.lifelongKindergartenTitle": "Lifelong Kindergarten Group", - "credits.translationsTitle": "Translators", + "credits.translationsTitle": "Translations", "credits.illustrationsTitle": "Illustrations", "credits.acknowledgementsIllustrations": "Many thanks to the following artists for their contributions to the Scratch sprite library:", "credits.soundsTitle": "Sounds", - "credits.pastContributors": "Past Scratch Team Members", - "credits.pastContributorsThanks" : "Many important contributions have been made by previous Scratch Team members, including:", - "credits.acknowledgementsOtherContributors": "Past Contributors", + "credits.pastContributors": "Past Contributors", + "credits.pastContributorsThanks" : "Many important contributions have been made by previous Scratch Team members, including John Maloney (who led software development for the first decade of Scratch) and Andrés Monroy-Hernández (who led the development of the first Scratch community website).", "credits.otherContributors": "Other contributors include:", "credits.acknowledgementsSounds": "The Scratch sound library uses free sound resources from Adobe.com, Archive.org, FreeMusicArchive.org, FreeSound.org, and Incompetech.com.", "credits.soundsThanks":"Thanks to Nina Paley from Archive.org; Kellee Maize, Peter Rudenko, and Chris Zabriskie from FreeMusicArchive.org; and Kevin MacLeod from Incompetech.com. Thanks to the following freesound.org artists:" diff --git a/src/views/credits/people.json b/src/views/credits/people.json index 47e0386dc..bb73c87cb 100644 --- a/src/views/credits/people.json +++ b/src/views/credits/people.json @@ -1,9 +1,4 @@ [ - { - "userName": "cosmosaura", - "userId": 61436283, - "name": "Achal" - }, { "userName": "originalwow", "userId": 56182496, @@ -34,6 +29,11 @@ "userId": 3581881, "name": "Carl" }, + { + "userName": "tarmelop", + "userId": 2286560, + "name": "Carmelo" + }, { "userName": "Champ99", "userId": 900283, @@ -69,6 +69,11 @@ "userId": 55851826, "name": "Craig" }, + { + "userName": "Harakou", + "userId": 373646, + "name": "Dalton" + }, { "userName": "dsquare", "userId": 527836, @@ -94,16 +99,16 @@ "userId": 159139, "name": "Franchette" }, - { - "userName": "starry_sky7", - "userId": 61374093, - "name": "Iuliia" - }, { "userName": "pixelmoth", "userId": 2408962, "name": "Jacy" }, + { + "userName": "jaleesa", + "userId": 2374106, + "name": "Jaleesa" + }, { "userName": "Mos20", "userId": 52545208, @@ -144,21 +149,41 @@ "userId": 26779669, "name": "Kathy" }, + { + "userName": "khanning", + "userId": 1553886, + "name": "Kreg" + }, { "userName": "KayOh", "userId": 3018280, "name": "Kristin" }, { - "userName": "Lamatchalattei", - "userId": 61415372, - "name": "Lamar" + "userName": "labdalla", + "userId": 35687410, + "name": "Lena" + }, + { + "userName": "leoburd", + "userId": 385, + "name": "Leo" + }, + { + "userName": "lilyland", + "userId": 17184580, + "name": "Lily" }, { "userName": "algorithmar", "userId": 43013126, "name": "Maren" }, + { + "userName": "mwikali", + "userId": 24838781, + "name": "Marian" + }, { "userName": "dietbacon", "userId": 24137617, @@ -169,6 +194,16 @@ "userId": 49156, "name": "Mark" }, + { + "userName": "mres", + "userId": 167, + "name": "Mitchel" + }, + { + "userName": "natalie", + "userId": 169, + "name": "Natalie" + }, { "userName": "sgcc_", "userId": 21986973, @@ -179,45 +214,35 @@ "userId": 2584924, "name": "Ray" }, - { - "userName": "rtrvmwe", - "userId": 61342326, - "name": "Retrouvailles" - }, { "userName": "binnieb", "userId": 53715539, "name": "Robyn" }, - { - "userName": "rupalax", - "userId": 58005604, - "name": "Rupa" - }, { "userName": "scmb1", "userId": 246290, "name": "Sarah" }, { - "userName": "Onyx45", - "userId": 63526043, - "name": "Shawna" + "userName": "pizzafordessert", + "userId": 22183577, + "name": "Sean" }, { - "userName": "sgste735", - "userId": 69368419, - "name": "Stephanie" + "userName": "shruti", + "userId": 3714374, + "name": "Shruti" }, { - "userName": "LT7845", - "userId": 68837085, - "name": "Tasha" + "userName": "Pandatt", + "userId": 18417774, + "name": "Tracy" }, { - "userName": "Pandatt", - "userId": 18417774, - "name": "Tracy" + "userName": "shaanmasala", + "userId": 29995562, + "name": "Yusuf" }, { "userName": "Za-Chary", diff --git a/static/images/about/around-the-world.png b/static/images/about/around-the-world.png index aca987f63..29ab0f46e 100644 Binary files a/static/images/about/around-the-world.png and b/static/images/about/around-the-world.png differ