Skip to content

Commit 9410b0f

Browse files
deploy-code-orgdeploy-code-org
committed
content changes (-mehal)
1 parent ac806bf commit 9410b0f

33 files changed

+559
-309
lines changed

‎dashboard/config/locales/dsls.en.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -961,6 +961,7 @@ en:
961961
Conditional Basics: Conditional Basics
962962
U3L21 Student Lesson Introduction:
963963
More Variables: More Variables
964+
U3L21 Student Lesson Introduction v2: {}
964965
U3L22 Student Lesson Introduction:
965966
Permanent Data Storage: Permanent Data Storage
966967
U3L23 Student Lesson Introduction:

‎dashboard/config/scripts/csppd3_u3_overview.external‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ css 'unplugged'
33
markdown <<MARKDOWN
44
<link rel="stylesheet" type="text/css" href="https://staging.code.org/curriculum/docs/web/k5online.css">
55
### Getting Started > About the PD
6-
<img src="https://images.code.org/cd3c4d96a6b2a287db6cd1394cd314c4-image-1446480287872.png" width="450" style="float:right; margin-left:30px">
6+
<img src="https://images.code.org/6b8e8371c89449351e841e1bcbeeb0b0-image-1447772137098.png" width="450" style="float:right; margin-left:30px">
77

88
<br>
99
This Online PD is designed to help you ramp up for Unit 3 of the Code.org CSP curriculum. The lessons and activities here complement the one day in-person workshops that pilot teachers are completing throughout November and December.
@@ -67,5 +67,4 @@ Each of the 5 units in the CSP curriculum has a corresponding online module. You
6767

6868
<a class="btn btn-large btn-primary next-stage submitButton">Continue</a>
6969

70-
7170
MARKDOWN

‎dashboard/config/scripts/cspunit3.script‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ level 'U3 - Movie Bot - When Multiple If Statements'
281281

282282
# 21
283283
stage 'Digital Assistant Project'
284-
level 'U3L27 Student Lesson Introduction'
284+
level 'U3L21 Student Lesson Introduction v2'
285285
level 'U3L24 Chatbot Basic Conditionals'
286286

287287
##TURDS DO NOT USE##

‎dashboard/config/scripts/cspunit3temp.script‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,21 +99,21 @@ level 'U3 - Loops And Arrays - Add 5'
9999
level 'U3 - Loops And Arrays - Divid by 2'
100100
level 'U3 - Loops And Arrays - Loop Array If'
101101
level 'U3 - Loops And Arrays - Linear Search'
102-
103-
#27
104-
stage 'Functions with Return Values'
105-
level 'U3L27 Student Lesson Introduction'
106102
level 'U3 - Loops And Arrays - Counting Times'
107-
level 'U3 - Loops And Arrays - Printing Single True'
108103
level 'U3 - Loops And Arrays - Search with Boolean Var'
104+
level 'U3 - Loops And Arrays - Printing Single True'
109105
level 'U3 - Loops And Arrays - Make it a Function'
110106
level 'U3 - Loops And Arrays - Make it a Function - add list parameter'
111107
level 'U3 - Loops And Arrays - General Search Param'
108+
level 'U3 - Loops And Arrays - Find Min'
109+
110+
#27
111+
stage 'Functions with Return Values'
112+
level 'U3L27 Student Lesson Introduction'
112113
level 'U3 - Arrays and Loops - Explain Functions with Returns'
113-
level 'U3 - Loops And Arrays - Return Value'
114114
level 'U3 - Loops And Arrays - Functions that Return Value'
115115
level 'U3 - Loops And Arrays - Multiple Returns'
116-
level 'U3 - Loops And Arrays - Find Min'
116+
level 'U3 - Loops And Arrays - Return Value'
117117
level 'U3 - Loops And Arrays - Return Index'
118118
level 'U3 - Loops And Arrays - Search and Remove'
119119
level 'U3 - Loops And Arrays - Challenge 1'

‎dashboard/config/scripts/levels/2-3 Artist Functions 1.level‎

