Skip to content

GitLab

S
scratch-www
Commit 79b538de authored by seotts's avatar seotts Committed by Karishma Chadha
Browse files
Options

add correct hrefs to links, and open in new tabs

parent c08650f2
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 22 deletions
src/views/annual-report/annual-report.jsx
View file @ 79b538de
...@@ -356,7 +356,11 @@ class AnnualReport extends React.Component { ...@@ -356,7 +356,11 @@ class AnnualReport extends React.Component {
id="annualReport.covidResponseP2" id="annualReport.covidResponseP2"
values={{ values={{
scratchAtHomeLink: ( scratchAtHomeLink: (
<a href="#"> <a
href="https://sip.scratch.mit.edu/scratchathome/"
rel="noreferrer noopener"
target="_blank"
>
<FormattedMessage id="annualReport.covidResponseScratchAtHomePage" /> <FormattedMessage id="annualReport.covidResponseScratchAtHomePage" />
</a> </a>
) )
...@@ -368,7 +372,11 @@ class AnnualReport extends React.Component { ...@@ -368,7 +372,11 @@ class AnnualReport extends React.Component {
id="annualReport.covidResponseP3" id="annualReport.covidResponseP3"
values={{ values={{
scratchCommunityLink: ( scratchCommunityLink: (
<a href="#"> <a
href="/"
rel="noreferrer noopener"
target="_blank"
>
<FormattedMessage id="annualReport.covidResponseScratchCommunity" /> <FormattedMessage id="annualReport.covidResponseScratchCommunity" />
</a> </a>
) )
...@@ -966,7 +974,11 @@ class AnnualReport extends React.Component { ...@@ -966,7 +974,11 @@ class AnnualReport extends React.Component {
</h5> </h5>
), ),
CSandLanguageArtsLink: ( CSandLanguageArtsLink: (
<a href="https://www.pila-cs.org/"> <a
href="https://www.pila-cs.org/"
rel="noreferrer noopener"
target="_blank"
>
<FormattedMessage id="annualReport.toolsCSandLanguageArts" /> <FormattedMessage id="annualReport.toolsCSandLanguageArts" />
</a> </a>
) )
...@@ -990,12 +1002,20 @@ class AnnualReport extends React.Component { ...@@ -990,12 +1002,20 @@ class AnnualReport extends React.Component {
id="annualReport.toolsLEGORoboticsIntro" id="annualReport.toolsLEGORoboticsIntro"
values={{ values={{
mindstormsLink: ( mindstormsLink: (
<a href=""> <a
href="https://scratch.wistia.com/medias/0huu6wfiki"
rel="noreferrer noopener"
target="_blank"
>
<FormattedMessage id="annualReport.toolsMindstormsLink" /> <FormattedMessage id="annualReport.toolsMindstormsLink" />
</a> </a>
), ),
weDoLink: ( weDoLink: (
<a href=""> <a
href="https://scratch.wistia.com/medias/4im7iizv47"
rel="noreferrer noopener"
target="_blank"
>
<FormattedMessage id="annualReport.toolsWeDoLink" /> <FormattedMessage id="annualReport.toolsWeDoLink" />
</a> </a>
) )
...@@ -1057,12 +1077,20 @@ class AnnualReport extends React.Component { ...@@ -1057,12 +1077,20 @@ class AnnualReport extends React.Component {
id="annualReport.toolsAppIntro" id="annualReport.toolsAppIntro"
values={{ values={{
downloadableLink: ( downloadableLink: (
<a href=""> <a
href="https://scratch.mit.edu/download"
rel="noreferrer noopener"
target="_blank"
>
<FormattedMessage id="annualReport.toolsDownloadLink" /> <FormattedMessage id="annualReport.toolsDownloadLink" />
</a> </a>
), ),
raspberryLink: ( raspberryLink: (
<a href=""> <a
href="https://www.raspberrypi.org/blog/scratch-3-desktop-for-raspbian-on-raspberry-pi/"
rel="noreferrer noopener"
target="_blank"
>
<FormattedMessage id="annualReport.toolsRaspberryLink" /> <FormattedMessage id="annualReport.toolsRaspberryLink" />
</a> </a>
) )
...@@ -1226,7 +1254,10 @@ class AnnualReport extends React.Component { ...@@ -1226,7 +1254,10 @@ class AnnualReport extends React.Component {
id="annualReport.communityEngagementInfo" id="annualReport.communityEngagementInfo"
values={{ values={{
storySwapLink: ( storySwapLink: (
<a href="#"> <a
href="/studios/25034966/"
target="_blank"
>
<FormattedMessage id="annualReport.storySwap" /> <FormattedMessage id="annualReport.storySwap" />
</a> </a>
) )
...@@ -1243,7 +1274,10 @@ class AnnualReport extends React.Component { ...@@ -1243,7 +1274,10 @@ class AnnualReport extends React.Component {
</p> </p>
<div className="sds-list"> <div className="sds-list">
<div className="sds-tile"> <div className="sds-tile">
<a href="studios/6234813/"> <a
href="studios/6234813/"
target="_blank"
>
<img <img
src="/images/annual-report/initiatives/Day in the Life Thumbnail.png" src="/images/annual-report/initiatives/Day in the Life Thumbnail.png"
/> />
...@@ -1254,7 +1288,10 @@ class AnnualReport extends React.Component { ...@@ -1254,7 +1288,10 @@ class AnnualReport extends React.Component {
</p> </p>
</div> </div>
<div className="sds-tile"> <div className="sds-tile">
<a href="studios/5801323/"> <a
href="studios/5801323/"
target="_blank"
>
<img <img
src="/images/annual-report/initiatives/Year 3000 Thumbnail.png" src="/images/annual-report/initiatives/Year 3000 Thumbnail.png"
/> />
...@@ -1265,7 +1302,10 @@ class AnnualReport extends React.Component { ...@@ -1265,7 +1302,10 @@ class AnnualReport extends React.Component {
</p> </p>
</div> </div>
<div className="sds-tile"> <div className="sds-tile">
<a href="studios/5702799/"> <a
href="studios/5702799/"
target="_blank"
>
<img <img
src="/images/annual-report/initiatives/Bounce Thumbnail.png" src="/images/annual-report/initiatives/Bounce Thumbnail.png"
/> />
...@@ -1276,7 +1316,10 @@ class AnnualReport extends React.Component { ...@@ -1276,7 +1316,10 @@ class AnnualReport extends React.Component {
</p> </p>
</div> </div>
<div className="sds-tile"> <div className="sds-tile">
<a href="studios/5944573/"> <a
href="studios/5944573/"
target="_blank"
>
<img <img
src="/images/annual-report/initiatives/Monochromatic Thumbnail.png" src="/images/annual-report/initiatives/Monochromatic Thumbnail.png"
/> />
...@@ -1360,7 +1403,10 @@ class AnnualReport extends React.Component { ...@@ -1360,7 +1403,10 @@ class AnnualReport extends React.Component {
id="annualReport.communityBLMIntro" id="annualReport.communityBLMIntro"
values={{ values={{
BLMStudioLink: ( BLMStudioLink: (
<a href="studio/26964367"> <a
href="/studio/26964367"
target="_blank"
>
Black Lives Matter <FormattedMessage Black Lives Matter <FormattedMessage
id="annualReport.studio" id="annualReport.studio"
/> />
...@@ -1551,13 +1597,21 @@ class AnnualReport extends React.Component { ...@@ -1551,13 +1597,21 @@ class AnnualReport extends React.Component {
<div className="news-links"> <div className="news-links">
<div className="icon-and-link"> <div className="icon-and-link">
<img src="/images/annual-report/initiatives/schools/CPS Story/News Icon.svg" /> <img src="/images/annual-report/initiatives/schools/CPS Story/News Icon.svg" />
<a href="#"> <a
href="https://chicago.suntimes.com/2019/12/9/21003124/chance-rapper-superme-i-love-you-so-much-cps-public-schools-video-game-google"
rel="noreferrer noopener"
target="_blank"
>
<FormattedMessage id="annualReport.chicagoSunTimesArticle" /> <FormattedMessage id="annualReport.chicagoSunTimesArticle" />
</a> </a>
</div> </div>
<div className="icon-and-link"> <div className="icon-and-link">
<img src="/images/annual-report/initiatives/schools/CPS Story/News Icon.svg" /> <img src="/images/annual-report/initiatives/schools/CPS Story/News Icon.svg" />
<a href="#"> <a
href="https://www.rollingstone.com/music/music-news/chance-the-rapper-i-love-you-so-much-video-game-made-by-chicago-students-925198/"
rel="noreferrer noopener"
target="_blank"
>
<FormattedMessage id="annualReport.rollingStonesArticle" /> <FormattedMessage id="annualReport.rollingStonesArticle" />
</a> </a>
</div> </div>
...@@ -1606,21 +1660,33 @@ class AnnualReport extends React.Component { ...@@ -1606,21 +1660,33 @@ class AnnualReport extends React.Component {
id="annualReport.conferencesLatinAmericaDescription" id="annualReport.conferencesLatinAmericaDescription"
values={{ values={{
scratchAlSurLink: ( scratchAlSurLink: (
<a href="#"> <a
href="https://www.scratchalsur.org/"
rel="noreferrer noopener"
target="_blank"
>
Scratch al Sur Scratch al Sur
</a> </a>
), ),
spanishVersionLink: ( spanishVersionLink: (
<a href="#"> <a
href="https://scratchalsur.org/assets/computaci%c3%b3n-creativa.pdf"
rel="noreferrer noopener"
target="_blank"
>
<FormattedMessage id="annualReport.conferencesSpanishVersionLinkText" /> <FormattedMessage id="annualReport.conferencesSpanishVersionLinkText" />
</a> </a>
), ),
creativeComputingCurriculumLink: ( creativeComputingCurriculumLink: (
<a href="#"> <a
href="http://creativecomputing.gse.harvard.edu/guide/curriculum.html"
rel="noreferrer noopener"
target="_blank"
>
Creative Computing Curriculum Creative Computing Curriculum
</a> </a>
) )
}} }}
/> />
</p> </p>
</div> </div>
...@@ -1635,7 +1701,11 @@ class AnnualReport extends React.Component { ...@@ -1635,7 +1701,11 @@ class AnnualReport extends React.Component {
id="annualReport.conferencesEuropeDescription" id="annualReport.conferencesEuropeDescription"
values={{ values={{
scratchConferenceEuropeLink: ( scratchConferenceEuropeLink: (
<a href="#"> <a
href="https://www.raspberrypi.org/blog/keynote-speeches-scratch-conference-europe-2019/"
rel="noreferrer noopener"
target="_blank"
>
Scratch Conference Europe Scratch Conference Europe
{/* <FormattedMessage id="annualReport.conferencesScratchConferenceEuropeLinkText" /> */} {/* <FormattedMessage id="annualReport.conferencesScratchConferenceEuropeLinkText" /> */}
</a> </a>
...@@ -1662,7 +1732,7 @@ class AnnualReport extends React.Component { ...@@ -1662,7 +1732,7 @@ class AnnualReport extends React.Component {
values={{ values={{
photoCredit: 'Carmelo Presicce' photoCredit: 'Carmelo Presicce'
}} }}
/> />
</div> </div>
<div className="conference-title-and-description"> <div className="conference-title-and-description">
<h4> <h4>
...@@ -1673,7 +1743,11 @@ class AnnualReport extends React.Component { ...@@ -1673,7 +1743,11 @@ class AnnualReport extends React.Component {
id="annualReport.conferencesAfricaDescription" id="annualReport.conferencesAfricaDescription"
values={{ values={{
scratchAfricaConferenceLink: ( scratchAfricaConferenceLink: (
<a href="#"> <a
href="https://www.scratchafrica.com/"
rel="noreferrer noopener"
target="_blank"
>
Scratch Africa Conference Scratch Africa Conference
{/* <FormattedMessage id="annualReport.conferencesScratchAfricaConferenceLinkText" /> */} {/* <FormattedMessage id="annualReport.conferencesScratchAfricaConferenceLinkText" /> */}
</a> </a>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment