staging content changes (-dave)

Author: deploy-code-org

dashboard/config/locales/scripts.en.yml

@@ -1788,10 +1788,11 @@ en:
           Animation: Animation
           Draw Loop and Random: Draw Loop and Random
           Variables: Variables
-          "Sprite Properties and Mod": "Sprite Properties and Mod"
+          Sprite Properties and Mod: Sprite Properties and Mod
           Expressions and Reassignment: Expressions and Reassignment
           Sprites and Properties: Sprites and Properties
           Counting with Variables: Counting with Variables
+          " Sprite Properties and Mod": " Sprite Properties and Mod"
         2016_sciencePD_phase1:
           title: Computer Science in Science PD 2016-2017
           description_short: In Partnership with Project GUTS

dashboard/db/schema.rb

@@ -564,14 +564,14 @@
   add_index "puzzle_ratings", ["user_id", "script_id", "level_id"], name: "index_puzzle_ratings_on_user_id_and_script_id_and_level_id", unique: true, using: :btree
 
   create_table "script_levels", force: :cascade do |t|
+    t.integer  "level_id",   limit: 4
     t.integer  "script_id",  limit: 4,     null: false
     t.integer  "chapter",    limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "stage_id",   limit: 4
     t.integer  "position",   limit: 4
     t.boolean  "assessment"
-    t.integer  "level_id",   limit: 4
     t.text     "properties", limit: 65535
   end
 

pegasus/sites.v3/code.org/public/curriculum/course1/1/Teacher.pdf.fetch

@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/caaeee894d43198348aa54f47aaabf0f-Teacher.pdf
+https://cdo-fetch.s3.amazonaws.com/31f28855e94094eb70f237af4e684a8a-Teacher.pdf

pegasus/sites.v3/code.org/public/curriculum/course4/1/Teacher.pdf.fetch

@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/103b22b44d8df0e567b303dda321af0e-Teacher.pdf
+https://cdo-fetch.s3.amazonaws.com/8339a39402cbbe6590eee3f9e8f45743-Teacher.pdf

pegasus/sites.v3/code.org/public/curriculum/course4/docs/framework.pdf.fetch

@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/cbff9e57551a960217b9c520355bf827-framework.pdf
+https://cdo-fetch.s3.amazonaws.com/4dfff317333a22a0e8ab9d6a52069df7-framework.pdf

pegasus/sites.v3/code.org/public/curriculum/course4/docs/standards_course4.pdf.fetch

@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/79ce85ed063e36dc3836242cbbb035fd-standards_course4.pdf
+https://cdo-fetch.s3.amazonaws.com/2f784f2bffd8eef17e05a41b06046c8f-standards_course4.pdf

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

