Merge pull request code-dot-org#26674 from code-dot-org/revert-26673-revert-26625-rename-instructions-in-content

Revert "Revert "Rename Instructions in all levels""

Author: Hamms

dashboard/app/views/levels/show.html.haml

@@ -37,8 +37,8 @@
     = render partial: 'levels/not_started'
   - elsif @level.is_a?(Blockly) && @level.embed == 'true' && !@edit_blocks && [email protected]_a?(Applab) && [email protected]_a?(Gamelab) && [email protected]_a?(Weblab)
     #title
-      - if @level.properties['instructions'].present?
-        %h4{style: 'margin-left: auto; margin-right: auto; max-width: 800px;'}!= brakeman_no_warn(@level.properties['instructions'])
+      - if @level.properties['short_instructions'].present?
+        %h4{style: 'margin-left: auto; margin-right: auto; max-width: 800px;'}!= brakeman_no_warn(@level.properties['short_instructions'])
     -# Pass special parameters to Blockly partial for embedded level type.
     = render partial: 'levels/blockly'
   - elsif @level.is_a?(DSLDefined) || @level.is_a?(Widget) || @level.is_a?(FreeResponse) || @level.is_a?(StandaloneVideo) || @level.is_a?(ExternalLink) || @level.is_a?(CurriculumReference)

dashboard/config/scripts/levels/'pre-assessment survey q25A'.level

