From 37dba60b1cc8f7940cac27114e02046e7847ec0f Mon Sep 17 00:00:00 2001 From: caseymm Date: Thu, 21 Oct 2021 15:41:10 -0700 Subject: [PATCH] links in paragraphs --- .../text-and-media-snippet.jsx | 17 ++++++++++++-- .../annual-report/2020/annual-report.jsx | 22 +++++++++++++++++++ .../annual-report/2020/annual-report.scss | 2 +- src/views/annual-report/2020/l10n.json | 16 ++++++++++---- 4 files changed, 50 insertions(+), 7 deletions(-) diff --git a/src/components/text-and-media-snippet/text-and-media-snippet.jsx b/src/components/text-and-media-snippet/text-and-media-snippet.jsx index 371054262..ec80f79e5 100644 --- a/src/components/text-and-media-snippet/text-and-media-snippet.jsx +++ b/src/components/text-and-media-snippet/text-and-media-snippet.jsx @@ -31,7 +31,17 @@ const TextAndMediaSnippet = props => ( }
{props.title}
-

{props.paragraph}

+

+ {props.paragraph} + {props.link && + + {props.linkText} + + } + {props.paragraph2 && + {props.paragraph2} + } +

{props.className === 'reverse' &&
@@ -61,7 +71,10 @@ TextAndMediaSnippet.propTypes = { className: PropTypes.string, video_id: PropTypes.string, type: PropTypes.string, - alt: PropTypes.string + alt: PropTypes.string, + link: PropTypes.string, + linkText: PropTypes.string, + paragraph2: PropTypes.string }; module.exports = TextAndMediaSnippet; diff --git a/src/views/annual-report/2020/annual-report.jsx b/src/views/annual-report/2020/annual-report.jsx index 52fa43f1f..4705c7c5a 100644 --- a/src/views/annual-report/2020/annual-report.jsx +++ b/src/views/annual-report/2020/annual-report.jsx @@ -1366,6 +1366,10 @@ class AnnualReport extends React.Component {

+ + + +

@@ -1374,6 +1378,10 @@ class AnnualReport extends React.Component {

+ + + +

@@ -1445,6 +1453,13 @@ class AnnualReport extends React.Component { paragraph={this.props.intl.formatMessage( {id: 'annualReport.2020.adaptationHighlightText4b'} )} + link="https://scratch.mit.edu/studios/25970382" + linkText={this.props.intl.formatMessage( + {id: 'annualReport.2020.adaptationHighlightText4c'} + )} + paragraph2={this.props.intl.formatMessage( + {id: 'annualReport.2020.adaptationHighlightText4d'} + )} alt={this.props.intl.formatMessage( {id: 'annualReport.2020.altHackYourWindow'} )} @@ -1483,6 +1498,13 @@ class AnnualReport extends React.Component { alt={this.props.intl.formatMessage( {id: 'annualReport.2020.altScratchInteraction'} )} + link="https://theclubhousenetwork.org/" + linkText={this.props.intl.formatMessage( + {id: 'annualReport.2020.adaptationSnapshot1TextB'} + )} + paragraph2={this.props.intl.formatMessage( + {id: 'annualReport.2020.adaptationSnapshot1TextC'} + )} type="image" large_image="/images/annual-report/2020/adaptation/Computer Clubhouse Illustration.svg" /> diff --git a/src/views/annual-report/2020/annual-report.scss b/src/views/annual-report/2020/annual-report.scss index d1d3b4db3..12bb59390 100644 --- a/src/views/annual-report/2020/annual-report.scss +++ b/src/views/annual-report/2020/annual-report.scss @@ -57,7 +57,7 @@ p { } p a { - white-space: wrap; + white-space: break-spaces; } a, a:link, a:visited, a:active{ diff --git a/src/views/annual-report/2020/l10n.json b/src/views/annual-report/2020/l10n.json index c535e7f18..e71f7a156 100644 --- a/src/views/annual-report/2020/l10n.json +++ b/src/views/annual-report/2020/l10n.json @@ -140,13 +140,19 @@ "annualReport.2020.adaptationHighlightText2": "Aaron’s students worked together to build a “kooky” version of their town called “Norwouldn’t,” packed with storybook creatures, original artwork, and interconnecting narratives. It was one of many collaborative Scratch projects Aaron facilitated to remind students that even while COVID-19 kept them inside their homes, they were still part of a caring and joyful community.", "annualReport.2020.adaptationHighlightTitle2": "Scratch at Home", - "annualReport.2020.adaptationHighlightText2b": "On March 17, we responded to the COVID-19 crisis by launching the #ScratchAtHome initiative to provide children, families, and educators with ideas for engaging in creative learning activities with Scratch at home. It was an invaluable way to connect with our community and adapt to a whole new way of learning and interacting online.", + "annualReport.2020.adaptationHighlightText2b": "On March 17, we responded to the COVID-19 crisis by launching the", + "annualReport.2020.adaptationHighlightText2c": " #ScratchAtHome initiative ", + "annualReport.2020.adaptationHighlightText2d": "to provide children, families, and educators with ideas for engaging in creative learning activities with Scratch at home. It was an invaluable way to connect with our community and adapt to a whole new way of learning and interacting online.", "annualReport.2020.adaptationHighlightTitle3": "Live Create-Alongs", - "annualReport.2020.adaptationHighlightText3b": "Our team hosted weekly, live Create-Alongs to connect with kids, parents, and educators at home and share tips and tricks for creating different types of Scratch projects. We had a blast seeing the projects they were inspired to create in our Create-Along studios!", + "annualReport.2020.adaptationHighlightText3b": "Our team hosted weekly, live", + "annualReport.2020.adaptationHighlightText3c": " Create-Alongs ", + "annualReport.2020.adaptationHighlightText3d": "to connect with kids, parents, and educators at home and share tips and tricks for creating different types of Scratch projects. We had a blast seeing the projects they were inspired to create in our Create-Along studios!", "annualReport.2020.adaptationHighlightTitle4": "Hack Your Window", - "annualReport.2020.adaptationHighlightText4b": "Scratch educator Eduard Muntaner Perich created a #ScratchAtHome-inspired studio that took the community by storm: Hack Your Window. Hundreds of Scratchers from all over the world imagined fantastical games and stories happening just outside their window.", + "annualReport.2020.adaptationHighlightText4b": "Scratch educator Eduard Muntaner Perich created a #ScratchAtHome-inspired studio that took the community by storm:", + "annualReport.2020.adaptationHighlightText4c": " Hack Your Window", + "annualReport.2020.adaptationHighlightText4d": ". Hundreds of Scratchers from all over the world imagined fantastical games and stories happening just outside their window.", "annualReport.2020.adaptationEducatorsTitle": "Connecting with Educators", "annualReport.2020.adaptationEducatorsText": "Educators around the world shared their own #ScratchAtHome ideas and discussed the struggles and triumphs of teaching remotely in a lively Twitter Chat on April 8th, 2020.", @@ -154,7 +160,9 @@ "annualReport.2020.adaptationSnapshot": "Snapshots", "annualReport.2020.adaptationSnapshot1Title": "Computer Clubhouse Network Virtual Workshops", - "annualReport.2020.adaptationSnapshot1Text": "As part of our longstanding partnership, the Scratch Team conducts workshops for youth educators from The Clubhouse Network. Like educators around the world, our team had to conduct online workshops for the first time in 2020—and learn how to combat the isolation and technical difficulties of virtual learning. But thanks to online collaboration tools and innovative methods of sharing and reflecting, the team was able to recreate the collaborative, playful spirit of in-person workshops in a virtual space.", + "annualReport.2020.adaptationSnapshot1Text": "As part of our longstanding partnership, the Scratch Team conducts workshops for youth educators from", + "annualReport.2020.adaptationSnapshot1TextB": " The Clubhouse Network", + "annualReport.2020.adaptationSnapshot1TextC": ". Like educators around the world, our team had to conduct online workshops for the first time in 2020—and learn how to combat the isolation and technical difficulties of virtual learning. But thanks to online collaboration tools and innovative methods of sharing and reflecting, the team was able to recreate the collaborative, playful spirit of in-person workshops in a virtual space.", "annualReport.2020.adaptationSnapshot2Title": "Bring Yourself Into Scratch", "annualReport.2020.adaptationSnapshot2Text": "2020 was also a year of adapting our tools and platform. We developed and added new sprites to the Sprite Library to inspire and enable beginner Scratchers to make projects representative of their racial, cultural, gender, or other personal identity.",