Lines changed: 15 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -103,22 +103,8 @@
103103
</required_blocks>
104104
<solution_blocks>
105105
<xml>
106-
<block type="draw_colour" inline="true">
107-
<value name="COLOUR">
108-
<block type="colour_picker">
109-
<title name="COLOUR">#0000cd</title>
110-
</block>
111-
</value>
106+
<block type="when_run" deletable="false" movable="false">
112107
<next>
113-
<block type="procedures_callnoreturn">
114-
<mutation name="Draw lenses"/>
115-
</block>
116-
</next>
117-
</block>
118-
<block type="procedures_defnoreturn">
119-
<mutation/>
120-
<title name="NAME">Draw lenses</title>
121-
<statement name="STACK">
122108
<block type="controls_repeat">
123109
<title name="TIMES">4</title>
124110
<statement name="DO">
@@ -136,34 +122,28 @@
136122
<next>
137123
<block type="draw_move_by_constant">
138124
<title name="DIR">moveForward</title>
139-
<title name="VALUE">100</title>
125+
<title name="VALUE">175</title>
140126
<next>
141-
<block type="draw_move_by_constant">
142-
<title name="DIR">moveForward</title>
143-
<title name="VALUE">75</title>
144-
<next>
145-
<block type="controls_repeat">
146-
<title name="TIMES">4</title>
147-
<statement name="DO">
148-
<block type="draw_move_by_constant">
149-
<title name="DIR">moveForward</title>
150-
<title name="VALUE">100</title>
151-
<next>
152-
<block type="draw_turn_by_constant">
153-
<title name="DIR">turnRight</title>
154-
<title name="VALUE">90</title>
155-
</block>
156-
</next>
127+
<block type="controls_repeat">
128+
<title name="TIMES">4</title>
129+
<statement name="DO">
130+
<block type="draw_move_by_constant">
131+
<title name="DIR">moveForward</title>
132+
<title name="VALUE">100</title>
133+
<next>
134+
<block type="draw_turn_by_constant">
135+
<title name="DIR">turnRight</title>
136+
<title name="VALUE">90</title>
157137
</block>
158-
</statement>
138+
</next>
159139
</block>
160-
</next>
140+
</statement>
161141
</block>
162142
</next>
163143
</block>
164144
</next>
165145
</block>
166-
</statement>
146+
</next>
167147
</block>
168148
</xml>
169149
</solution_blocks>

