Merge pull request #15417 from code-dot-org/levelbuilder

DTS (Levelbuilder > Staging)

dashboard/config/locales/scripts.en.yml

@@ -5142,6 +5142,8 @@ en:
               name: C8 to BB8
             D7 to Laurel:
               name: D7 to Laurel
+            D6 Frozen Artist:
+              name: D6 Frozen Artist
           title: ''
           description_audience: ''
           description_short: ''

dashboard/config/scripts/artist-and-bb8.script

@@ -1,5 +1,15 @@
 stage 'B8 BB8'
 level 'courseB_starWars_prog1'
+level 'courseB_starWars_prog2'
+level 'courseB_starWars_prog3'
+level 'courseB_starWars_prog4'
+level 'courseB_starWars_prog5'
+level 'courseB_starWars_prog6'
+level 'courseB_starWars_prog7'
+level 'courseB_starWars_prog8'
+level 'courseB_starWars_prog9'
+level 'courseB_starWars_prog10'
+level 'courseB_starWars_prog11'
 
 stage 'C8 to BB8'
 level 'courseC_starWars_loops1'
@@ -22,3 +32,18 @@ level 'courseC_artist_loops3'
 level 'courseC_artist_loops4'
 level 'courseC_artist_loops5'
 level 'courseC_artist_loops6'
+
+stage 'D7 to Laurel'
+level 'courseD_collector_debugging1'
+level 'courseD_collector_debugging2'
+level 'courseD_collector_debugging3'
+level 'courseD_collector_debugging4'
+level 'courseD_collector_debugging5'
+level 'courseD_collector_debugging6'
+level 'courseD_collector_debugging7'
+
+stage 'D6 Frozen Artist'
+level 'courseD_artist_project1'
+level 'courseD_artist_project2'
+level 'courseD_artist_project3'
+level 'courseD_artist_project4'

dashboard/config/scripts/csd2.script

@@ -67,14 +67,6 @@ level 'CSD U2 Debugging 4', progression: 'Debugging'
 level 'CSD U2 commenting', progression: 'Debugging'
 named_level 'CSD U2 formatting map'
 level 'CSD U2 challenge', progression: 'Challenge'
-named_level 'CSD U2 Lesson 6 Overview'
-level 'CSD U2 Debugging 1', progression: 'Debugging'
-level 'CSD U2 Debugging 2', progression: 'Debugging'
-level 'CSD U2 Debugging 3', progression: 'Debugging'
-level 'CSD U2 Debugging 4', progression: 'Debugging'
-level 'CSD U2 commenting', progression: 'Debugging'
-named_level 'CSD U2 formatting map'
-level 'CSD U2 challenge', progression: 'Challenge'
 
 stage 'Project - Multi-Page Websites', flex_category: 'csd2_1'
 named_level 'CSD U2 Lesson 9 Overview'

dashboard/config/scripts/csd3.script

@@ -17,14 +17,14 @@ named_level 'CSD U3 Describe the Picture'
 
 stage 'Drawing in Game Lab', flex_category: 'csd3_1'
 named_level 'CSD U3 Lesson Overview 3'
+named_level 'CSD U3 rect'
 named_level 'CSD: Drawing in Game Lab 1'
-level 'CSD U3 rect', progression: 'Introduction to Game Lab'
 named_level 'CSD: Drawing in Game Lab 2'
+named_level 'CSD U3 plotting shapes map'
 level 'CSD U3 fill', progression: 'Drawing'
 level 'CSD U3 sequence', progression: 'Drawing'
 level 'CSD U3 ellipse', progression: 'Drawing'
 level 'CSD U3 debug', progression: 'Drawing'
-named_level 'CSD U3 plotting shapes map', progression: 'Drawing'
 level 'CSD U3 picture', progression: 'Challenges'
 level 'CSD U3 challenge face', progression: 'Challenges'
 level 'CSD U3 challenge new shape', progression: 'Challenges'

dashboard/config/scripts/csd_u2_l7_overview.external

@@ -4,14 +4,14 @@ display_name 'Lesson Overview'
 markdown <<MARKDOWN
 # Overview
 
