Merge pull request #190 from concord-consortium/m2sAuthor

M2s author
concord-consortium · Sep 18, 2024 · 8123630 · 8123630
2 parents acf650f + 80ff018
commit 8123630
Show file tree

Hide file tree

Showing 17 changed files with 52 additions and 65 deletions.
diff --git a/curriculum/m2s/content.json b/curriculum/m2s/content.json
@@ -574,7 +574,7 @@
                       "<p>* Use the space below to consider how you would approach your first task. </p>",
                       "<p>        &lt;&gt; First, drag the prompt from your task into this Workspace using the 6 dots in the corner of that tile. </p>",
                       "<p>        &lt;&gt;Then use the prompt questions at left to help you organize your thoughts. </p>",
-                      "<p>* You can use any of the tile types (diagram, text, drawing, image, table, graph) to help you with your task.  </p>",
+                      "<p>* You can use any of the tile types (diagram, text, sketch, image, table, graph) to help you with your task.  </p>",
                       "<p>* Make sure you label your answers with the number of the question you are answering. </p>"
                     ]
                   }
@@ -662,7 +662,7 @@
                       "<p><em>Here is a space for you to take notes. Create variables using the variable tool on text tiles or in the diagram tile.</em></p>",
                       "<p>Some sample variables could be:</p>",
                       "<ul><li>[initial number of cats]</li><li>[height of the building]</li><li>[area of town]</li><li>[etc.]</li></ul>",
-                      "<p>A diagram for specifying variable relationships, and a drawing tile for sketches are already made for you.</p>",
+                      "<p>A diagram for specifying variable relationships, and a sketch tile for sketches are already made for you.</p>",
                       "<p>Drag the questions from this Activity on the left into this Workspace. Edit the text to write your answers below the questions.</p>"
                     ]
                   }
@@ -712,7 +712,7 @@
                     "format": "html",
                     "text": [
                       "<p><strong>My notes</strong></p>",
-                      "<p><em>Here is a space for you to take notes. Create variables using the variable tool on text tiles or drawing tiles, and develop your model in the diagram tile.</em></p>"
+                      "<p><em>Here is a space for you to take notes. Create variables using the variable tool on text tiles or sketch tiles, and develop your model in the diagram tile.</em></p>"
                     ]
                   }
                 },
@@ -761,7 +761,7 @@
                     "format": "html",
                     "text": [
                       "<p><strong>My notes</strong></p>",
-                      "<p><em>Here is a space for you to take notes. Create variables using the variable tool on text tiles or drawing tiles, and develop your model in the diagram tile.</em></p>"
+                      "<p><em>Here is a space for you to take notes. Create variables using the variable tool on text tiles or sketch tiles, and develop your model in the diagram tile.</em></p>"
                     ]
                   }
                 },
@@ -860,7 +860,7 @@
                     "format": "html",
                     "text": [
                       "<p><strong>My notes</strong></p>",
-                      "<p><em>Here is a space for you to take notes. Create variables using the variable tool on text tiles or drawing tiles, and develop your model in the diagram tile.</em></p>"
+                      "<p><em>Here is a space for you to take notes. Create variables using the variable tool on text tiles or sketch tiles, and develop your model in the diagram tile.</em></p>"
                     ]
                   }
                 },
@@ -909,7 +909,7 @@
                     "format": "html",
                     "text": [
                       "<p><strong>My notes</strong></p>",
-                      "<p><em>Here is a space for you to take notes. Create variables using the variable tool on text tiles or drawing tiles, and develop your model in the diagram tile.</em></p>"
+                      "<p><em>Here is a space for you to take notes. Create variables using the variable tool on text tiles or sketch tiles, and develop your model in the diagram tile.</em></p>"
                     ]
                   }
                 },