‎dashboard/config/scripts/levels/Course 4 SCF 2.level‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"instructions": "Use what you learned in the previous level to draw an image like this. Note: The code becomes more simple if you incorporate parameters. ",
1616
"ideal": "26",
1717
"embed": "false",
18-
"markdown_instructions": "<style>\r\n.hint{\r\n\tpadding: 15px 15px 15px 40px; \r\n background-color:#eeeeee; \r\n border-radius:10px;\r\n}\r\n.hintInner{\r\n\tpadding: 15px 15px 15px 15px; \r\n background-color:#FFFFFF; \r\n border-radius:10px;\r\n}\r\n\r\nimg{\r\n\tborder-radius: 10px;\r\n mix-blend-mode: multiply;\r\n}\r\n\r\n</style>\r\n**Functions Super Challenge:** Use what you learned in the previous level to draw an image like this.\r\n\r\n*Note: The code becomes more simple if you incorporate parameters.*\r\n\r\n\r\n<h4 class=\"hint\">\r\n<details>\r\n<summary><b>Hints</b></summary>\r\n\t<br/><br/>\r\n\t<h5 class=\"hintInner\">\r\n\t<details>\r\n\t<summary><b>Hint #1</b></summary>\r\n \t<br/>\r\n \tEach octagon has 40 pixel sides.\r\n \t<br/><br/>\r\n </details>\r\n\t</h5>\r\n \r\n <h5 class=\"hintInner\">\r\n\t<details>\r\n\t<summary><b>Hint #2</b></summary>\r\n \t<br/>\r\n \tThere is a 136 pixel jump between each octagon in each horizontal line.\r\n \t<br/><br/>\r\n </details>\r\n\t</h5>\r\n \r\n <h5 class=\"hintInner\">\r\n\t<details>\r\n\t<summary><b>Hint #3</b></summary>\r\n \t<br/>\r\n \tBefore you draw the second row of octagons, you need to turn right by 45 degrees and jump forward 96 pixels. Once you're in the correct vertical location, you have to turn your artist back again and jump backward 408 pixels. \r\n \t<br/><br/>\r\n </details>\r\n\t</h5>\r\n \r\n \r\n <h5 class=\"hintInner\">\r\n\t<details>\r\n\t<summary><b>Hint #4</b></summary>\r\n \t<br/>\r\n \tNotice that because there are fewer octagons in the even rows, you don't have to jump back any further to get to the starting place for the odd rows. This means you can use the same function for all rows.\r\n \t<br/><br/>\r\n </details>\r\n\t</h5>\r\n \r\n <h5 class=\"hintInner\">\r\n\t<details>\r\n\t<summary><b>Solution</b></summary>\r\n \t<br/>\r\n \t<br/>\r\n \t<img src=\"https://images.code.org/823068f426299301bc1c129cfa13bd77-image-1445632397903.32.11.png\" width=\"450px\"/>\r\n \t<br/><br/>\r\n </details>\r\n\t</h5>\r\n</details>\r\n</h4>\r\n\r\n\r\n<h5>\r\n<details>\r\n<summary>Help me with angles</summary>\r\n![](https://images.code.org/dede4ee3f1698a385a3a8e404d5758b4-image-1439254128944.gif)\r\n![](https://images.code.org/c24a3fdc9e5e31b4e943f749a18b7996-image-1439254361981.png)\r\n</details>\r\n</h5>\r\n",
18+
"markdown_instructions": "<style>\r\n.hint{\r\n\tpadding: 15px 15px 15px 40px; \r\n background-color:#eeeeee; \r\n border-radius:10px;\r\n}\r\n.hintInner{\r\n\tpadding: 15px 15px 15px 15px; \r\n background-color:#FFFFFF; \r\n border-radius:10px;\r\n}\r\n\r\nimg{\r\n\tborder-radius: 10px;\r\n mix-blend-mode: multiply;\r\n}\r\n\r\n</style>\r\n**Functions Super Challenge:** Use what you learned in the previous level to draw an image like this.\r\n\r\n*Note: The code becomes more simple if you incorporate parameters.*\r\n\r\n\r\n<h4 class=\"hint\">\r\n<details>\r\n<summary><b>Hints</b></summary>\r\n\t<br/><br/>\r\n\t<h5 class=\"hintInner\">\r\n\t<details>\r\n\t<summary><b>Hint #1</b></summary>\r\n \t<br/>\r\n \tEach octagon has 40 pixel sides.\r\n \t<br/><br/>\r\n </details>\r\n\t</h5>\r\n \r\n <h5 class=\"hintInner\">\r\n\t<details>\r\n\t<summary><b>Hint #2</b></summary>\r\n \t<br/>\r\n \tThere is a 136 pixel jump between each octagon in each horizontal line.\r\n \t<br/><br/>\r\n </details>\r\n\t</h5>\r\n \r\n <h5 class=\"hintInner\">\r\n\t<details>\r\n\t<summary><b>Hint #3</b></summary>\r\n \t<br/>\r\n \tBefore you draw the second row of octagons, you need to turn right by 45 degrees and jump forward 96 pixels. Once you're in the correct vertical location, you have to turn your artist back again and jump backward 408 pixels. \r\n \t<br/><br/>\r\n </details>\r\n\t</h5>\r\n \r\n \r\n <h5 class=\"hintInner\">\r\n\t<details>\r\n\t<summary><b>Hint #4</b></summary>\r\n \t<br/>\r\n \tNotice that because there are fewer octagons in the even rows, you don't have to jump back any further to get to the starting place for the odd rows. This means you can use the same function for all rows.\r\n \t<br/><br/>\r\n </details>\r\n\t</h5>\r\n \r\n <h5 class=\"hintInner\">\r\n\t<details>\r\n\t<summary><b>Solution</b></summary>\r\n \t<br/>\r\n \t<br/>\r\n \t<img src=\"https://images.code.org/ef2822d009b072a2105098483e5f16d6-image-1447705819255.29.10.png\" width=\"450px\"/>\r\n \t<br/><br/>\r\n </details>\r\n\t</h5>\r\n</details>\r\n</h4>\r\n\r\n\r\n<h5>\r\n<details>\r\n<summary>Help me with angles</summary>\r\n![](https://images.code.org/dede4ee3f1698a385a3a8e404d5758b4-image-1439254128944.gif)\r\n![](https://images.code.org/c24a3fdc9e5e31b4e943f749a18b7996-image-1439254361981.png)\r\n</details>\r\n</h5>\r\n",
1919
"disable_param_editing": "false",
2020
"disable_variable_editing": "false",
2121
"use_modal_function_editor": "true",

‎dashboard/config/scripts/levels/U3 - Design Mode - Console Log.level‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@
8686
"droplet_tooltips_disabled": "false",
8787
"debugger_disabled": "true",
8888
"lock_zero_param_functions": "false",
89-
"execute_palette_apis_only": "false"
89+
"execute_palette_apis_only": "false",
90+
"encrypted_examples": "LZuHj8gSXW6i9yCPvcIaL/a+ZQLqbpnu3pYXw0wf+/4GJxKedZN7kHCTFPkS\nx7+s\n"
9091
}
9192
}]]></config>
9293
<blocks/>