-If you want to use media such as images, video, or music created by others into your own website, you'll first need to understand and respect the rights of the creator of that media. After first learning about Creative Commons licensing, you'll learn about how to add images to your web pages, and how to give proper attribution when you do it.
+If you want to use media such as images, video, or music created by others in your own website, you'll first need to understand and respect the rights of the creator of that media. After first learning about Creative Commons licensing, you'll learn how to add images to your web pages and how to give proper attribution when you do it.
 
 ## Vocabulary
 
-* **Citation** - A quotation from or reference to a book, paper, or author, especially in a scholarly work.
-* **Copyright** - the exclusive legal right, given to an originator or an assignee to print, publish, perform, film, or record literary, artistic, or musical material, and to authorize others to do the same.
-* **Creative Commons** - A public copyright licenses that enable the free distribution of an otherwise copyrighted work. A CC license is used when an author wants to give people the right to share, use, and build upon a work that they have created.
-* **Intellectual Property** - A work or invention that is the result of creativity, such as a manuscript or a design, to which one has rights and for which one may apply for a patent, copyright, trademark, etc.
+* **Citation** - a quotation from or reference to a book, paper, or author, especially in a scholarly work
+* **Copyright** - the exclusive legal right, given to an originator or an assignee to print, publish, perform, film, or record literary, artistic, or musical material, and to authorize others to do the same
+* **Creative Commons** - public copyright licenses that enable the free distribution of an otherwise copyrighted work, used when an author wants to give people the right to share, use, and build upon a work that they have created
+* **Intellectual Property** - a work or invention that is the result of creativity, such as a manuscript or a design, to which one has rights and for which one may apply for a patent, copyright, trademark, etc.
 
 ## New Tags
 

dashboard/config/scripts/csd_u3_lesson_overview_6.external

@@ -3,17 +3,17 @@ display_name 'Lesson Overview'
 markdown <<MARKDOWN
 # Overview
 
-In order to create more interesting and detailed images, students are introduced to the sprite object. Every sprite can be assigned an image to show, and sprites also keep track of multiple values about themselves which will prove useful down the road when we start making animations.
+In order to create more interesting and detailed images, students are introduced to the sprite object. Every sprite can be assigned an image to show, and sprites also keep track of multiple values about themselves, which will prove useful down the road when we start making animations.
 # Vocabulary
 
 * **Property** - Attributes that describe an object's characteristics
 * **Sprite** - A graphic character on the screen with properties that describe its location, movement, and look.
 
 # New Blocks
 
