Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging

Author: laurelfan

.travis.yml

@@ -1,18 +1,19 @@
 language: ruby
-rvm:
-- 2.0.0
-bundler_args: --without development --deployment --path .bundle
-before_install:
-- cd dashboard
-- wget https://s3.amazonaws.com/bundle-cache-builds/bundle_cache
-- chmod +x ./bundle_cache
-- ./bundle_cache download
-before_script:
-- bin/rake db:create db:schema:load
-script:
-- bin/rake
-after_script:
-- ./bundle_cache upload
+
+rvm: 2.0.0
+
+sudo: false
+
+cache: bundler
+
+bundler_args: --without development --deployment
+
+before_install: cd dashboard
+
+before_script: bin/rake db:create db:schema:load
+
+script: bin/rake
+
 env:
   global:
   - DB=mysql

README.md

@@ -146,7 +146,7 @@ If you'd like to grab a task, have ideas for projects or want to discuss an item
 
 #### Manually
 
-We support recent versions of Firefox, Chrome, IE9, iOS Safari and the Android browsers. Be sure to try your feature out in IE9, iOS and Android if it's a risk. [BrowserStack live](http://www.browserstack.com) or [Sauce Labs manual](https://saucelabs.com/manual) let you run manual tests in these browsers remotely.
+We support recent versions of Firefox, Chrome, IE9, iOS Safari and the Android browsers ([full list of supported browsers and versions](https://support.code.org/hc/en-us/articles/202591743)). Be sure to try your feature out in IE9, iOS and Android if it's a risk. [BrowserStack live](http://www.browserstack.com) or [Sauce Labs manual](https://saucelabs.com/manual) let you run manual tests in these browsers remotely.
 
 #### Unit tests
 

pegasus/routes/v2_forms_routes.rb

@@ -2,6 +2,7 @@
 
 post '/v2/forms/:kind' do |kind|
   dont_cache
+  pass if kind == 'HocSignup2014'
   forbidden! if settings.read_only
   unsupported_media_type! unless payload = request.json_body
 

pegasus/sites.v3/code.org/public/educate/csp.md

@@ -5,18 +5,17 @@ nav: educate_nav
 
 # Computer Science Principles #
 
-## What is CS Principles?
+## <a name="whatis"></a>What is CS Principles?
 The College Board has proposed a new course called AP® Computer Science Principles.  This  course is designed to be far more than a traditional introduction to programming - it is a rigorous, engaging, and approachable course that explores many of the big, foundational ideas of computing so that all students understand how these concepts are transforming the world we live in. The official AP® exam is set to go live in the 2016-17 school year with an exam and performance-based assessments.
 
 Find more information about the College Board CS Principles project at: [http://apcsprinciples.org/](http://apcsprinciples.org/)
 
-<br />
-
 ## Code.org's CS Principles Curriculum
 Code.org is creating a complete curriculum consisting of daily lesson plans, videos, tutorials, tools, and assessments that covers the learning objectives from the [CS Principles Curriculum Framework](http://media.collegeboard.com/digitalServices/pdf/ap/comp-sci-principles-draft-cf-final.pdf). Check back often as batches of lessons will be released on a rolling basis from now until Summer 2015 when the entire curriculum will be publicly available. The resources will be distributed under a [Creative Commons License](http://creativecommons.org/licenses/by-nc-sa/3.0/).
 
+<iframe width="560" height="315" src="//www.youtube.com/embed/mjMLCpXz3eo" frameborder="0" allowfullscreen></iframe>
 
-### Features
+### <a name="features"></a>Features
 
 - Access the world of web applications using a block to text JavaScript programming environment
 - Build problem solving skills through the use of computational widgets
@@ -28,7 +27,7 @@ Code.org is creating a complete curriculum consisting of daily lesson plans, vid
 
 
 
-### Overview
+### <a name="overview"></a>Overview
 
 Several documents describe the overarching themes and direction of the course.
 
@@ -38,13 +37,13 @@ Several documents describe the overarching themes and direction of the course.
 
 <br />
 
-## Lessons
+## <a name="lessons"></a>Lessons
 
 
 | Link| Unit Description |
 | :------------------:|-----------|
-|  [![binary magic](csp/images/thumb_binaryMagic.png "Unit 1")](/educate/csp/unit1) [Unit 1](/educate/csp/unit1) | **Sending Bits** How do we get a single bit of information from one place to another? This unit explores the technical challenges and questions that arise from the need to transfer information between people and computational devices.| 
-|*Coming Soon*| **Algorithms** Build students' problem solving skills through unplugged and computer-based problems. Students are asked to express algorithmic solutions with increasing formality of language to analyze algorithms.|
+|  [![binary magic](csp/images/thumb_binaryMagic.png "Unit 1")](/educate/csp/unit1) [Unit 1](/educate/csp/unit1) | **Sending Bits and Encoding Information** What can be represented with a single bit and how do we get a single bit of information from one place to another? This unit explores the technical challenges and questions that arise from the need to represent digital information in computers and transfer it between people and computational devices. Topics include: the digital representation of information - numbers, text, images, and communication protocols | 
+|*Coming Soon*| **Algorithms and Networking** Build students' problem solving skills through unplugged and computer-based problems. Students are asked to express algorithmic solutions with increasing formality of language to analyze algorithms. Topics include: encryption, security, computationally hard problems, and internet protocols|
 |*Coming Soon*| **Programming** Introduces a formal programming language, JavaScript. The programming sequence enables students to write simple programs to be executed in web pages. |
 |*Coming Soon*| **Data** Students will develop an understanding of the nature and structure of data that enables them to ask and answer questions about the data effectively.|
 |*Coming Soon*| **Innovation** Synthesizes the topics covered in the previous units and leads students through a the practice of researching and understanding the technology behind some modern innovations.|

pegasus/sites.v3/code.org/public/educate/csp/aboutTheWidgets.md

@@ -0,0 +1,42 @@
+---
+title: Computer Science Principles
+nav: educate_nav
+---
+
+# Computer Science Principles Widgets #
+
+## About the widgets
+[These widgets](http://cspdashboard-c9-bfranke.c9.io/home.html) are prototyped alpha-versions of tools intended to aid instruction in Code.org's CSP Curriculum.
+
+They have been created primarily as tools to explore computer science concepts.
+
+The widgets currently reside on Baker Franke's Cloud9 account for development, but will eventually be moved under the Code.org domain on Code.org's servers.
+
+All<span xmlns:dct="http://purl.org/dc/terms/" href="http://purl.org/dc/dcmitype/InteractiveResource" property="dct:title" rel="dct:type">Code.org CSP Widgets</span> by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Baker Franke</span> are licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>.<br>
+<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-sa/4.0/88x31.png" /></a>
+
+
+## Attribution and Thanks
+In the cases of the Binary Magic, Text Compression, and Pixelation Widgets, they were inspired by [CS Unplugged](http://csunplugged.org/) Activities.  I tried to give attribution for the inspiration in the lessons and in the widgets.  If it is omitted it will be corrected.
+
+Many of the widgets employed in this curriculum were originally developed at the University of Chicago Laboratory Schools with my former colleague **Marty Billingsley**.  She contributed many ideas for these these widgets and ideas about how they should work during our time together teaching intro computer science.  I am eternally grateful to her.
+
+## Usage: Mileage May Vary
+
+1. These widgets were rapidly prototyped (in many cases, poorly) by Baker Franke as a proof of concept to see if they actually helped foster better understanding of CS concepts in the context of a lesson. 
+
+2. Most of the widgets **do not** contain usage instructions on the page.  You need to read the associated lesson to understand the context of how to use it and what it can and cannot do.
+
+3. In the case of the ***Sending Bits Widgets***...
+
+* Students are *actually* posting data to a remote database (Parse.com) the content of which is not montitored, and they and can more or less post any text they like.  Use with caution if you school has policies about such things. 
+* At the moment there is a limit on the number of database requests-per-second that the widget can handle.  If you or your students do things to push that limit you won't break anything (permenantly), but data will just stop flowing and you'll end up with a lot of confused students.  It is most likely that a single classroom would hit the limit during **lesson 4** the first time you use the widget.
+* Somewhat counter-intuitively the limits on the widget are not related to the amount of data posted or retrived, but the number of times students click "send" or "recv".
+
+4. If you have questions about usage or would like to give feed back please do so in the [CSP Forum](https://support.code.org/hc/communities/public/topics/200138206-CS-Principles)
+
+Thanks all,
+
+Baker Franke
+Curriculum Development Manager
+Code.org

pegasus/sites.v3/code.org/public/educate/csp/howToUse.md

@@ -0,0 +1,14 @@
+---
+title: Computer Science Principles
+nav: educate_nav
+---
+
+# Code.org Computer Science Principles 
+
+## How to use our lesson plans
+
+While every lesson has the same basic structure and format the lessons should not be read as gospel.  We want them to be a good guide for teachers, but flexible enough for teachers to make decisions about what will work best for their students. 
+
+Here is a description of how to use each section of our lesson plan documents, embeded in the lesson template itself:
+
+<iframe src="https://docs.google.com/document/d/1tVe35LUFg2WkiiciC-8hkK2BX_h6g5ZJWi_uchZ5D8E/pub?embedded=true" height="3175" width="100%" style="border: solid 1px black"></iframe>

pegasus/sites.v3/code.org/public/educate/csp/team.md

@@ -0,0 +1,32 @@
+---
+title: Computer Science Principles
+nav: educate_nav
+---
+
+## Code.org CS Principles Team
+
+### Code.org Staff
+* Baker Franke - K-12 Curriculum Manger, CSP Lead Author
+* Brook Osborne - HS Program Manager, CSP Professional Development
+
+### CSP Authors 2014-15
+* Matt Bauer - Illinois Institute of Technology
+* Madeline Burton - DC Public Schools
+* Trent Maverick - Google
+* GT Wrobel - Latin School of Chicago
+
+### Assessment Editor
+* Patricia Phillips
+
+### Chicago Field Testers 2014-15
+* Teriah Abrams - Mather High School
+* David Hayes - Lane Technical High School
+* John Quinn - Kenwood Academy
+* Brenda Remess - Mather High School
+* GT Wrobel - The Latin School of Chicago
+
+### CSP Authors 2013-14
+* Rebecca Dovi
+* Jake Baskin
+* Andy Kuemmel 
+* Pat Phillips

pegasus/sites.v3/code.org/public/educate/csp/unit1.md

@@ -7,6 +7,14 @@ nav: educate_nav
 
 ## Unit 1
 
+**Quick Links**
+
+[CSP Forum](https://support.code.org/hc/communities/public/topics/200138206-CS-Principles) | [About using these lesson plans](howToUse) | [About the widgets](aboutTheWidgets) | [Widget Directory](http://cspdashboard-c9-bfranke.c9.io/home.html) |  [Writing Team](team)
+
+**Invitation to Comment:** 
+
+The lesson plans below are shared as publicly commentable documents.  Some have been used by teachers in classrooms already and you will see their comments in the documents already.
+
 | Lesson Description| Lesson Plan | Widget |
 | ------------------|:-----------:|:------:|
 | **Lesson 01 - Impact of Innovation** Students are asked to consider the impact of technological innovation on their lives and multiple generations of their family.  e.g. “What technological innovation would your grandparent say affect them the most?”| [![lesson 1](images/thumb_lesson1.png)](https://docs.google.com/a/code.org/document/d/1nWrpzSNPgx_D7Q7rm2j4UdCB26ggyXaeta-MWr9zYPs) | [![binary magic](images/thumb_binaryMagic.png)](http://bakerfranke.pencilcode.net/home/widgets/binaryMagicSimple) |