update default templates for unsupported responsetypes

common/lib/xmodule/xmodule/templates/problem/circuitschematic.yaml

@@ -22,7 +22,7 @@ data: |
         <p>You can use the following example problems as models.</p>
 
         <schematicresponse>
-            <label>Make a voltage divider that splits the provided voltage evenly.</label>
+            <p>Make a voltage divider that splits the provided voltage evenly.</p>
             <center>
                 <schematic height="500" width="600" parts="g,r" analyses="dc"
                 initial_value="[[&quot;v&quot;,[168,144,0],{&quot;value&quot;:&quot;dc(1)&quot;,&quot;_json_&quot;:0},[&quot;1&quot;,&quot;0&quot;]],[&quot;r&quot;,[296,120,0],{&quot;r&quot;:&quot;1&quot;,&quot;_json_&quot;:1},[&quot;1&quot;,&quot;output&quot;]],[&quot;L&quot;,[296,168,3],{&quot;label&quot;:&quot;output&quot;,&quot;_json_&quot;:2},[&quot;output&quot;]],[&quot;w&quot;,[296,216,168,216]],[&quot;w&quot;,[168,216,168,192]],[&quot;w&quot;,[168,144,168,120]],[&quot;w&quot;,[168,120,296,120]],[&quot;g&quot;,[168,216,0],{&quot;_json_&quot;:7},[&quot;0&quot;]],[&quot;view&quot;,-67.49999999999994,-78.49999999999994,1.6000000000000003,&quot;50&quot;,&quot;10&quot;,&quot;1G&quot;,null,&quot;100&quot;,&quot;1&quot;,&quot;1000&quot;]]"/>
@@ -53,7 +53,7 @@ data: |
         </schematicresponse>
 
         <schematicresponse>
-            <label>Make a high-pass filter.</label>
+            <p>Make a high-pass filter.</p>
             <center>
                 <schematic height="500" width="600" parts="g,r,s,c" analyses="ac"
                 submit_analyses="{&quot;ac&quot;:[[&quot;NodeA&quot;,1,9]]}"

common/lib/xmodule/xmodule/templates/problem/customgrader.yaml

@@ -40,7 +40,7 @@ data: |
           return test_add(10, ans)
 
       </script>
-            <label>Enter two integers that sum to 10.</label>
+            <p>Enter two integers that sum to 10.</p>
             <textline size="40" correct_answer="3"/><br/>
             <textline size="40" correct_answer="7"/>
             <solution>
@@ -63,7 +63,7 @@ data: |
               return False
 
       </script>
-            <label>Enter two integers that sum to 20.</label>
+            <p>Enter two integers that sum to 20.</p>
             <textline size="40" correct_answer="11"/><br/>
             <textline size="40" correct_answer="9"/>
             <solution>

common/lib/xmodule/xmodule/templates/problem/imageresponse.yaml

@@ -18,7 +18,7 @@ data:   |
                 and other values that apply.</p>
             <p>You can use the following example problem as a model.</p>
             <imageresponse>
-                <label>What country is home to the Great Pyramid of Giza as well as the cities of Cairo and Memphis? Click the country on the map below.</label>
+                <p>What country is home to the Great Pyramid of Giza as well as the cities of Cairo and Memphis? Click the country on the map below.</p>
                 <imageinput src="https://studio.edx.org/c4x/edX/DemoX/asset/Africa.png" width="600" height="638" rectangle="(338,98)-(412,168)" alt="Map of Africa"/>
                 <solution>
                     <div class="detailed-solution">

common/lib/xmodule/xmodule/templates/problem/jsinput_response.yaml