‎dashboard/config/scripts/levels/U3 - Design Mode - Layers and Delete.level‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,10 @@
8585
"start_blocks": "onEvent(\"redtarget\", \"click\", function() {\r\n console.log(\"User Clicked Red\");\r\n});\r\nonEvent(\"yellowtarget\", \"click\", function() {\r\n console.log(\"User Clicked Yellow\");\r\n});\r\nonEvent(\"bluetarget\", \"click\", function() {\r\n console.log(\"User Clicked Blue\");\r\n});",
8686
"start_html": "<div xmlns=\"http://www.w3.org/1999/xhtml\" id=\"divApplab\" class=\"appModern divApplabDesignMode\" tabindex=\"1\" style=\"width: 320px; height: 450px;\">\r\n <div class=\"screen\" tabindex=\"1\" id=\"screen1\" style=\"display: block; height: 450px; width: 320px; left: 0px; top: 0px; position: absolute; z-index: 0;\">\r\n <label style=\"margin: 0px; padding: 2px; line-height: 1; overflow: hidden; word-wrap: break-word; color: rgb(0, 0, 0); width: 237px; height: 25px; position: absolute; left: 40px; top: 20px; font-size: 20px;\" id=\"label1\">LET'S PLAY BULLSEYE</label>\r\n <img src=\"https://images.code.org/7069b172faaca6bb7a53a53d12726eb7-image-1444676157548.35.27 PM.png\" id=\"redtarget\" style=\"height: 100px; width: 90px; position: absolute; left: 210px; top: 165px; margin: 0px;\" data-canonical-image-url=\"https://images.code.org/7069b172faaca6bb7a53a53d12726eb7-image-1444676157548.35.27 PM.png\"/>\r\n <img src=\"https://images.code.org/48bbd80cb5e059c238c6fa8d480d8c17-image-1444676162430.39.19%20PM.png\" id=\"yellowtarget\" style=\"height: 200px; position: absolute; left: 0px; top: 120px; margin: 0px; width: 200px;\" data-canonical-image-url=\"https://images.code.org/48bbd80cb5e059c238c6fa8d480d8c17-image-1444676162430.39.19%20PM.png\"/>\r\n <label style=\"margin: 0px; padding: 2px; line-height: 1; overflow: hidden; word-wrap: break-word; color: rgb(51, 51, 51); width: 186px; height: 25px; position: absolute; left: 65px; top: 80px; font-size: 20px;\" id=\"label2\">Click the Bullseye!</label>\r\n <img src=\"https://images.code.org/85da3647a4894ed7fa12fcf5679796cc-image-1444676170439.33.59%20PM.png\" id=\"bulleyePic1\" style=\"height: 30px; width: 30px; position: absolute; left: 205px; top: 0px; margin: 0px;\" data-canonical-image-url=\"https://images.code.org/85da3647a4894ed7fa12fcf5679796cc-image-1444676170439.33.59%20PM.png\"/>\r\n <img src=\"https://images.code.org/85da3647a4894ed7fa12fcf5679796cc-image-1444676170439.33.59%20PM.png\" id=\"bulleyePic2\" style=\"width: 30px; position: absolute; left: 265px; top: 0px; margin: 0px; height: 30px;\" data-canonical-image-url=\"https://images.code.org/85da3647a4894ed7fa12fcf5679796cc-image-1444676170439.33.59%20PM.png\"/>\r\n <img src=\"https://images.code.org/85da3647a4894ed7fa12fcf5679796cc-image-1444676170439.33.59%20PM.png\" id=\"bulleyePic3\" style=\"height: 30px; width: 30px; position: absolute; left: 65px; top: 0px; margin: 0px;\" data-canonical-image-url=\"https://images.code.org/85da3647a4894ed7fa12fcf5679796cc-image-1444676170439.33.59%20PM.png\"/>\r\n <img src=\"https://images.code.org/85da3647a4894ed7fa12fcf5679796cc-image-1444676170439.33.59%20PM.png\" id=\"bulleyePic4\" style=\"height: 30px; width: 30px; position: absolute; left: 0px; top: 0px; margin: 0px;\" data-canonical-image-url=\"https://images.code.org/85da3647a4894ed7fa12fcf5679796cc-image-1444676170439.33.59%20PM.png\"/>\r\n <img src=\"https://images.code.org/85da3647a4894ed7fa12fcf5679796cc-image-1444676170439.33.59%20PM.png\" id=\"bulleyePic5\" style=\"width: 30px; position: absolute; left: 135px; top: 0px; margin: 0px; height: 30px;\" data-canonical-image-url=\"https://images.code.org/85da3647a4894ed7fa12fcf5679796cc-image-1444676170439.33.59%20PM.png\"/>\r\n <img src=\"https://images.code.org/5ea8bc93d65f019175dff0ae2ad26277-image-1444676160386.35.32%20PM.png\" id=\"bluetarget\" style=\"height: 300px; width: 300px; position: absolute; left: 5px; top: 150px; margin: 0px;\" data-canonical-image-url=\"https://images.code.org/5ea8bc93d65f019175dff0ae2ad26277-image-1444676160386.35.32%20PM.png\"/>\r\n </div>\r\n</div>",
8787
"droplet_tooltips_disabled": "false",
88-
"debugger_disabled": "true"
88+
"debugger_disabled": "true",
89+
"encrypted_examples": "DT0qfO/yLwEZeJphEi3U4pMBzIahA/iqKGqv7HdAhJ5ykquX/wcPuF5aSP0V\nOjhG\n",
90+
"lock_zero_param_functions": "false",
91+
"execute_palette_apis_only": "false"
8992
}
9093
}]]></config>
9194
<blocks/>

