Skip to content

GitLab

S
scratch-www
Commit 615aa812 authored by Karishma Chadha's avatar Karishma Chadha
Browse files
Options

Update content/copy from Initiatives - Community through Financials section.... 

Update content/copy from Initiatives - Community through Financials section. Add missing link in Initiatives - Schools section. Add new financials note. Fix financials percentages. Clean up some commented out code from scss file.
parent da1e8c00
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 27 deletions
src/views/annual-report/annual-report.jsx
View file @ 615aa812
......@@ -1725,7 +1725,20 @@ class AnnualReport extends React.Component {
<FormattedMessage id="annualReport.extendingReachHeader" />
</h4>
<p>
<FormattedMessage id="annualReport.extendingReachDescription" />
<FormattedMessage
id="annualReport.extendingReachDescription"
values={{
codeYourHeroLink: (
<a
href="https://csfirst.withgoogle.com/c/cs-first/en/code-your-hero/overview.html"
rel="noreferrer noopener"
target="_blank"
>
<FormattedMessage id="annualReport.codeYourHero" />
</a>
)
}}
/>
</p>
</div>
<h4>
......@@ -1928,6 +1941,9 @@ class AnnualReport extends React.Component {
<h2 className="financials-h2">
<FormattedMessage id="annualReport.financialsTitle" />
</h2>
<div className="financials-future">
<FormattedMessage id="annualReport.financialsFutureYears" />
</div>
<h3>
<FormattedMessage id="annualReport.financialsRevenue" />
</h3>
......@@ -1942,7 +1958,7 @@ class AnnualReport extends React.Component {
</p>
<p>
$3,898,078
<span className="percentage"> (82.7%)</span>
<span className="percentage"> (83%)</span>
</p>
</div>
</div>
......@@ -1954,7 +1970,7 @@ class AnnualReport extends React.Component {
</p>
<p>
$700,000
<span className="percentage"> (14.8%)</span>
<span className="percentage"> (15%)</span>
</p>
</div>
</div>
......@@ -1966,7 +1982,7 @@ class AnnualReport extends React.Component {
</p>
<p>
$114,982
<span className="percentage"> (2.4%)</span>
<span className="percentage"> (2%)</span>
</p>
</div>
</div>
......@@ -2000,7 +2016,7 @@ class AnnualReport extends React.Component {
</p>
<p>
$1,135,767
<span className="percentage"> (48.8%)</span>
<span className="percentage"> (49%)</span>
</p>
</div>
</div>
......@@ -2012,7 +2028,7 @@ class AnnualReport extends React.Component {
</p>
<p>
$224,104
<span className="percentage"> (9.6%)</span>
<span className="percentage"> (10%)</span>
</p>
</div>
</div>
......@@ -2024,7 +2040,7 @@ class AnnualReport extends React.Component {
</p>
<p>
$962,958
<span className="percentage"> (41.4%)</span>
<span className="percentage"> (41%)</span>
</p>
</div>
</div>
......
src/views/annual-report/annual-report.scss
View file @ 615aa812
......@@ -2159,11 +2159,10 @@ p {
}
h2 {
margin-bottom: 88px;
line-height: 64px;
margin-bottom: 20px;
}
h2, h3 {
h2, h3, .financials-future {
text-align: left;
}
......@@ -2174,6 +2173,12 @@ p {
opacity: .25;
}
.financials-future {
font-size: 1.25rem;
line-height: 2.5rem;
margin-bottom: 54px;
}
.financials-content {
display: flex;
align-items: center;
......@@ -2284,7 +2289,7 @@ p {
padding: 64px 0;
}
h2 {
.financials-future {
margin-bottom: 64px;
}
}
......@@ -2295,15 +2300,7 @@ p {
width: 100%;
}
// h2 {
// font-size: 2rem;
// }
// h3 {
// font-size: 1.75rem;
// }
h2, h3 {
h2, h3, .financials-future {
text-align: center;
}
......@@ -2420,7 +2417,6 @@ p {
.comment-text {
background-color: $ui-white;
text-align: left;
//margin: 20px;
padding: 20px;
p {
......
src/views/annual-report/l10n.json
View file @ 615aa812
......@@ -127,11 +127,11 @@
"annualReport.toolsAbhiQuote": "My favorite thing about Scratch is the community, because they are nice and helpful to me. That’s why I’m always happy to share every project that’s in my dreams.",
"annualReport.communityTitle": "Community",
"annualReport.communityIntro": "The Scratch programming language has always been intertwined with the Scratch online community, providing opportunities for children to collaborate, share, and provide feedback to one another.",
"annualReport.communityIntro": "The Scratch online community has always been an important part of the Scratch experience, providing opportunities for children to collaborate, share, and provide feedback to one another.",
"annualReport.communitySpotlight": "Community — Spotlight Story",
"annualReport.communityTeam": "Scratch Community Team",
"annualReport.communityTeamIntro1": "When asked why they use Scratch, most Scratchers talk about the importance of the online community for motivating their ongoing participation, providing a space where they can express their creativity, make friends, receive feedback, get new ideas, and learn new skills. Many Scratchers express their appreciation for the Scratch community as a safe and welcoming space to connect, share, and learn from one another.",
"annualReport.communityTeamIntro2": "With 40,000 new projects and 400,000 new comments in the Scratch online community each day, how can we ensure that the community remains safe and friendly, while also supporting and encouraging creative expression? Our Community Team, including full-time staff and a network of moderators, leads this essential work . Two key dimensions of the Community Team's work include moderation and community engagement.",
"annualReport.communityTeamIntro2": "With 40,000 new projects and 400,000 new comments in the Scratch online community each day, how can we ensure that the community remains safe and friendly, while also supporting and encouraging creative expression? Our Community Team, including full-time staff and a network of moderators, leads this essential work. There are two key dimensions of the Community Team's work: moderation and community engagement.",
"annualReport.communityModerationTitle": "Community Moderation",
"annualReport.communityModerationInfo": "When young people join the Scratch community, they agree to follow a set of Community Guidelines, which are designed to keep Scratch a safe and supportive place for young people from all backgrounds. Our Community Team uses a wide variety of tools and strategies to encourage good digital citizenship and maintain a positive environment for Scratchers to create in. Automated filters prevent private information from being shared or inappropriate content from being posted, and we allow anyone to report content they feel violates the Community Guidelines.",
"annualReport.communityGuidelinesTitle": "Community Guidelines",
......@@ -178,10 +178,11 @@
"annualReport.familyNightsPhotoCredit": "Photos by Jordan Macy, SocialWorks",
"annualReport.teacherPDHeader": "Investing in Professional Development for Teachers",
"annualReport.teacherPDDescription": "Teachers across the participating elementary schools came together for professional development workshops, gaining first-hand experience in creating their own Scratch projects and finding meaningful ways to use Scratch to support student learning across the curriculum.",
"annualReport.teacherPDQuoteAttribution": "{teacherName}, CPS Teacher",
"annualReport.teacherPDQuoteAttribution": "{teacherName}, CPS Educator",
"annualReport.teacherPDQuote": "What surprised me most was the intrinsic collaboration that came with using Scratch in my classroom. Often, students themselves would discover something in the Scratch platform, show me, and then spread it among themselves.",
"annualReport.extendingReachHeader": "Extending the Reach",
"annualReport.extendingReachDescription": "To expand the reach of this partnership, CS4ALL Chicago built on the Family Creative Coding Night model and has made it available to all Chicago Public Schools. Google CS First produced Code Your Hero guides for students and teachers, available free online in English and Spanish.",
"annualReport.extendingReachDescription": "To expand the reach of this partnership, CS4ALL Chicago built on the Family Creative Coding Night model and has made it available to all Chicago Public Schools. Google CS First produced {codeYourHeroLink} guides for students and teachers, available free online in English and Spanish.",
"annualReport.codeYourHero": "Code Your Hero",
"annualReport.inTheNewsHeader": "In the News",
"annualReport.chicagoSunTimesArticle": "Chicago Sun Times Article",
"annualReport.rollingStonesArticle": "Rolling Stones Article",
......@@ -202,14 +203,14 @@
"annualReport.financialsTitle": "Financials - 2019",
"annualReport.financialsRevenue": "Revenues",
"annualReport.financialsGrants": "Grants, individual, & corporate donations (Gala Included)",
"annualReport.financialsGrants": "Grants, individual, corporate and events",
"annualReport.financialsRestrictedGrants": "Restricted grants and donations",
"annualReport.financialsOther": "Other income",
"annualReport.financialsTotal": "Total",
"annualReport.financialsExpenses": "Expenses",
"annualReport.financialsProgram": "Initiatives",
"annualReport.financialsGeneral": "General and administrative",
"annualReport.financialsFundraising": "Fundraising (Gala and others)",
"annualReport.financialsFundraising": "Fundraising operations and events",
"annualReport.financialsButton": "2019 Audited Financials",
"annualReport.financialsFutureYears": "Note: Financials in future years will be significantly different, since the Scratch staff has now transitioned from MIT to the Scratch Foundation.",
......
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