@@ -49,9 +49,6 @@ For more information, visit [http://collegeboard.org/APCSP](http://collegeboard.
 - Prepare for the AP® CS Principles exam through a curriculum intentionally designed around the latest developments in the College Board framework, including built-in preparation for the performance tasks  
 - Use, share, and customize the resources, as they are distributed under a Creative Commons Attribution NonCommerical ShareAlike License see our [Terms of Service](https://code.org/tos). If you are interested in licensing Code.org materials for commercial purposes, [contact us](https://code.org/contact).
 
-### <a name="acknowledgements"></a>Acknowledgements
-
-The Code.org CS Principles curriculum would not have been possible without inspiration from a number of leaders and projects in the CS education community, the incredible work of the many curriculum writers, engineers, teachers and volunteers who helped develop the course, and the generosity of a number of our donors. Thank you!
 
 [<button>See App Lab in action</button>](/educate/applab) &nbsp;&nbsp; [<button>Apply for professional learning</button>](/educate/professional-learning/cs-principles)
 
@@ -77,6 +74,9 @@ The Code.org CS Principles curriculum would not have been possible without inspi
 
 <div style="clear: both;"></div>
 
+### <a name="acknowledgements"></a>Acknowledgements
+
+The Code.org CS Principles curriculum would not have been possible without inspiration from a number of leaders and projects in the CS education community, the incredible work of the many curriculum writers, engineers, teachers and volunteers who helped develop the course, and the generosity of a number of our donors. Thank you!
 
 ## <a name="overview"></a>Overview
 

pegasus/sites.v3/code.org/public/educate/pd/15-16/chicago.md

@@ -99,7 +99,11 @@ Milestone Complete!
 
 ### Phase 3: Academic Year Development (2 days in-person & ~10 hours online) ###
 
-Milestone complete!
+In person workshop complete!
+
+Deadline for Online Coursework is June 30th.
+
+Phase 3 Part 3: Refection - This final online course will launch in early May on your Code Studio Teacher Dashboard. If you need support while finishing your work or teaching the course, check out the CS in Algebra forum here.
 
 
 [**Back to the top**](#top)

pegasus/sites.v3/code.org/public/educate/pd/15-16/codeva.md

@@ -18,45 +18,14 @@ These workshops are being run by our regional partner for the state of Virginia,
 ### Phase 1: Online Introduction (~2 hours) ###
 
 Milestone Complete!
-### Phase 2: Blended Summer Study (5 days in-person & ~8 hours online) ###
 
+### Phase 2: Blended Summer Study (5 days in-person & ~8 hours online) ###
 
 Milestone Complete!
 
-
 ### Phase 3: Academic Year Development (4 Saturdays in-person & ~12 hours online) ###
 
-Phase 3 is composed of quarterly in-person meetings and monthly online activities. The meetings will continue to build pedagogical strategies and explore the essential elements of CSP. You will participate in activities such as teaching new content and keeping the classroom environment equitable and engaging for all students.
-
-
-**Save the dates:**
-
-Quarter 1: Saturday, October 17, 2015
-
-Quarter 2: Saturday, November 14, 2015
-
-Quarter 3: Saturday, February 20, 2016
-
-Quarter 4: Saturday, May 7, 2016
-
-8:30am - 3:30pm
-<br/>
-Breakfast and lunch will be served.
-
-**Location**
-
-TBD
-
-**What to bring to Phase 3 quarterly sessions:**
-
-Laptop
-<br/>
-Green journal <br/>
-Curriculum guide
-<br/>
-Snacks
-<br/>
-Water
+Milestone Complete! 
 
 ### Phase 4: Summer Wrap-up (3 days in-person - Summer 2016) ###
 
@@ -75,55 +44,11 @@ Milestone Complete!
 
 ### Phase 2: Blended Summer Study (5 days in-person & ~8 hours online) ###
 
-
 Milestone Complete!
 
-
-
 ### Phase 3: Academic Year Development (4 Saturdays in-person & ~12 hours online) ###
 
-Phase 3 is composed of quarterly in-person meetings and monthly online activities. The meetings will continue to build pedagogical strategies and explore the essential elements of ECS. You will participate in activities such as teaching new content and keeping the classroom environment equitable and engaging for all students.
-
-
-**Save the dates for CodeVA Session A:**
-
-Quarter 1: Saturday, October 3, 2015
-
-Quarter 2: Saturday, November 7, 2015
-
-Quarter 3: Saturday, February 13, 2016
-
-Quarter 4: Saturday, April 16, 2016
-
-**Save the dates for CodeVA Session B:**
-
-Quarter 1: Saturday, October 17, 2015
-
-Quarter 2: Saturday, November 21, 2015
-
-Quarter 3: Saturday, February 27, 2016
-
-Quarter 4: Saturday, April 30, 2016
-
-8:30am - 3:30pm
-<br/>
-Breakfast and lunch will be served.
-
-**Location**
-
-TBD
-
-**What to bring to Phase 3 quarterly sessions:**
-
-Laptop and Charger
-<br/>
-ECS green journal <br/>
-Curriculum guide
-<br/>
-Snacks
-<br/>
-Water
-
+Milestone Complete!
 
 ### Phase 4: Summer Wrap-up (3 days in-person - Summer 2016) ###
 
@@ -139,37 +64,14 @@ More info coming soon!
 ### Phase 1: Online Introduction (~2 hours) ###
 
 Milestone Complete!
-### Phase 2: Blended Summer Study (3 days in-person & ~8 hours online) ##
 
+### Phase 2: Blended Summer Study (3 days in-person & ~8 hours online) ##
 
 Milestone Complete!
 
 ### Phase 3: Academic Year Development (2 days in-person & ~10 hours online) ###
 
-Phase 3 is composed of bi-yearly in-person meetings and monthly online activities. The meetings will continue to build pedagogical strategies and explore the essential elements of CS in Algebra. You will participate in activities such as teaching new content and keeping the classroom environment equitable and engaging for all students.
-
-**Save the dates:**
-
-Semester 1: Saturday, February 20, 2016
-
-Semester 2: Saturday, April 30, 2016 
-
-8:00am - 4:00pm<br/>
-Breakfast and lunch will be served. 
-
-**Location**
-
-TBD
-
-**What to bring to Phase 3 bi-yearly sessions:**
-
-Laptop and Charger
-<br/>
-Curriculum guide
-<br/>
-Snacks
-<br/>
-Water
+Milestone Complete!
 
 [**Back to the top**](#top)
 
@@ -180,39 +82,14 @@ Water
 ### Phase 1: Online Introduction (~2 hours) ###
 
 Milestone Complete!
-### Phase 2: Blended Summer Study (3 days in-person & ~8 hours online) ###
 
+### Phase 2: Blended Summer Study (3 days in-person & ~8 hours online) ###
 
 Milestone Complete!
 
-
 ### Phase 3: Academic Year Development (2 Saturdays in-person & ~10 hours online) ###
 
-Phase 3 is composed of bi-yearly in-person meetings and monthly online activities. The meetings will continue to build pedagogical strategies and explore the essential elements of CS in Science. You will participate in activities such as teaching new content and keeping the classroom environment equitable and engaging for all students.
-
-
-**Save the dates:**
-
-Semester 1: Saturday, October 17th, 2015
-
-Semester 2: Saturday, February 20th, 2016
-
-8:00am - 4:00pm<br/>
-Breakfast and lunch will be served. 
-
-**Location**
-
-TBD
-
-**What to bring to Phase 3 bi-yearly sessions:**
-
-Laptop and Charger
-<br/>
-Curriculum guide
-<br/>
-Snacks
-<br/>
-Water
+Milestone Complete!
 
 
 [**Back to the top**](#top)

pegasus/sites.v3/code.org/public/educate/pd/15-16/durham.md

@@ -24,36 +24,7 @@ Milestone Complete!
 
 ### Phase 3: Academic Year Development (4 Saturdays in-person & ~12 hours online) ###
 
-Phase 3 is composed of quarterly in-person meetings and monthly online activities. The meetings will continue to build pedagogical strategies and explore the essential elements of ECS. You will participate in activities such as teaching new content and keeping the classroom environment equitable and engaging for all students.
-
-
-**Save the date:**
-
-Quarter 4: Saturday, April 30, 2016
-
-8:30am - 3:30pm
-<br/>
-Breakfast and lunch will be served.
-
-**Location**
-
-[American Underground @ American Tobacco Campus<br/>
-Basement level classroom<br/>
-318 Blackwell Street<br/>
-Durham, NC 27701](https://www.google.com/maps/place/318+Blackwell+St,+Durham,+NC+27701/@35.993246,-78.9066525,17z/data=!3m1!4b1!4m2!3m1!1s0x89ace46cc0e5f9dd:0x3df231f8fbd83002)
-
-Please remember to bring your robotics kits. If you don't have robotics kits, you should still plan to attend the workshop!
-
-**What to bring to Phase 3 quarterly sessions:**
-
-Laptop and Charger
-<br/>
-ECS green journal<br/>
-Curriculum guide
-<br/>
-Snacks
-<br/>
-Water
+Milestone Complete!
 
 ### Phase 4: Summer Wrap-up (3 days in-person - Summer 2016) ###