Skip to content

GitLab

S
scratch-www
Commit 191d78fa authored by morant's avatar morant
Browse files
Options

Merge branch 'develop' of https://github.com/LLK/scratch-www into feature/microworlds

parents 28aa4f0b db2b7ebc
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 15 deletions
src/views/teachers/faq/faq.jsx
View file @ 191d78fa
......@@ -22,18 +22,20 @@ var TeacherFaq = injectIntl(React.createClass({
<dd><FormattedHTMLMessage id='teacherfaq.teacherWhatBody' /></dd>
<iframe width="565" height="318" src="https://www.youtube.com/embed/7Hl9GxA1zwQ"
frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
<dt><FormattedMessage id='teacherfaq.teacherQuestionsTitle' /></dt>
<dd><FormattedHTMLMessage id='teacherfaq.teacherQuestionsBody' /></dd>
<dt><FormattedMessage id='teacherfaq.teacherGoogleTitle' /></dt>
<dd><FormattedHTMLMessage id='teacherfaq.teacherGoogleBody' /></dd>
<dt><FormattedMessage id='teacherfaq.teacherEdTitle' /></dt>
<dd><FormattedHTMLMessage id='teacherfaq.teacherEdBody' /></dd>
<dt><FormattedMessage id='teacherfaq.teacherSignUpTitle' /></dt>
<dd><FormattedHTMLMessage id='teacherfaq.teacherSignUpBody' /></dd>
<dt><FormattedMessage id='teacherfaq.teacherWaitTitle' /></dt>
<dd><FormattedHTMLMessage id='teacherfaq.teacherWaitBody' /></dd>
<dt><FormattedMessage id='teacherfaq.teacherPersonalTitle' /></dt>
<dd><FormattedHTMLMessage id='teacherfaq.teacherPersonalBody' /></dd>
<dt><FormattedMessage id='teacherfaq.teacherGoogleTitle' /></dt>
<dd><FormattedHTMLMessage id='teacherfaq.teacherGoogleBody' /></dd>
<dt><FormattedMessage id='teacherfaq.teacherEdTitle' /></dt>
<dd><FormattedHTMLMessage id='teacherfaq.teacherEdBody' /></dd>
<dt><FormattedMessage id='teacherfaq.teacherMultipleTitle' /></dt>
<dd><FormattedHTMLMessage id='teacherfaq.teacherMultipleBody' /></dd>
<dt><FormattedMessage id='teacherfaq.teacherQuestionsTitle' /></dt>
<dd><FormattedHTMLMessage id='teacherfaq.teacherQuestionsBody' /></dd>
</dl>
</section>
<section id="student-accounts">
......
src/views/teachers/faq/l10n.json
View file @ 191d78fa
......@@ -2,18 +2,20 @@
"teacherfaq.title": "Scratch Teacher Account FAQ",
"teacherfaq.teacherWhatTitle": "What are teacher accounts?",
"teacherfaq.teacherWhatBody": "A Scratch Teacher Account provides teachers and other educators with additional features to manage student participation on Scratch, including the ability to create student accounts, organize student projects into studios, and monitor student comments. Learn more about Teacher Accounts in the video below:",
"teacherfaq.teacherQuestionsTitle": "What if I have any questions or comments on Teacher Accounts?",
"teacherfaq.teacherQuestionsBody": "If you have any questions or feedback on Teacher Accounts, you can message us at <a href=\"mailto:teacher-accounts@scratch.mit.edu\">teacher-accounts@scratch.mit.edu</a>.",
"teacherfaq.teacherGoogleTitle": "Are teacher accounts integrated with Google Classroom or any other classroom managment service?",
"teacherfaq.teacherGoogleBody": "Scratch Teacher accounts are not integrated with any classroom management services.",
"teacherfaq.teacherEdTitle": "Are ScratchEd & Scratch Teacher accounts the same thing?",
"teacherfaq.teacherEdBody": "<a href=\"http://scratched.gse.harvard.edu/\">ScratchEd</a> accounts are not linked to Scratch Teacher accounts.",
"teacherfaq.teacherSignUpTitle": "How do I request a teacher account?",
"teacherfaq.teacherSignUpBody": "To request a Teacher Account, go to the teacher account <a href=\"/educators/register\">request form</a>.",
"teacherfaq.teacherWaitTitle": "Why do I have to wait 24 hours for my account?",
"teacherfaq.teacherWaitBody": "The Scratch Team uses this time to manually review account creation submissions to verify the account creator is an educator.",
"teacherfaq.teacherPersonalTitle": "Why do you need to know my personal information during registration?",
"teacherfaq.teacherPersonalBody": "We use this information to verify the account creator is an educator. We will not share this information with anyone else, and it will not be shared publicly on the site.",
"teacherfaq.teacherGoogleTitle": "Are teacher accounts integrated with Google Classroom or any other classroom managment service?",
"teacherfaq.teacherGoogleBody": "Scratch Teacher accounts are not integrated with any classroom management services.",
"teacherfaq.teacherEdTitle": "Are Scratch Teacher accounts linked to ScratchEd accounts?",
"teacherfaq.teacherEdBody": "No, Scratch Teacher accounts are not linked to <a href=\"http://scratched.gse.harvard.edu/\">ScratchEd</a> accounts.",
"teacherfaq.teacherMultipleTitle": "Can a class have multiple teachers?",
"teacherfaq.teacherMultipleBody": "A class can only have one teacher account associated with it.",
"teacherfaq.teacherQuestionsTitle": "What if I have any questions or comments on Teacher Accounts?",
"teacherfaq.teacherQuestionsBody": "If you have any questions or feedback on Teacher Accounts, you can message us at <a href=\"mailto:teacher-accounts@scratch.mit.edu\">teacher-accounts@scratch.mit.edu</a>.",
"teacherfaq.studentAccountsTitle": "Student Accounts",
"teacherfaq.studentVerifyTitle": "Do I have to verify each of my students' emails?",
......
src/views/teachers/landing/landing.jsx
View file @ 191d78fa
......@@ -82,19 +82,25 @@ var Landing = injectIntl(React.createClass({
<h3 id="guides-header"><FormattedMessage id="teacherlanding.guidesTitle" /></h3>
<FlexRow className="guides-and-tutorials">
<div>
<img src="/svgs/teachers/resources.svg" alt="resources icon" />
<a href="/help">
<img src="/svgs/teachers/resources.svg" alt="resources icon" />
</a>
<p>
<FormattedHTMLMessage id="teacherlanding.helpPage" />
</p>
</div>
<div>
<img src="/svgs/teachers/tips-window.svg" alt="tips window icon" />
<a href="/projects/editor/?tip_bar=home">
<img src="/svgs/teachers/tips-window.svg" alt="tips window icon" />
</a>
<p>
<FormattedHTMLMessage id="teacherlanding.tipsWindow" />
</p>
</div>
<div>
<img src="/svgs/teachers/creative-computing.svg" alt="creative computing icon" />
<a href="http://scratched.gse.harvard.edu/guide/">
<img src="/svgs/teachers/creative-computing.svg" alt="creative computing icon" />
</a>
<p>
<FormattedHTMLMessage id="teacherlanding.creativeComputing" />
</p>
......
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