-*  **[drawSprites()](//docs.code.org/gamelab/drawSprites/)** - `drawSprites(group)`
+*  **[drawSprites()](//docs.code.org/gamelab/drawSprites/)** - `drawSprites()`
 *  **[sprite.scale](//docs.code.org/gamelab/scale/)** - `sprite.scale	// Can be used on either side of an assignment statement or as a function parameter.`
-*  **[var sprite = createSprite()](//docs.code.org/gamelab/createSprite/)** - `var sprite = createSprite(x, y, width, height);`
+*  **[var sprite = createSprite()](//docs.code.org/gamelab/createSprite/)** - `var sprite = createSprite(x, y);`
 
 # Resources
 

dashboard/config/scripts/levels/CSD U2 Image Tag Attribution.level

@@ -7,12 +7,16 @@
   "properties": {
     "start_sources": "{\r\n  \"files\": [\r\n    {\r\n      \"name\": \"index.html\",\r\n      \"data\": \"<!DOCTYPE html> \\n<html> \\n \\t<head>\\n\\t\\t<title>My Favorite Amphibians!</title>\\n\\t</head>\\n\\t<body>\\n\\t\\t<h1>My Favoriate Amphibians!</h1>\\n\\t\\t<h2>Kani Bushfrog</h2>\\n\\t\\t<img src=\\\"bushfrog.jpg\\\" alt=\\\"Kani Bushfrog\\\"/> \\n\\t\\t<p>Kani Bushfrog by Rison Thumboor from commons.wikimedia.org. CC-SA</p>\\n\\t</body>\\n</html>\"\r\n    },\r\n{\r\n      \"name\": \"bushfrog.jpg\",\r\n      \"url\": \"https://images.code.org/5f0160338aa552fdaecc0da240f482d8-image-1493671889374.jpg\"\r\n    }\r\n  ]\r\n}",
     "instructions_important": "false",
-    "markdown_instructions": "<div style=\"float: right; height: 250px; width: 40%; overflow-y: scroll; margin-left: 20px; font-size:14px\" markdown=\"1\">\r\n<details>\r\n<summary>**How do I add images?**</summary>\r\nThe `<img>` tag allows you to show images on your web page. <br><br>\r\n\r\nExample:\r\n<pre>&lt;img src=\"dog.png\" alt=\"dog jumping\"/&gt;</pre><br><br>\r\n\r\nIn order to tell the browser which file to use, extra information, called an **attribute**, is added to the &lt;img&gt; tag inside the brackets. The attribute `src` stands for **s**ou**rc**e and tell the name of the image. Image files names include extensions which tell the computer which type of image they are working with. Common extensions are .jpg, .jpeg, .png. <br><br>\r\n\r\nIn addition to have the src attribute, image elements also have the `alt` attribute which describe the image. This is important in case the image doesn’t load or for people who have trouble with their eyesight. <br><br>\r\n\r\nAn `<img>` tag is an example of a  **self-closing tag** because it starts and closes in one tag. To mark this we put the `/` which usually goes in the close tag at the end of the image tag.\r\n\r\n</details>\r\n<details>\r\n<summary>**Why does an image tag not have a closing tag?**</summary>\r\nAn image tag doesn't need a closing tag because there is no text content which must be wrapped in tags. The content that shows on the screen is specified through the tags attributes.\r\n</details>\r\n<details>\r\n<summary>**What is an attribute?**</summary>\r\nAttributes are extra information included in a tag.  Attributes have names and values. The name tells what type of information is being provided and then the value gives the specific information for that tag. \r\n\r\nFor example &lt;img&gt; tags have two attributes, src and alt. src specifies the name of the image file and alt tells the browser in readable text what the image is.\r\n</details>\r\n</div>\r\n\r\n# Giving Credit\r\n\r\nWhen using a Creative Commons licensed image, you need to give credit to the original creator (this is also called _attribution_). There are lots of ways to provide attribution, but the easiest way is to add text below the image that identifies the creator and website it came from.\r\n\r\nIn this page we've already added, and attributed, an image of a frog. Use the Creative Commons search engine to find another image of an amphibian. Add your found image to this page, along with proper attribution, including:\r\n\r\n* The name of the creator (if available)\r\n* The website it was found on (e.g. commons.wikimedia.org)\r\n* The license it was published under (e.g. CC-BY)",
-    "hide_share_and_remix": "true"
+    "markdown_instructions": "<div style=\"float: right; height: 250px; width: 40%; overflow-y: scroll; margin-left: 20px; font-size:14px\" markdown=\"1\">\r\n<details>\r\n<summary>**How do I add images?**</summary>\r\nThe `<img>` tag allows you to show images on your web page. <br><br>\r\n\r\nExample:\r\n<pre>&lt;img src=\"dog.png\" alt=\"dog jumping\"/&gt;</pre><br><br>\r\n\r\nIn order to tell the browser which file to use, extra information, called an **attribute**, is added to the &lt;img&gt; tag inside the brackets. The attribute `src` stands for **s**ou**rc**e and tell the name of the image. Image files names include extensions which tell the computer which type of image they are working with. Common extensions are .jpg, .jpeg, .png. <br><br>\r\n\r\nIn addition to have the src attribute, image elements also have the `alt` attribute which describe the image. This is important in case the image doesn’t load or for people who have trouble with their eyesight. <br><br>\r\n\r\nAn `<img>` tag is an example of a  **self-closing tag** because it starts and closes in one tag. To mark this we put the `/` which usually goes in the close tag at the end of the image tag.\r\n\r\n</details>\r\n<details>\r\n<summary>**Why does an image tag not have a closing tag?**</summary>\r\nAn image tag doesn't need a closing tag because there is no text content which must be wrapped in tags. The content that shows on the screen is specified through the tags attributes.\r\n</details>\r\n<details>\r\n<summary>**What is an attribute?**</summary>\r\nAttributes are extra information included in a tag.  Attributes have names and values. The name tells what type of information is being provided and then the value gives the specific information for that tag. \r\n\r\nFor example &lt;img&gt; tags have two attributes, src and alt. src specifies the name of the image file and alt tells the browser in readable text what the image is.\r\n</details>\r\n</div>\r\n\r\n# Giving Credit\r\n\r\nWhen using a Creative Commons licensed image, you need to give credit to the original creator (this is also called _attribution_). There are lots of ways to provide attribution, but the easiest way is to add text below the image that identifies the creator and website it came from.\r\n\r\nIn this page we've already added and attributed an image of a frog. Use the Creative Commons search engine to find another image of an amphibian. Add your found image to this page, along with proper attribution, including:\r\n\r\n* The name of the creator (if available)\r\n* The website it was found on (e.g. commons.wikimedia.org)\r\n* The license it was published under (e.g. CC-BY)",
+    "hide_share_and_remix": "true",
+    "encrypted_examples": [
+
+    ],
+    "submittable": "false"
   },
   "published": true,
   "notes": "",
-  "audit_log": "[{\"changed_at\":\"2017-05-11 04:33:39 +0000\",\"changed\":[\"markdown_instructions\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"}]",
+  "audit_log": "[{\"changed_at\":\"2017-05-11 04:33:39 +0000\",\"changed\":[\"markdown_instructions\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"},{\"changed_at\":\"2017-05-25 23:07:36 +0000\",\"changed\":[\"markdown_instructions\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"}]",
   "level_concept_difficulty": {
   }
 }]]></config>

