added several problem types

common/lib/xmodule/xmodule/capa_module.py

@@ -638,14 +638,13 @@ class CapaDescriptor(RawDescriptor):
 
     stores_state = True
     has_score = True
+    template_dir_name = 'problem'
 
     # Capa modules have some additional metadata:
     # TODO (vshnayder): do problems have any other metadata?  Do they
     # actually use type and points?
     metadata_attributes = RawDescriptor.metadata_attributes + ('type', 'points')
 
-    template_dir_name = 'problem'
-
     # VS[compat]
     # TODO (cpennington): Delete this method once all fall 2012 course are being
     # edited in the cms

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

@@ -12,9 +12,7 @@ data: |
      python script embedded within the problem.
    </p>
    
-   <script type="loncapa/python">
-     
-     def test_add(expect,ans):
+   <script type="loncapa/python">def test_add(expect,ans):
         (a1,a2) = map(float,ans)
         return (a1+a2)==10
      

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

@@ -21,9 +21,7 @@ data: |
      on the problem author to specify the allowed variables in the expression, and the
      numerical ranges over which the variables must be sampled to test for correctness.</p>
    
-   <script type="loncapa/python">
-     I = "m*c^2"
-   </script>
+   <script type="loncapa/python">I = "m*c^2"</script>
    
    <text>
      <br/>