@@ -58,7 +58,7 @@ data: |
         '''
       ]]>
       </script>
-            <label>In the following image, click the objects until the cone is yellow and the cube is blue.</label>
+            <p>In the following image, click the objects until the cone is yellow and the cube is blue.</p>
             <jsinput gradefn="WebGLDemo.getGrade"
               get_statefn="WebGLDemo.getState"
               set_statefn="WebGLDemo.setState"

common/lib/xmodule/xmodule/templates/problem/latex_problem.yaml

@@ -138,7 +138,7 @@ data: |
 
       <p><strong>Example Math Expression Problem</strong></p>
       <symbolicresponse expect="m*c^2">
-        <label>What is Einstein's equation for the energy equivalent of a mass [mathjaxinline]m[/mathjaxinline]?</label>
+        <p>What is Einstein's equation for the energy equivalent of a mass [mathjaxinline]m[/mathjaxinline]?</p>
         <textline size="90" correct_answer="m*c^2" math="1"/>
       </symbolicresponse>
       <br/>
@@ -146,11 +146,8 @@ data: |
       <p><strong>Example Numerical Problem</strong></p>
       <numericalresponse inline="1" answer="0.52">
         <label>Estimate the energy savings (in J/y) if all the people ([mathjaxinline]3\times 10^8[/mathjaxinline]) in the U.&#xA0;S. switched from U.&#xA0;S. code to low-flow shower heads.</label>
-        <p style="display:inline">Energy saved = </p>
-        <textline inline="1">
+        <formulaequationinput trailing_text="EJ/year" />
         <responseparam type="tolerance" default="0.02"/>
-        </textline>
-        <p style="display:inline">&#xA0;EJ/year</p>
       </numericalresponse>
       <br/>
 
@@ -176,7 +173,7 @@ data: |
     def test_add_to_ten(expect, ans):
         return test_add(10, ans)
       </script>
-        <label>Enter two integers that sum to 10.</label>
+        <p>Enter two integers that sum to 10.</p>
         <textline size="40" correct_answer="3"/><br/>
         <textline size="40" correct_answer="7"/>
         <solution>
@@ -197,7 +194,7 @@ data: |
         except ValueError:
             return False
       </script>
-        <label>Enter two integers that sum to 20.</label>
+        <p>Enter two integers that sum to 20.</p>
         <textline size="40" correct_answer="11"/><br/>
         <textline size="40" correct_answer="9"/>
         <solution>
@@ -213,10 +210,10 @@ data: |
 
       <p><strong>Example Image Mapped Input Problem</strong></p>
       <imageresponse>
-        <label>
+        <p>
           What country is home to the Great Pyramid of Giza as well as the cities
           of Cairo and Memphis? Click the country on the map below.
-        </label>
+        </p>
         <imageinput src="https://studio.edx.org/c4x/edX/DemoX/asset/Africa.png"
         width="600" height="638" rectangle="(338,98)-(412,168)" alt="Map of
         Africa"/>

common/lib/xmodule/xmodule/templates/problem/problem_with_hint.yaml

@@ -35,7 +35,7 @@ data: |
         hint = "<font color='blue'>Hint: {0}</font>".format(hint)
         new_cmap.set_hint_and_mode(aid,hint,'always')
     </script>
-                <label>What is the best programming language that exists today? You may enter your answer in upper or lower case, with or without quotes.</label>
+                <p>What is the best programming language that exists today? You may enter your answer in upper or lower case, with or without quotes.</p>
                 <textline correct_answer="python"/>
                 <hintgroup hintfn="hint_fn"/>
             </customresponse>

common/lib/xmodule/xmodule/templates/problem/problem_with_hint_in_latex.yaml

@@ -80,7 +80,7 @@ data: |
         hint = "<font color='blue'>Hint: {0}</font>".format(hint)
         new_cmap.set_hint_and_mode(aid,hint,'always')
     </script>
-            <label>What is the best programming language that exists today? You may enter your answer in upper or lower case, with or without quotes.</label>
+            <p>What is the best programming language that exists today? You may enter your answer in upper or lower case, with or without quotes.</p>
             <textline correct_answer="python"/>
             <hintgroup hintfn="hint_fn"/>
             </customresponse>