dashboard/config/scripts/levels/CSD U2 Info Page Final Touches.level

@@ -5,14 +5,16 @@
   "level_num": "custom",
   "user_id": 1,
   "properties": {
-    "markdown_instructions": "<div style=\"float: right; height: 250px; width: 40%; overflow-y: scroll; margin-left: 20px; font-size:14px\">\r\n\r\n<h2>\r\nChecklist\r\n</h2>\r\n\r\n<input type=\"checkbox\" style=\"float: left\"><span style=\"display: block; margin-left: 20px; margin-bottom: 10px\">Ensure that your image is properly licensed</span>\r\n<input type=\"checkbox\" style=\"float: left\"><span style=\"display: block; margin-left: 20px; margin-bottom: 10px\">Upload image into Web Lab</span>\r\n<input type=\"checkbox\" style=\"float: left\"><span style=\"display: block; margin-left: 20px; margin-bottom: 10px\">Create an image tag with a descriptive alt attribute</span>\r\n<input type=\"checkbox\" style=\"float: left\"><span style=\"display: block; margin-left: 20px; margin-bottom: 10px\">If the image isn't your own, add attribution underneath<br/>\r\n\r\n</div>\r\n\r\n\r\n# Adding Images to Your Site\r\n\r\nYou've already created some pages with great content on your website, now you can add some images!\r\n\r\n# Do This\r\n\r\nUsing either your own images, or those found through a Commons Search, add some images to the pages you've already created. Get creative! Use the checklist to the right to keep track of the steps you need to follow when adding images.\r\n",
+    "markdown_instructions": "<div style=\"float: right; height: 250px; width: 40%; overflow-y: scroll; margin-left: 20px; font-size:14px\">\r\n\r\n<h2>\r\nChecklist\r\n</h2>\r\n\r\n<input type=\"checkbox\" style=\"float: left\"><span style=\"display: block; margin-left: 20px; margin-bottom: 10px\">Ensure that your image is properly licensed</span>\r\n<input type=\"checkbox\" style=\"float: left\"><span style=\"display: block; margin-left: 20px; margin-bottom: 10px\">Upload image into Web Lab</span>\r\n<input type=\"checkbox\" style=\"float: left\"><span style=\"display: block; margin-left: 20px; margin-bottom: 10px\">Create an image tag with a descriptive alt attribute</span>\r\n<input type=\"checkbox\" style=\"float: left\"><span style=\"display: block; margin-left: 20px; margin-bottom: 10px\">If the image isn't your own, add attribution underneath<br/>\r\n\r\n</div>\r\n\r\n\r\n# Adding Images to Your Site\r\n\r\nYou've already created some pages with great content on your website, now you can add some images!\r\n\r\n# Do This\r\n\r\nUsing either your own images or those found through a Commons Search, add some images to the pages you've already created. Get creative! Use the checklist to the right to keep track of the steps you need to follow when adding images.\r\n",
     "project_template_level_name": "CSD U2 Project Template",
     "instructions_important": "false",
     "hide_share_and_remix": "true",
-    "encrypted_examples": "sNrlR8YwEE9PSkapfZ4KAlFYg7aQ7snnTcYNPIqUvJ/cdiYJygd4TnwXlfJ2\nbxk5ob1B/bgrkcCzhguyWcY4VA==\n"
+    "encrypted_examples": "sNrlR8YwEE9PSkapfZ4KAlFYg7aQ7snnTcYNPIqUvJ/cdiYJygd4TnwXlfJ2\nbxk5ob1B/bgrkcCzhguyWcY4VA==\n",
+    "submittable": "false"
   },
   "published": true,
   "notes": "",
