Merge branch 'master' into feature/webgl

This commit is contained in:
Scott Erickson 2014-09-30 10:21:51 -07:00
commit 6b03de0235
5 changed files with 71 additions and 117 deletions

View file

@ -27,29 +27,29 @@ Whether you're novice or pro, the CodeCombat team is ready to help you implement
![Nick Winter](http://codecombat.com/images/pages/about/nick_small.png)
![Michael Schmatz](http://codecombat.com/images/pages/about/michael_small.png)
![Jeremy Arns](http://codecombat.com/images/pages/about/jeremy_small.png)
![Glen De Cauwsemaecker](http://codecombat.com/images/pages/about/glen_small.png)
![Tom Steinbrecher](http://codecombat.com/images/pages/contribute/archmage/tom_small.png)
![Sébastien Moratinos](http://codecombat.com/images/pages/contribute/archmage/sebastien_small.png)
![deepak1556](http://codecombat.com/images/pages/contribute/archmage/deepak_small.png)
![Ronnie Cheng](http://codecombat.com/images/pages/contribute/archmage/ronald_small.png)
![Chloe Fan](http://codecombat.com/images/pages/contribute/archmage/chloe_small.png)
![Rachel Xiang](http://codecombat.com/images/pages/contribute/archmage/rachel_small.png)
![Dan Ristic](http://codecombat.com/images/pages/contribute/archmage/dan_small.png)
![Brad Dickason](http://codecombat.com/images/pages/contribute/archmage/brad_small.png)
![Rebecca Saines](http://codecombat.com/images/pages/contribute/archmage/becca_small.png)
![Laura Watiker](http://codecombat.com/images/pages/contribute/archmage/laura_small.png)
![Shiying Zheng](http://codecombat.com/images/pages/contribute/archmage/shiying_small.png)
![Mischa Lewis-Norelle](http://codecombat.com/images/pages/contribute/archmage/mischa_small.png)
![Paul Buser](http://codecombat.com/images/pages/contribute/archmage/paul_small.png)
![Benjamin Stern](http://codecombat.com/images/pages/contribute/archmage/ben_small.png)
![Alex Cotsarelis](http://codecombat.com/images/pages/contribute/archmage/alex_small.png)
![Ken Stanley](http://codecombat.com/images/pages/contribute/archmage/ken_small.png)
![Robert Moreton](http://codecombat.com/images/pages/contribute/artisan/rob_small.png)
![Andrew Witcher](http://codecombat.com/images/pages/contribute/artisan/andrew_small.png)
![Axandre Oge](http://codecombat.com/images/pages/contribute/artisan/axandre_small.png)
![Katharine Chan](http://codecombat.com/images/pages/contribute/artisan/katharine_small.png)
![Derek Wong](http://codecombat.com/images/pages/contribute/artisan/derek_small.png)
![Glen De Cauwsemaecker](https://dl.dropboxusercontent.com/u/6351701/Avatars/Glen%20de%20Cauwsemaecker/glen_100.png)
![Tom Steinbrecher](https://dl.dropboxusercontent.com/u/6351701/Avatars/Tom%20Steinbrecher/tom_100.png)
![Sébastien Moratinos](https://dl.dropboxusercontent.com/u/6351701/Avatars/Tom%20Steinbrecher/tom_100.png)
![deepak1556](https://dl.dropboxusercontent.com/u/6351701/Avatars/Deepak1556/deepak_100.png)
![Ronnie Cheng](https://dl.dropboxusercontent.com/u/6351701/Avatars/Ronnie%20Cheng/ronnie_100.png)
![Chloe Fan](https://dl.dropboxusercontent.com/u/6351701/Avatars/Chloe%20Fan/chloe_100.png)
![Rachel Xiang](https://dl.dropboxusercontent.com/u/6351701/Avatars/Rachel%20Xiang/rachel_100.png)
![Dan Ristic](https://dl.dropboxusercontent.com/u/6351701/Avatars/Dan%20Ristic/dan_100.png)
![Brad Dickason](https://dl.dropboxusercontent.com/u/6351701/Avatars/Brad%20Dickason/brad_100.png)
![Rebecca Saines](https://dl.dropboxusercontent.com/u/6351701/Avatars/Rebecca%20Saines/rebecca_100.png)
![Laura Watiker](https://dl.dropboxusercontent.com/u/6351701/Avatars/Laura%20Watiker/laura_100.png)
![Shiying Zheng](https://dl.dropboxusercontent.com/u/6351701/Avatars/Shying%20Zheng/shiyeng_100.png)
![Mischa Lewis-Norelle](https://dl.dropboxusercontent.com/u/6351701/Avatars/Mischa%20Lewis-Norelle/mischa_100.png)
![Paul Buser](https://dl.dropboxusercontent.com/u/6351701/Avatars/Paul%20Buser/paul_100.png)
![Benjamin Stern](https://dl.dropboxusercontent.com/u/6351701/Avatars/Benjamin%20Stern/benjamin_100.png)
![Alex Cotsarelis](https://dl.dropboxusercontent.com/u/6351701/Avatars/Alex%20Cotsarelis/alex_100.png)
![Ken Stanley](https://dl.dropboxusercontent.com/u/6351701/Avatars/Ken%20Stanley/ken_100.png)
![Robert Moreton](https://dl.dropboxusercontent.com/u/6351701/Avatars/Robert%20Moreton/robert_100.png)
![Andrew Witcher](https://dl.dropboxusercontent.com/u/6351701/Avatars/Andrew%20Witcher/andrew_100.png)
![Axandre Oge](https://dl.dropboxusercontent.com/u/6351701/Avatars/Axandre%20Oge/axandre_100.png)
![Katharine Chan](https://dl.dropboxusercontent.com/u/6351701/Avatars/Katharine%20Chan/katharine_100.png)
![Derek Wong](https://dl.dropboxusercontent.com/u/6351701/Avatars/Derek%20Wong/derek_100.png)
----------
[![](http://1-ps.googleusercontent.com/x/s.google-melange.appspot.com/www.google-melange.com/soc/content/2-1-20140225/images/gsoc/logo/920x156xbanner-gsoc2014.png.pagespeed.ic.gdr4t3Igca.png)](http://www.google-melange.com/gsoc/homepage/google/gsoc2014)
[![](http://1-ps.googleusercontent.com/x/s.google-melange.appspot.com/www.google-melange.com/soc/content/2-1-20140225/images/gsoc/logo/920x156xbanner-gsoc2014.png.pagespeed.ic.gdr4t3Igca.png)](http://www.google-melange.com/gsoc/homepage/google/gsoc2014)

5
app/styles/teachers.sass Normal file
View file

@ -0,0 +1,5 @@
#teachers-view
.main-content-area
width: 650px
box-shadow: 0px 0px 0px

View file

@ -61,8 +61,7 @@ block content
.team_bio
h4.team_name
a(href="http://georgesaines.com") George Saines
h4.team_name George Saines
p(data-i18n="about.george_title")
| CEO

View file

@ -75,6 +75,7 @@ body
a(title='Contact', tabindex=-1, data-toggle="coco-modal", data-target="modal/ContactModal", data-i18n="nav.contact") Contact
a(href='http://blog.codecombat.com/', data-i18n="nav.blog") Blog
a(href='http://discourse.codecombat.com/', data-i18n="nav.forum") Forum
a(href='/teachers', data-i18n="nav.forum") Teachers
if me.isAdmin()
a(href='/admin', data-i18n="nav.admin") Admin

View file

@ -8,104 +8,53 @@ block content
h2 CodeCombat for Teachers
p.lead Want to use CodeCombat in your classroom? Great!
h3 Preparation
p It's free, there's no signup required, and we're excited to hear what your students think.
p CodeCombat is free to play and does not require students to sign up. We encourage teachers to
a(href="http://codecombat.com/play") play through the campaign
| to try it out, but the only thing you absolutely need to do to be ready is ensure students have access to a computer or iPad.
p You should be able to just point your kids at the site and let them play--you don't need to introduce it or cover anything about programming in advance. However, we've made the game pretty hard, because it's a multiplayer game, and players should be able to team up to help each other when they get stuck.
p It is not necessary for teachers to be comfortable with computer science concepts for students to have fun learning with CodeCombat.
p In a classroom setting, multiplayer is easy: just do pair programming, with two students playing together at one computer taking turns typing. (We also have real-time multiplayer built into the game, but there's no need to use that when you're right next to each other in a classroom.)
p
| If you're doing the Hour of Code and want to print certificates for your students,
a(href="http://csedweek.org/certificates") go here
| .
h3 Is it violent?
p More questions? Get in touch! Feature requests? We'd love to hear them! CodeCombat is new and needs to hear from you to learn what teachers would love to have in their classrooms of programming wizards-to-be.
p We get this from teachers a lot due to our name. Although CodeCombat does contain cartoon violence, there is nothing graphic in either the visuals or language. If you are comfortable having your students play Angry Birds, you will be comfortable with CodeCombat.
h3
a(title='Contact', tabindex=-1, data-toggle="coco-modal", data-target="modal/ContactModal") Contact Us
.span5
h3 CodeCombat Usage Checklist
h3 Is it for girls?
h4 Age
ul
li ✓ College and adult
li ✓ High school (14-18)
li ✓ Middle school (13+)
li ~ Middle school (11-12): can play, but don't register without parental consent
li ~ Elementary school (7-10): may require some guidance
li ✗ 6 and under: probably too hard
p There are three game modes in CodeCombat: building, puzzles, and combat. We have intentionally designed each to appeal to both boys and girls and think that the building and puzzle levels especially differentiate the game from violent triple A titles that repel female players.
h4 Browser
ul
li ✓ Chrome ~17+
li ✓ Firefox ~21+
li ✓ Safari 6+
li ✓ Internet Explorer 10 and 11
li ✗ Internet Explorer 8 and 9
h4 Operating System
ul
li ✓ Windows
li ✓ Mac
li ✓ Linux
li ✗ iPhone/iPad/iPod (might work, but not fun to type on mobile)
li ✗ Android (not fun to type on mobile)
h3 What do we cover?
h4 Internet Connection
ul
li ✓ Fast connection
li ~ Slow connection (we're working to optimize this)
li ✗ Offline
p There are 12 levels in the Hour of Code tutorial that teach and reinforce 5 specific computer science concepts:
h4 Computer
ul
li ✓ Fast computer
li ~ Slow computer (we're working to optimize this)
li ✗ Old, slow netbook
h4 Languages
ul
li ✓ English - English
li ~✓ русский язык, Russian
li ~✓ Deutsch, German
li ~✓ español (América Latina), Spanish (Latin America)
li ~✓ español (ES), Spanish (Spain)
li ~✓ 简体中文, Chinese (Simplified)
li ~✓ 繁体中文, Chinese (Traditional)
li ~✓ français, French
li ~✓ 日本語, Japanese
li العربية, Arabic
li ~✓ português do Brasil, Portuguese (Brazil)
li ~✓ Português europeu, Portuguese (Portugal)
li ~✓ język polski, Polish
li ~✓ italiano, Italian
li ~✓ Türkçe, Turkish
li ~✓ Nederlands, Dutch
li ~ فارسی, Persian
li čeština, Czech
li ~✓ Svenska, Swedish
li ~✓ Bahasa Indonesia, Indonesian
li ~✓ ελληνικά, Greek
li ~✓ limba română, Romanian
li ~ Tiếng Việt, Vietnamese
li ~✓ magyar, Hungarian
li ~ ไทย, Thai
li ~ dansk, Danish
li 한국어, Korean
li ~ slovenčina, Slovak
li ~✓ slovenščina, Slovene
li suomi, Finnish
li български език, Bulgarian
li Norwegian (Nynorsk), Norwegian Nynorsk
li ~ Norsk Bokmål, Norwegian (Bokmål)
li ~ עברית, Hebrew
li lietuvių kalba, Lithuanian
li ~✓ српски, Serbian
li ~✓ українська мова, Ukranian
li मानक हिन्दी, Hindi
li ~ اُردُو, Urdu
li ~ Bahasa Melayu, Bahasa Malaysia
ol
li <strong>Formal notation</strong> - builds an understanding of the importance of syntax in programming.
li <strong>Calling functions</strong> - familiarizes students with parameter-less function calls.
li <strong>Parameters</strong> - how to pass parameters to functions.
li <strong>Strings</strong> - teaches students about string notation and passing strings as parameters.
li <strong>Loops</strong> - the pros and cons of designing short programs with loops.
p Students may continue past level 12, depending on their speed and interest and learn 3 additional concepts in levels 12-20:
ol
li <strong>Conditional logic</strong> - when and how to use if/else to control in-game outcomes.
li <strong>Loop varieties</strong> - when and how to use the different types of loops.
li <strong>Writing functions</strong> - creating and calling functions within other functions.
h3 System Requirements
p Because CodeCombat is a game, it is more intensive for computers to run smoothly than video or written tutorials. Here are our suggestions for getting the most out of your Hour of Code experience:
p For mobile players:
ul
li <strong>Use newer iPads if possible.</strong> Older iPads will work, but will play the game more slowly.
li </strong>Allow players to wear headphones/earbuds to hear the audio.</strong> We help players learn through voiceover and sound effects which will make classrooms noisy and distracting.
p For desktop and laptop players:
ul
li <strong>Use newer versions of Chrome or Firefox.</strong> Although CodeCombat will work on browsers as old as IE9, the performance is not as good.
li <strong>Use newer computers.</strong> Older computers, Chromebooks, and netbooks tend to have very few system resources, which makes for a less enjoyable experience.
li </strong>Allow players to wear headphones/earbuds to hear the audio.</strong> We help players learn through voiceover and sound effects which will make classrooms noisy and distracting.