Add display_names, update help, remove unnecessary things from templates.

common/lib/xmodule/xmodule/capa_module.py

@@ -62,23 +62,28 @@ class ComplexEncoder(json.JSONEncoder):
 
 class CapaFields(object):
     attempts = StringyInteger(help="Number of attempts taken by the student on this problem", default=0, scope=Scope.user_state)
-    max_attempts = StringyInteger(help="Maximum number of attempts that a student is allowed", scope=Scope.settings)
+    max_attempts = StringyInteger(display_name="Maximum Attempts",
+        help="When set, this specifies the number of times the student can try to answer this problem.", scope=Scope.settings)
     due = Date(help="Date that this problem is due by", scope=Scope.settings)
     graceperiod = Timedelta(help="Amount of time after the due date that submissions will be accepted", scope=Scope.settings)
-    showanswer = String(help="When to show the problem answer to the student", scope=Scope.settings, default="closed",
-                        values=["answered", "always", "attempted", "closed", "never"])
+    showanswer = String(display_name="Show Answer",
+        help="Specifies when to show the answer to this problem. A default value can be set course-wide in Advanced Settings.",
+        scope=Scope.settings, default="closed", values=["answered", "always", "attempted", "closed", "never"])
     force_save_button = Boolean(help="Whether to force the save button to appear on the page", scope=Scope.settings, default=False)
-    rerandomize = Randomization(help="When to rerandomize the problem", default="always", scope=Scope.settings,
-                                values=["always", "onreset", "never", "per_student"])
+    rerandomize = Randomization(display_name="Randomization", help="Specifies whether variable inputs for this problem are randomized each time a student loads the problem. This only applies to problems that have randomly generated numeric variables. A default value can be set course-wide in Advanced Settings.",
+        default="always", scope=Scope.settings, values=["always", "onreset", "never", "per_student"])
     data = String(help="XML data for the problem", scope=Scope.content)
     correct_map = Object(help="Dictionary with the correctness of current student answers", scope=Scope.user_state, default={})
     input_state = Object(help="Dictionary for maintaining the state of inputtypes", scope=Scope.user_state)
     student_answers = Object(help="Dictionary with the current student responses", scope=Scope.user_state)
     done = Boolean(help="Whether the student has answered the problem", scope=Scope.user_state)
     seed = StringyInteger(help="Random seed for this student", scope=Scope.user_state)
-    weight = StringyFloat(help="How much to weight this problem by", scope=Scope.settings)
+    weight = StringyFloat(display_name="Problem Weight",
+        help="Specifies the number of points the problem is worth. By default, each response field in the problem is worth one point.",
+        scope=Scope.settings)
     markdown = String(help="Markdown source of this module", scope=Scope.settings)
-    source_code = String(help="Source code for LaTeX and Word problems. This feature is not well-supported.", scope=Scope.settings)
+    source_code = String(help="Source code for LaTeX and Word problems. This feature is not well-supported.",
+        scope=Scope.settings)
 
 
 class CapaModule(CapaFields, XModule):

common/lib/xmodule/xmodule/discussion_module.py

@@ -8,8 +8,12 @@ from xblock.core import String, Scope
 
 class DiscussionFields(object):
     discussion_id = String(scope=Scope.settings)
-    discussion_category = String(scope=Scope.settings)
-    discussion_target = String(scope=Scope.settings)
+    discussion_category = String(display_name="Category",
+        help="Specifies a category name for this discussion. This name appears in the left pane of the discussion forum for your course.",
+        scope=Scope.settings)
+    discussion_target = String(display_name="Subcategory",
+        help="Specifies a subcategory name for this discussion. This name appears in the left pane of the discussion forum for your course.",
+        scope=Scope.settings)
     sort_key = String(scope=Scope.settings)
 
 

common/lib/xmodule/xmodule/templates/html/empty.yaml

 ---
 metadata:
     display_name: Blank HTML Page
-    empty: True
 
 data: |
 

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

@@ -4,8 +4,6 @@ metadata:
     display_name: Circuit Schematic Builder
     rerandomize: never
     showanswer: always
-    weight: ""
-    attempts: ""
 data: |
   <problem >
     Please make a voltage divider that splits the provided voltage evenly.

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

@@ -3,8 +3,6 @@ metadata:
     display_name: Custom Python-Evaluated Input
     rerandomize: never
     showanswer: always
-    weight: ""
-    attempts: ""
 data: |
   <problem>
   <p>

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

@@ -4,9 +4,6 @@ metadata:
     rerandomize: never
     showanswer: always
     markdown: ""
-    weight: ""
-    empty: True
-    attempts: ""
 data: |
   <problem>
   </problem>

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

@@ -3,9 +3,6 @@ metadata:
     display_name: Blank Advanced Problem
     rerandomize: never
     showanswer: always
-    weight: ""
-    attempts: ""
-    empty: True
 data: |
   <problem>
   </problem>

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

@@ -3,8 +3,6 @@ metadata:
     display_name: Math Expression Input
     rerandomize: never
     showanswer: always
-    weight: ""
-    attempts: ""
 data: |
   <problem>
   <p>

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

@@ -3,8 +3,6 @@ metadata:
     display_name: Image Mapped Input
     rerandomize: never
     showanswer: always
-    weight: ""
-    attempts: ""
 data: |
   <problem>
   <p>

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

@@ -3,8 +3,6 @@ metadata:
     display_name: Numerical Input
     rerandomize: never
     showanswer: always
-    weight: ""
-    attempts: ""
     markdown: 
        "A numerical input problem accepts a line of text input from the
        student, and evaluates the input for correctness based on its

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

@@ -3,8 +3,6 @@ metadata:
     display_name: Dropdown
     rerandomize: never
     showanswer: always
-    weight: ""
-    attempts: ""
     markdown: 
         "Dropdown problems give a limited set of options for students to respond with, and present those options
         in a format that encourages them to search for a specific answer rather than being immediately presented 

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

@@ -3,8 +3,6 @@ metadata:
     display_name: Text Input
     rerandomize: never
     showanswer: always
-    weight: ""
-    attempts: ""
     # Note, the extra newlines are needed to make the yaml parser add blank lines instead of folding
     markdown: 
         "A text input problem accepts a line of text from the 

common/lib/xmodule/xmodule/x_module.py

@@ -80,7 +80,8 @@ class HTMLSnippet(object):
 
 class XModuleFields(object):
     display_name = String(
-        help="Display name for this module",
+        display_name="Display Name",
+        help="Specifies the name for this component. The name appears as a tooltip in the course ribbon at the top of the page.",
         scope=Scope.settings,
         default=None
     )