‎dashboard/config/scripts/levels/U3 - Design Mode - Multi Screens.level‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"encrypted_examples": "HGPdR2c47xYncuWr3I5Kw3Y1l364l/E6qAYCddJoL2DSb84rJ5ezp3yCQd5T\n2q1q\n",
5959
"embed": "false",
6060
"instructions": "Make a 2 screen app with a black screen and a white screen. (Click to see detailed instructions)",
61-
"markdown_instructions": "# Second Screen\r\n\r\nUp until now our apps have only been able to have one view. With Design Mode we can now make multiple screens and switch between them!\r\n\r\n**Goal:** Make a 2 screen app with a black screen and a white screen. \r\n\r\n<img src=\"https://images.code.org/e35a6f494cf6f0c57c66a1aef651cdb0-image-1444353622241.gif\" style=\"width: 250px; float: right\">\r\n\r\n# Do This\r\n\r\nSwitch to Design Mode and **add a second screen**. There are two ways to add a second screen: \r\n\r\n1. Drag out <img src=\"https://images.code.org/4337b39cfd797ed9289b70fb6cb365fb-image-1444353631083.17.39 PM.png\" style=\"width: 50px\"> from the Design Toolbox. Check out the screen dropdown menu at the top right of the app window. You should now have two screens! <img src=\"https://images.code.org/b48d978335701888b744702f25f11b28-image-1444353746012.17.07 PM.png\" style=\"width: 75px\"> \r\n1. From the screen dropdown menu at the top right of the app window click *New Screen*. \r\n\r\n**Add a button** to the second screen.\r\n\r\nMake screen1 white and screen2 black. **Set the background color for a screen in the Properties tab**. Make sure to rename the screens with appropriate IDs.",
61+
"markdown_instructions": "# Second Screen\r\n\r\nUp until now our apps have only been able to have one view. With Design Mode we can now make multiple screens and switch between them!\r\n\r\n**Goal:** Make a 2 screen app with a black screen and a white screen. \r\n\r\n<img src=\"https://images.code.org/e35a6f494cf6f0c57c66a1aef651cdb0-image-1444353622241.gif\" style=\"width: 250px; float: right\">\r\n\r\n# Do This\r\n\r\nSwitch to Design Mode and **add a second screen**. There are two ways to add a second screen: \r\n\r\n1. Drag out <img src=\"https://images.code.org/4337b39cfd797ed9289b70fb6cb365fb-image-1444353631083.17.39 PM.png\" style=\"width: 50px\"> from the Design Toolbox. Check out the screen dropdown menu at the top right of the app window. You should now have two screens! <img src=\"https://images.code.org/b48d978335701888b744702f25f11b28-image-1444353746012.17.07 PM.png\" style=\"width: 75px\"> \r\n1. From the screen dropdown menu at the top right of the app window click *New Screen*. \r\n\r\nMake screen1 white and screen2 black. **Set the background color for a screen in the Properties tab**. Make sure to rename the screens with appropriate IDs.",
6262
"is_k1": "false",
6363
"skip_instructions_popup": "false",
6464
"never_autoplay_video": "false",
@@ -84,7 +84,9 @@
8484
"submittable": "false",
8585
"hide_view_data_button": "true",
8686
"droplet_tooltips_disabled": "false",
87-
"debugger_disabled": "true"
87+
"debugger_disabled": "true",
88+
"lock_zero_param_functions": "false",
89+
"execute_palette_apis_only": "false"
8890
}
8991
}]]></config>
9092
<blocks/>

0 commit comments

Comments
 (0)