+  "audit_log": "[{\"changed_at\":\"2017-05-25 23:08:17 +0000\",\"changed\":[\"markdown_instructions\",\"encrypted_examples\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"}]",
   "level_concept_difficulty": {
   }
 }]]></config>

dashboard/config/scripts/levels/CSD U2 Text Properties Map.level

@@ -7,9 +7,13 @@
   "properties": {
     "instructions_important": "false",
     "display_name": "CSS Text Properties",
-    "reference": "/csd/text_properties/index.html"
+    "reference": "/csd/text_properties/index.html",
+    "teacher_markdown": "# Differences in Browsers and Operating Systems\r\n\r\nAs mentioned in this map, you may find that different combinations of computers and browsers render fonts differently. While there is a common specification for how HTML and CSS should be read and displayed on the screen, each browser does so in a slightly different way, which can lead to the same page looking different on different computers. If your students encounter this, you can reassure them that it's a common challenge that web developers face.\r\n\r\nIn the case of `font-family: fantasy`, you can actually specify a list of fonts, from most to least specific. That way, if a user's computer has the exact font you specified, that's what they'll see, but if not the browser will try the next font on your list. To try and ensure that users see the font in the example image, you could write the css as `font-family: Papyrus, fantasy`. That way, even if a user's browser has a different default font for \"fantasy\", it will try to load the specific font \"Papyrus\" first."
   },
   "published": true,
-  "notes": ""
+  "notes": "",
+  "audit_log": "[{\"changed_at\":\"2017-05-26 16:32:57 +0000\",\"changed\":[],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"}]",
+  "level_concept_difficulty": {
+  }
 }]]></config>
 </Map>

dashboard/config/scripts/levels/CSD U3 Entertainment Sample 1.level

@@ -7,7 +7,7 @@
   "properties": {
     "skin": "gamelab",
     "embed": "true",
-    "markdown_instructions": "Press \"Run\" to play the game on the left.  You can make the alien jump with the up arrow, and move it to the left and right with the arrow keys.  You score by collecting stars, and if you score high enough, the background will change.",
+    "markdown_instructions": "# Alien Jumper\r\n\r\nPress \"Run\" to play the game on the left.  You can make the alien jump with the up arrow, and move it to the left and right with the arrow keys.  You score by collecting stars, and if you score high enough, the background will change.",
     "is_k1": "false",
     "skip_instructions_popup": "false",
     "never_autoplay_video": "false",
@@ -42,10 +42,14 @@
     "disable_if_else_editing": "false",
     "show_debug_watch": "false",
     "expand_debugger": "false",
-    "contained_level_names": null
+    "contained_level_names": null,
+    "encrypted_examples": [
+
+    ]
   },
   "published": true,
   "notes": "",
+  "audit_log": "[{\"changed_at\":\"2017-05-25 19:13:07 +0000\",\"changed\":[\"markdown_instructions\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"}]",
   "level_concept_difficulty": {
   }
 }]]></config>