@@ -5,7 +5,7 @@
   "level_num": "custom",
   "user_id": 340,
   "properties": {
-    "markdown_instructions": "If yes, what computer science course(s) had you taken before your current computer science  class? \r\n",
+    "long_instructions": "If yes, what computer science course(s) had you taken before your current computer science  class? \r\n",
     "submittable": "false",
     "allow_user_uploads": "false",
     "peer_reviewable": "false",

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

@@ -6,7 +6,7 @@
   "user_id": 6,
   "properties": {
     "skin": "artist",
-    "instructions": "Hi, I'm an artist. You can write code to make me draw almost anything. Use a few blocks to make me draw over the grey lines in the picture. (Each line is 100 pixels long)",
+    "short_instructions": "Hi, I'm an artist. You can write code to make me draw almost anything. Use a few blocks to make me draw over the grey lines in the picture. (Each line is 100 pixels long)",
     "x": "100",
     "y": "100",
     "start_direction": "90",
@@ -24,7 +24,7 @@
     "use_contract_editor": "false",
     "impressive": "false",
     "disable_sharing": "false",
-    "markdown_instructions": "Hi, I'm an artist. You can write code to make me draw almost anything. Use a few blocks to make me draw over the grey lines in the picture. (Each line is 100 pixels long)\r\n\r\n",
+    "long_instructions": "Hi, I'm an artist. You can write code to make me draw almost anything. Use a few blocks to make me draw over the grey lines in the picture. (Each line is 100 pixels long)\r\n\r\n",
     "contract_highlight": "false",
     "contract_collapse": "false",
     "examples_highlight": "false",

dashboard/config/scripts/levels/2-3 Artist 11.level

@@ -6,7 +6,7 @@
   "user_id": 6,
   "properties": {
     "skin": "artist",
-    "instructions": "Give the stop sign a border by making an octagon with 100 pixels sides. \r\n\r\n",
+    "short_instructions": "Give the stop sign a border by making an octagon with 100 pixels sides. \r\n\r\n",
     "x": "150",
     "y": "100",
     "start_direction": "90",
@@ -16,7 +16,7 @@
     "ideal": "4",
     "slider_speed": "0.7",
     "embed": "false",
-    "markdown_instructions": "Give the stop sign a border by making an octagon with 100 pixels sides. ",
+    "long_instructions": "Give the stop sign a border by making an octagon with 100 pixels sides. ",
     "disable_param_editing": "true",
     "disable_variable_editing": "false",
     "use_modal_function_editor": "false",

dashboard/config/scripts/levels/2-3 Artist 12.level

@@ -6,7 +6,7 @@
   "user_id": 6,
   "properties": {
     "skin": "artist",
-    "instructions": "Create a circle to finish the eyeball!\r\n\r\nIf the artist turns 1 degree with each loop, how many times do you need to repeat the code to draw a circle? 180? 360? 500?",
+    "short_instructions": "Create a circle to finish the eyeball!\r\n\r\nIf the artist turns 1 degree with each loop, how many times do you need to repeat the code to draw a circle? 180? 360? 500?",
     "x": "140",
     "y": "125",
     "start_direction": "90",
@@ -16,7 +16,7 @@
     "free_play": "false",
     "ideal": "4",
     "embed": "false",
-    "markdown_instructions": "Create a circle to finish the eyeball! \r\n\r\nIf the artist turns 1 degree with each loop, how many times do you need to repeat the code to draw a circle? ",
+    "long_instructions": "Create a circle to finish the eyeball! \r\n\r\nIf the artist turns 1 degree with each loop, how many times do you need to repeat the code to draw a circle? ",
     "disable_param_editing": "true",
     "disable_variable_editing": "false",
     "use_modal_function_editor": "false",

dashboard/config/scripts/levels/2-3 Artist 2 new.level

@@ -6,7 +6,7 @@
   "user_id": 6,
   "properties": {
     "skin": "artist",
-    "instructions": "This house has a half-finished wall. Each side is 100, but the half-finished wall is only 50. Complete the wall. ",
+    "short_instructions": "This house has a half-finished wall. Each side is 100, but the half-finished wall is only 50. Complete the wall. ",
     "x": "250",
     "y": "250",
     "start_direction": "90",
@@ -16,7 +16,7 @@
     "ideal": "3",
     "slider_speed": "0.4",
     "embed": "false",
-    "markdown_instructions": "This house has a half-finished wall. Each side is 100, but the half-finished wall is only 50. Complete the wall.",
+    "long_instructions": "This house has a half-finished wall. Each side is 100, but the half-finished wall is only 50. Complete the wall.",
     "disable_param_editing": "true",
     "disable_variable_editing": "false",
     "use_modal_function_editor": "false",

dashboard/config/scripts/levels/2-3 Artist 2.level

@@ -6,7 +6,7 @@
   "user_id": 19,
   "properties": {
     "skin": "artist",
-    "instructions": "This house has a half-finished wall. Each side is 100, but the half-finished wall is only 50. Complete the wall. ",
+    "short_instructions": "This house has a half-finished wall. Each side is 100, but the half-finished wall is only 50. Complete the wall. ",
     "x": 250,
     "y": 250,
     "start_direction": 90

dashboard/config/scripts/levels/2-3 Artist 3.4.level

@@ -6,7 +6,7 @@
   "user_id": 6,
   "properties": {
     "skin": "artist",
-    "instructions": "The jump block moves the artist without drawing. Draw the dashed line using both the `jump forward` and `move forward` blocks. Each line is 50 pixels long.",
+    "short_instructions": "The jump block moves the artist without drawing. Draw the dashed line using both the `jump forward` and `move forward` blocks. Each line is 50 pixels long.",
     "x": "100",
     "y": "300",
     "start_direction": "90",
@@ -15,7 +15,7 @@
     "free_play": "false",
     "slider_speed": "0.4",
     "embed": "false",
-    "markdown_instructions": "The jump block moves the artist without drawing. Draw the dashed line using both the `jump forward` and `move forward` blocks. Each line is 50 pixels long.",
+    "long_instructions": "The jump block moves the artist without drawing. Draw the dashed line using both the `jump forward` and `move forward` blocks. Each line is 50 pixels long.",
     "disable_param_editing": "true",
     "disable_variable_editing": "false",
     "use_modal_function_editor": "false",

dashboard/config/scripts/levels/2-3 Artist 3.level

@@ -6,7 +6,7 @@
   "user_id": 28,
   "properties": {
     "skin": "artist",
-    "instructions": "This hat is 100 pixels high. Draw a hat that is 70 pixels less.",
+    "short_instructions": "This hat is 100 pixels high. Draw a hat that is 70 pixels less.",
     "x": 175,
     "y": 200,
     "start_direction": 90

dashboard/config/scripts/levels/2-3 Artist 3new.level

@@ -6,7 +6,7 @@
   "user_id": 6,
   "properties": {
     "skin": "artist",
-    "instructions": "The red hat is 100 pixels tall. Finish drawing a black hat that is 70 pixels shorter. \r\n(Note: The width of each hat is 50 pixels.)",
+    "short_instructions": "The red hat is 100 pixels tall. Finish drawing a black hat that is 70 pixels shorter. \r\n(Note: The width of each hat is 50 pixels.)",
     "x": "175",
     "y": "250",
     "start_direction": "90",
@@ -29,7 +29,7 @@
     "examples_collapse": "false",
     "definition_highlight": "false",
     "definition_collapse": "false",
-    "markdown_instructions": "The red hat is 100 pixels tall. Finish drawing a black hat that is 70 pixels shorter. \r\n\r\n*(Note: The width of each hat is 50 pixels.)*",
+    "long_instructions": "The red hat is 100 pixels tall. Finish drawing a black hat that is 70 pixels shorter. \r\n\r\n*(Note: The width of each hat is 50 pixels.)*",
     "examples_required": "false",
     "disable_examples": "false",
     "authored_hints": "[\r\n {\r\n  \"hint_class\": \"pointer\",\r\n  \"hint_markdown\": \"What is 100-70?  Based on the story problem, that's how tall the hat needs to be!\",\r\n  \"hint_id\": \"2-3_Artist_3new_a\",\r\n  \"hint_type\": \"general\"\r\n },\r\n {\r\n  \"hint_class\": \"content\",\r\n  \"hint_markdown\": \"The artist doesn't seem to be pointing in the correct direction. Can you make them turn first before drawing the line?\",\r\n  \"hint_id\": \"2-3_Artist_3new_b\",\r\n  \"hint_type\": \"general\"\r\n }\r\n]",

dashboard/config/scripts/levels/2-3 Artist 4.level

@@ -6,7 +6,7 @@
   "user_id": 6,
   "properties": {
     "skin": "artist",
-    "instructions": "Help me complete the house for this cat.",
+    "short_instructions": "Help me complete the house for this cat.",
     "x": "150",
     "y": "250",
     "start_direction": "90",
@@ -16,7 +16,7 @@
     "free_play": "false",
     "slider_speed": "0.4",
     "embed": "false",
-    "markdown_instructions": "Help me complete the house for this cat.",
+    "long_instructions": "Help me complete the house for this cat.",
     "disable_param_editing": "true",
     "disable_variable_editing": "false",
     "use_modal_function_editor": "false",

dashboard/config/scripts/levels/2-3 Artist 5.level

@@ -6,7 +6,7 @@
   "user_id": 6,
   "properties": {
     "skin": "artist",
-    "instructions": "Replace this code with a \"repeat times\" block to draw the same house using only 3 blocks.",
+    "short_instructions": "Replace this code with a \"repeat times\" block to draw the same house using only 3 blocks.",
     "x": 250,
     "y": 250,
     "start_direction": 90

dashboard/config/scripts/levels/2-3 Artist 6.level

@@ -6,7 +6,7 @@
   "user_id": 6,
   "properties": {
     "skin": "artist",
-    "instructions": "This house needs a roof! Draw the triangle.  Hint: all three sides are the same length.",
+    "short_instructions": "This house needs a roof! Draw the triangle.  Hint: all three sides are the same length.",
     "x": "150",
     "y": "200",
     "start_direction": "90",
@@ -15,7 +15,7 @@
     "free_play": "false",
     "slider_speed": "0.4",
     "embed": "false",
-    "markdown_instructions": "This house needs a roof! Draw the triangle.  \r\n\r\nHint: all three sides are the same length.\r\n\r\n<img src=\"https://images.code.org/8b10073fd1a7fe53b4da33ec2229894b-image-1468018903891.gif\" width=\"300\"/>",
+    "long_instructions": "This house needs a roof! Draw the triangle.  \r\n\r\nHint: all three sides are the same length.\r\n\r\n<img src=\"https://images.code.org/8b10073fd1a7fe53b4da33ec2229894b-image-1468018903891.gif\" width=\"300\"/>",
     "disable_param_editing": "true",
     "disable_variable_editing": "false",
     "use_modal_function_editor": "false",

dashboard/config/scripts/levels/2-3 Artist 7.level

@@ -6,7 +6,7 @@
   "user_id": 6,
   "properties": {
     "skin": "artist",
-    "instructions": "Finish drawing the last set of windows on the school so that everyone in class can see outside. The sides of each square window pane are 25 pixels long. ",
+    "short_instructions": "Finish drawing the last set of windows on the school so that everyone in class can see outside. The sides of each square window pane are 25 pixels long. ",
     "x": "290",
     "y": "200",
     "start_direction": "90",
@@ -29,7 +29,7 @@
     "definition_collapse": "false",
     "disable_examples": "false",
     "disable_sharing": "false",
-    "markdown_instructions": "Finish drawing the last set of windows on the school so that everyone in class can see outside. \r\n\r\nThe sides of each square window pane are 25 pixels long. ",
+    "long_instructions": "Finish drawing the last set of windows on the school so that everyone in class can see outside. \r\n\r\nThe sides of each square window pane are 25 pixels long. ",
     "examples_required": "false",
     "never_autoplay_video": "false",
     "authored_hints": "[\r\n {\r\n  \"hint_class\": \"pointer\",\r\n  \"hint_markdown\": \"The easiest way to solve this puzzle is to draw the first square and end with the artist pointing down before starting your second square.\",\r\n  \"hint_id\": \"2-3_Artist_7_a\",\r\n  \"hint_type\": \"general\"\r\n }\r\n]",

dashboard/config/scripts/levels/2-3 Artist 8.level

@@ -6,7 +6,7 @@
   "user_id": 6,
   "properties": {
     "skin": "artist",
-    "instructions": "Complete the rooms for each of the animals by splitting the rectangle into 2 equal-sized squares. The rectangle is 200 pixels wide and 100 pixels tall. There are many different ways to solve this puzzle, so have some fun!",
+    "short_instructions": "Complete the rooms for each of the animals by splitting the rectangle into 2 equal-sized squares. The rectangle is 200 pixels wide and 100 pixels tall. There are many different ways to solve this puzzle, so have some fun!",
     "x": "100",
     "y": "250",
     "start_direction": "90",
@@ -22,7 +22,7 @@
     "use_modal_function_editor": "false",
     "use_contract_editor": "false",
     "impressive": "false",
-    "markdown_instructions": "Time to build a barn!\r\n\r\nMake the rooms for each animal by splitting the barn into 2 equal-sized squares. \r\n\r\nHint: The rectangle is 200 pixels wide and 100 pixels tall.\r\n\r\nThere are many different ways to solve this puzzle.",
+    "long_instructions": "Time to build a barn!\r\n\r\nMake the rooms for each animal by splitting the barn into 2 equal-sized squares. \r\n\r\nHint: The rectangle is 200 pixels wide and 100 pixels tall.\r\n\r\nThere are many different ways to solve this puzzle.",
     "contract_highlight": "false",
     "contract_collapse": "false",
     "examples_highlight": "false",

dashboard/config/scripts/levels/2-3 Artist 9 NEW.level

@@ -6,7 +6,7 @@
   "user_id": 6,
   "properties": {
     "skin": "artist",
-    "instructions": "Finish this kite",
+    "short_instructions": "Finish this kite",
     "x": "225",
     "y": "175",
     "start_direction": "45",
@@ -15,7 +15,7 @@
     "free_play": "false",
     "slider_speed": "0.4",
     "embed": "false",
-    "markdown_instructions": "Finish this kite",
+    "long_instructions": "Finish this kite",
     "disable_param_editing": "true",
     "disable_variable_editing": "false",
     "use_modal_function_editor": "false",

dashboard/config/scripts/levels/2-3 Artist 9 REPLACEMENT.level

@@ -7,8 +7,8 @@
   "properties": {
     "skin": "artist",
     "embed": "false",
-    "instructions": "Finish drawing these stairs!",
-    "markdown_instructions": "Finish drawing these stairs!",
+    "short_instructions": "Finish drawing these stairs!",
+    "long_instructions": "Finish drawing these stairs!",
     "is_k1": "false",
     "skip_instructions_popup": "false",
     "never_autoplay_video": "false",

dashboard/config/scripts/levels/2-3 Artist 9.level

@@ -6,7 +6,7 @@
   "user_id": 6,
   "properties": {
     "skin": "artist",
-    "instructions": "Finish this kite",
+    "short_instructions": "Finish this kite",
     "x": "225",
     "y": "175",
     "start_direction": "90",
@@ -15,7 +15,7 @@
     "free_play": "false",
     "slider_speed": "0.4",
     "embed": "false",
-    "markdown_instructions": "Finish this kite",
+    "long_instructions": "Finish this kite",
     "disable_param_editing": "true",
     "disable_variable_editing": "false",
     "use_modal_function_editor": "false",

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

@@ -6,7 +6,7 @@
   "user_id": 6,
   "properties": {
     "skin": "artist",
-    "instructions": "Assessment: Finish drawing the last tooth. It is 25 pixels wide and 25 pixels tall.",
+    "short_instructions": "Assessment: Finish drawing the last tooth. It is 25 pixels wide and 25 pixels tall.",
     "x": "250",
     "y": "250",
     "start_direction": "90",
@@ -31,7 +31,7 @@
     "impressive": "false",
     "disable_sharing": "false",
     "permitted_errors": "0",
-    "markdown_instructions": "**Assessment:** Finish drawing the last tooth. It is 25 pixels wide and 25 pixels tall.",
+    "long_instructions": "**Assessment:** Finish drawing the last tooth. It is 25 pixels wide and 25 pixels tall.",
     "examples_required": "false",
     "never_autoplay_video": "false",
     "hint_prompt_attempts_threshold": 5,

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

@@ -6,7 +6,7 @@
   "user_id": 6,
   "properties": {
     "skin": "artist",
-    "instructions": "This hat should only be 50 pixels wide.  Can you fix it?",
+    "short_instructions": "This hat should only be 50 pixels wide.  Can you fix it?",
     "x": "140",
     "y": "225",
     "start_direction": "90",
@@ -30,7 +30,7 @@
     "permitted_errors": "0",
     "impressive": "false",
     "disable_sharing": "false",
-    "markdown_instructions": "This hat should only be 50 pixels wide. \r\nCan you fix it?\r\n\r\n<br/>\r\n",
+    "long_instructions": "This hat should only be 50 pixels wide. \r\nCan you fix it?\r\n\r\n<br/>\r\n",
     "examples_required": "false",
     "disable_examples": "false",
     "callout_json": "[\r\n {\r\n  \"localization_key\": \"2-3_Artist_Debugging_1_a\",\r\n  \"callout_text\": \"Artist doesn't have a \\\"Step\\\" button, but you can drag the slider left to watch your program run more carefully.\",\r\n  \"element_id\": \"#fastClipPath\",\r\n  \"on\": \"\",\r\n  \"qtip_config\": {\r\n   \"style\": {\r\n    \"classes\": \"\"\r\n   },\r\n   \"position\": {\r\n    \"my\": \"bottom left\",\r\n    \"at\": \"top right\",\r\n    \"adjust\": {\r\n     \"x\": 0,\r\n     \"y\": 0\r\n    }\r\n   }\r\n  }\r\n }\r\n]",

dashboard/config/scripts/levels/2-3 Artist Debugging 10.level

@@ -6,7 +6,7 @@
   "user_id": 6,
   "properties": {
     "skin": "artist",
-    "instructions": "The direction pad on my game controller is too narrow. \r\n\r\nCan you make it wider by 10 pixels?\r\n\r\nTry running the code first to see what's wrong.",
+    "short_instructions": "The direction pad on my game controller is too narrow. \r\n\r\nCan you make it wider by 10 pixels?\r\n\r\nTry running the code first to see what's wrong.",
     "x": "65",
     "y": "200",
     "start_direction": "90",
@@ -16,7 +16,7 @@
     "slider_speed": "0.4",
     "free_play": "false",
     "embed": "false",
-    "markdown_instructions": "The direction pad on my game controller is too narrow. \r\n\r\nCan you make it wider by 10 pixels?\r\n\r\nTry running the code first to see what's wrong.",
+    "long_instructions": "The direction pad on my game controller is too narrow. \r\n\r\nCan you make it wider by 10 pixels?\r\n\r\nTry running the code first to see what's wrong.",
     "disable_param_editing": "true",
     "disable_variable_editing": "false",
     "use_modal_function_editor": "false",

dashboard/config/scripts/levels/2-3 Artist Debugging 11.level

@@ -6,7 +6,7 @@
   "user_id": 6,
   "properties": {
     "skin": "artist",
-    "instructions": "My snowflake is falling apart!\r\n\r\nCan you figure out what's going wrong?",
+    "short_instructions": "My snowflake is falling apart!\r\n\r\nCan you figure out what's going wrong?",
     "x": "225",
     "y": "200",
     "start_direction": "0",
@@ -22,7 +22,7 @@
     "use_contract_editor": "false",
     "disable_sharing": "false",
     "impressive": "false",
-    "markdown_instructions": "My snowflake is falling apart!\r\n\r\nCan you figure out what's going wrong?",
+    "long_instructions": "My snowflake is falling apart!\r\n\r\nCan you figure out what's going wrong?",
     "contract_highlight": "false",
     "contract_collapse": "false",
     "examples_highlight": "false",

dashboard/config/scripts/levels/2-3 Artist Debugging 12.level

@@ -6,7 +6,7 @@
   "user_id": 6,
   "properties": {
     "skin": "artist",
-    "instructions": "I'm supposed to add an ocean wave to this scene.  Can you help me?",
+    "short_instructions": "I'm supposed to add an ocean wave to this scene.  Can you help me?",
     "x": "75",
     "y": "275",
     "start_direction": "0",