@@ -974,7 +974,7 @@
                 },
                 {
                   "id": "8CTbvD6g6kF7pjLL",
-                  "title": "Final Project Drawing",
+                  "title": "Final Project Sketch",
                   "content": {
                     "type": "Drawing",
                     "objects": []
@@ -1032,7 +1032,7 @@
                   },
                   {
                     "id": "TemplateDrawTile12MAR2023",
-                    "title": "Template Drawing Tile",
+                    "title": "Template Sketch Tile",
                     "content": {
                       "type": "Drawing",
                       "objects": []
@@ -1161,7 +1161,7 @@
                 },
                 {
                   "id": "TemplateDrawTile12MAR2023",
-                  "title": "Template Drawing Tile",
+                  "title": "Template Sketch Tile",
                   "content": {
                     "type": "Drawing",
                     "objects": []
@@ -1261,7 +1261,7 @@
                 ],
                 {
                   "id": "TemplateDrawTile12MAR2023",
-                  "title": "Template Drawing Tile",
+                  "title": "Template Sketch Tile",
                   "content": {
                     "type": "Drawing",
                     "objects": []
@@ -1311,7 +1311,7 @@
                   },
                   {
                     "id": "TemplateDrawTile12MAR2023",
-                    "title": "Template Drawing Tile",
+                    "title": "Template Sketch Tile",
                     "content": {
                       "type": "Drawing",
                       "objects": []
@@ -1363,7 +1363,7 @@
                   },
                   {
                     "id": "TemplateDrawTile12MAR2023",
-                    "title": "Template Drawing Tile",
+                    "title": "Template Sketch Tile",
                     "content": {
                       "type": "Drawing",
                       "objects": []
@@ -1436,7 +1436,7 @@
                 },
                 {
                   "id": "TemplateDrawTile12MAR2023",
-                  "title": "Template Drawing Tile",
+                  "title": "Template Sketch Tile",
                   "content": {
                     "type": "Drawing",
                     "objects": []
@@ -1763,7 +1763,7 @@
                   },
                   {
                     "id": "TemplateDrawTile12MAR2023",
-                    "title": "Template Drawing Tile",
+                    "title": "Template Sketch Tile",
                     "content": {
                       "type": "Drawing",
                       "objects": []
@@ -1821,7 +1821,7 @@
                   },
                   {
                     "id": "TemplateDrawTileQ5_1",
-                    "title": "Template Drawing Tile",
+                    "title": "Template Sketch Tile",
                     "content": {
                       "type": "Drawing",
                       "objects": []
@@ -1873,7 +1873,7 @@
                   },
                   {
                     "id": "TemplateDrawTileQ5_2",
-                    "title": "Template Drawing Tile",
+                    "title": "Template Sketch Tile",
                     "content": {
                       "type": "Drawing",
                       "objects": []
@@ -1927,7 +1927,7 @@
                   },
                   {
                     "id": "TemplateDrawTileQ5_3",
-                    "title": "Template Drawing Tile",
+                    "title": "Template Sketch Tile",
                     "content": {
                       "type": "Drawing",
                       "objects": []
@@ -1978,7 +1978,7 @@
                   },
                   {
                     "id": "TemplateDrawTileQ5_4",
-                    "title": "Template Drawing Tile",
+                    "title": "Template Sketch Tile",
                     "content": {
                       "type": "Drawing",
                       "objects": []
@@ -2030,7 +2030,7 @@
                   },
                   {
                     "id": "TemplateDrawTileQ5_5",
-                    "title": "Template Drawing Tile",
+                    "title": "Template Sketch Tile",
                     "content": {
                       "type": "Drawing",
                       "objects": []
@@ -2082,7 +2082,7 @@
                   },
                   {
                     "id": "TemplateDrawTileQ5_6",
-                    "title": "Template Drawing Tile",
+                    "title": "Template Sketch Tile",
                     "content": {
                       "type": "Drawing",
                       "objects": []
@@ -2134,7 +2134,7 @@
                   },
                   {
                     "id": "TemplateDrawTileQ5_7",
-                    "title": "Template Drawing Tile",
+                    "title": "Template Sketch Tile",
                     "content": {
                       "type": "Drawing",
                       "objects": []
@@ -2184,7 +2184,7 @@
                   },
                   {
                     "id": "TemplateDrawTileQ5_8",
-                    "title": "Template Drawing Tile",
+                    "title": "Template Sketch Tile",
                     "content": {
                       "type": "Drawing",
                       "objects": []
@@ -2328,7 +2328,7 @@
                   },
                   {
                     "id": "TemplateDrawTileQ6_1",
-                    "title": "Template Drawing Tile",
+                    "title": "Template Sketch Tile",
                     "content": {
                       "type": "Drawing",
                       "objects": []
@@ -2380,7 +2380,7 @@
                   },
                   {
                     "id": "TemplateDrawTileQ6_2",
-                    "title": "Template Drawing Tile",
+                    "title": "Template Sketch Tile",
                     "content": {
                       "type": "Drawing",
                       "objects": []
@@ -2434,7 +2434,7 @@
                   },
                   {
                     "id": "TemplateDrawTileQ6_3",
-                    "title": "Template Drawing Tile",
+                    "title": "Template Sketch Tile",
                     "content": {
                       "type": "Drawing",
                       "objects": []
@@ -2485,7 +2485,7 @@
                   },
                   {
                     "id": "TemplateDrawTileQ6_4",
-                    "title": "Template Drawing Tile",
+                    "title": "Template Sketch Tile",
                     "content": {
                       "type": "Drawing",
                       "objects": []
@@ -2537,7 +2537,7 @@
                   },
                   {
                     "id": "TemplateDrawTileQ5_5",
-                    "title": "Template Drawing Tile",
+                    "title": "Template Sketch Tile",
                     "content": {
                       "type": "Drawing",
                       "objects": []
@@ -2589,7 +2589,7 @@
                   },
                   {
                     "id": "TemplateDrawTileQ6_6",
-                    "title": "Template Drawing Tile",
+                    "title": "Template Sketch Tile",
                     "content": {
                       "type": "Drawing",
                       "objects": []
@@ -2642,7 +2642,7 @@
                   },
                   {
                     "id": "TemplateDrawTileQ6_7",
-                    "title": "Template Drawing Tile",
+                    "title": "Template Sketch Tile",
                     "content": {
                       "type": "Drawing",
                       "objects": []
@@ -2692,7 +2692,7 @@
                   },
                   {
                     "id": "TemplateDrawTileQ6_8",
-                    "title": "Template Drawing Tile",
+                    "title": "Template Sketch Tile",
                     "content": {
                       "type": "Drawing",
                       "objects": []

diff --git a/curriculum/m2s/images/verticaltoolbar.png b/curriculum/m2s/images/verticaltoolbar.png
diff --git a/curriculum/m2s/investigation-1/problem-1/taska/content.json b/curriculum/m2s/investigation-1/problem-1/taska/content.json
@@ -44,7 +44,7 @@
             "<p>Example: The more [pets] we have, the more [pet food] we need.</p>",
             "<p></p>",
             "<p><strong>7. Use mathematical language or symbols to describe the relationship between those variables. </strong></p>",
-            "<p><em>Note: If you want to sketch the relationship, click on the pencil icon to create a drawing tile!</em></p>"
+            "<p><em>Note: If you want to sketch the relationship, click on the pencil icon to create a sketch tile!</em></p>"
           ]
         },
         "id": "TILECw5ZFQGqdihf"

diff --git a/curriculum/m2s/investigation-1/problem-1/taskb/content.json b/curriculum/m2s/investigation-1/problem-1/taskb/content.json
@@ -44,7 +44,7 @@
             "<p>Example: The more [pets] we have, the more [pet food] we need.</p>",
             "<p></p>",
             "<p><strong>7. Use mathematical language or symbols to describe the relationship between those variables. </strong></p>",
-            "<p><em>Note: If you want to sketch the relationship, click on the pencil icon to create a drawing tile!</em></p>"
+            "<p><em>Note: If you want to sketch the relationship, click on the pencil icon to create a sketch tile!</em></p>"
           ]
         },
         "id": "TILElMp46eIWz2Zd"

diff --git a/curriculum/m2s/investigation-1/problem-1/taskc/content.json b/curriculum/m2s/investigation-1/problem-1/taskc/content.json
@@ -44,7 +44,7 @@
             "<p>Example: The more [pets] we have, the more [pet food] we need.</p>",
             "<p></p>",
             "<p><strong>7. Use mathematical language or symbols to describe the relationship between those variables. </strong></p>",
-            "<p><em>Note: If you want to sketch the relationship, click on the pencil icon to create a drawing tile!</em></p>"
+            "<p><em>Note: If you want to sketch the relationship, click on the pencil icon to create a sketch tile!</em></p>"
           ]
         },
         "id": "TILEzu00jKV274t3"

diff --git a/curriculum/m2s/investigation-1/problem-1/taskd/content.json b/curriculum/m2s/investigation-1/problem-1/taskd/content.json
@@ -44,7 +44,7 @@
             "<p>Example: The more [pets] we have, the more [pet food] we need.</p>",
             "<p></p>",
             "<p><strong>7. Use mathematical language or symbols to describe the relationship between those variables. </strong></p>",
-            "<p><em>Note: If you want to sketch the relationship, click on the pencil icon to create a drawing tile!</em></p>"
+            "<p><em>Note: If you want to sketch the relationship, click on the pencil icon to create a sketch tile!</em></p>"
           ]
         },
         "id": "TILEb_esXF5WyPS5"

diff --git a/curriculum/m2s/investigation-3/problem-4/drawing/content.json b/curriculum/m2s/investigation-3/problem-4/drawing/content.json
@@ -9,20 +9,20 @@
           "type": "Text",
           "format": "html",
           "text": [
-            "<p><em>Create a labeled sketch of the situation using the drawing tile. </em></p><p>(   ) Sketch out the situation</p><ul><li>Use the drawing tools to design sketches. Test out the different options.</li><li>Upload images from your computer and then annotate them using the drawing tools </li></ul>"
+            "<p><em>Create a labeled sketch of the situation using the sketch tile. </em></p><p>(   ) Sketch out the situation</p><ul><li>Use the sketch tools to design sketches. Test out the different options.</li><li>Upload images from your computer and then annotate them using the sketch tools </li></ul>"
           ]
         }
       },
-      {"id": "ePTfYCm7Q-oWGR2R", "title": "Toolbar buttons for the drawing tile", "content": {"type": "Image", "url": "m2s/images/Toolbar_Drawing.png", "filename": "m2s/images/Toolbar_Drawing.png"}},
+      {"id": "ePTfYCm7Q-oWGR2R", "title": "Toolbar buttons for the sketch tile", "content": {"type": "Image", "url": "m2s/images/Toolbar_Drawing.png", "filename": "m2s/images/Toolbar_Drawing.png"}},
       {
         "id": "TZAbGjYLLuBenwJB",
         "title": "Text 9",
         "content": {
           "type": "Text",
           "format": "html",
           "text": [
-            "<p>(   ) Create chips to label your drawing using the <strong>Create Variable</strong> button. <a href='https://project-resources.concord.org/M2Studio/Curriculum/Tutorials/CreatingVariablesInDrawingTile.mp4'>Video Tutorial</a> </p><p>Your variables can include any combination of:  </p><ul><li>Short name (No spaces, case sensitive, should be short but informative)</li><li>Description (Space to take a few notes to jog your memory. Long ideas should be in the text tile instead)</li><li>Units (Do you already have an idea of what the units should be?)</li><li>Value (This is what you are temporarily setting this value to, if you have an idea. Be sure to keep good notes to explain how you chose this number!)</li></ul><p>(   ) If you have already created variables elsewhere, insert them here using the <strong>Insert Variable(s) </strong>button to either annotate your existing sketch or to help you decide what else you need to do to improve your sketch of the situation. </p><p>(   ) Use the Edit Variable button to make any necessary changes to your existing variables.</p>",
-            "<p>Here are some images you might want to use. These can be dragged into your Workspace on the right. They can be dragged into drawing tiles.</p>"
+            "<p>(   ) Create chips to label your sketch using the <strong>Create Variable</strong> button. <a href='https://project-resources.concord.org/M2Studio/Curriculum/Tutorials/CreatingVariablesInDrawingTile.mp4'>Video Tutorial</a> </p><p>Your variables can include any combination of:  </p><ul><li>Short name (No spaces, case sensitive, should be short but informative)</li><li>Description (Space to take a few notes to jog your memory. Long ideas should be in the text tile instead)</li><li>Units (Do you already have an idea of what the units should be?)</li><li>Value (This is what you are temporarily setting this value to, if you have an idea. Be sure to keep good notes to explain how you chose this number!)</li></ul><p>(   ) If you have already created variables elsewhere, insert them here using the <strong>Insert Variable(s) </strong>button to either annotate your existing sketch or to help you decide what else you need to do to improve your sketch of the situation. </p><p>(   ) Use the Edit Variable button to make any necessary changes to your existing variables.</p>",
+            "<p>Here are some images you might want to use. These can be dragged into your Workspace on the right. They can be dragged into sketch tiles.</p>"
           ]
         }
       },

diff --git a/curriculum/m2s/investigation-3/problem-5/help/content.json b/curriculum/m2s/investigation-3/problem-5/help/content.json
@@ -11,7 +11,7 @@
         "id": "TILEcA8GYs3oRw5B"
       },
       {"id": "cP2E6t6w3HOYTCUi", "title": "Toolbar buttons for the text tile", "content": {"type": "Image", "url": "m2s/images/Toolbar_Text.png", "filename": "m2s/images/Toolbar_Text.png"}},
-      {"id": "ePTfYCm7Q-oWGR2R", "title": "Toolbar buttons for the drawing tile", "content": {"type": "Image", "url": "m2s/images/Toolbar_Drawing.png", "filename": "m2s/images/Toolbar_Drawing.png"}},
+      {"id": "ePTfYCm7Q-oWGR2R", "title": "Toolbar buttons for the sketch tile", "content": {"type": "Image", "url": "m2s/images/Toolbar_Drawing.png", "filename": "m2s/images/Toolbar_Drawing.png"}},
       {"id": "r8R3q6_aIIroLzYl", "title": "Toolbar buttons for the diagram tile", "content": {"type": "Image", "url": "m2s/images/Toolbar_Diagram.png", "filename": "m2s/images/Toolbar_Diagram.png"}}
     ]
   }

diff --git a/curriculum/m2s/investigation-3/problem-6/help/content.json b/curriculum/m2s/investigation-3/problem-6/help/content.json
@@ -12,7 +12,7 @@
       },
       {"id": "njCI4Wmr6eYNc5go", "title": "CLUE Toolbar", "content": {"type": "Image", "url": "m2s/images/CLUEToolbar.png", "filename": "m2s/images/CLUEToolbar.png"}},
       {"id": "cP2E6t6w3HOYTCUi", "title": "Toolbar buttons for the text tile", "content": {"type": "Image", "url": "m2s/images/Toolbar_Text.png", "filename": "m2s/images/Toolbar_Text.png"}},
-      {"id": "ePTfYCm7Q-oWGR2R", "title": "Toolbar buttons for the drawing tile", "content": {"type": "Image", "url": "m2s/images/Toolbar_Drawing.png", "filename": "m2s/images/Toolbar_Drawing.png"}},
+      {"id": "ePTfYCm7Q-oWGR2R", "title": "Toolbar buttons for the sketch tile", "content": {"type": "Image", "url": "m2s/images/Toolbar_Drawing.png", "filename": "m2s/images/Toolbar_Drawing.png"}},
       {"id": "r8R3q6_aIIroLzYl", "title": "Toolbar buttons for the diagram tile", "content": {"type": "Image", "url": "m2s/images/Toolbar_Diagram.png", "filename": "m2s/images/Toolbar_Diagram.png"}}
     ]
   }