Modified ChoiceGroup to display correct/incorrect indicators

(check or x) next to the option the user selected (check boxes or radio
buttons).

common/lib/capa/capa/templates/choicegroup.html

 <form class="choicegroup capa_inputtype" id="inputtype_${id}">
-  <div class="indicator_container">
+
+  <fieldset>
+    % for choice_id, choice_description in choices:
+    <label for="input_${id}_${choice_id}">          
+
+        % if choice_id in value:
+        <span class="indicator_container">
             % if status == 'unsubmitted':
             <span class="unanswered" style="display:inline-block;" id="status_${id}"></span>
             % elif status == 'correct': 
@@ -9,15 +15,21 @@
             % elif status == 'incomplete':
             <span class="incorrect" id="status_${id}"></span>
             % endif
-  </div>
+        </span>
+        % else:
+        <span class="indicator_container">&#160;</span>
+        % endif
         
-  <fieldset>
-    % for choice_id, choice_description in choices:
-    <label for="input_${id}_${choice_id}">  <input type="${input_type}" name="input_${id}${name_array_suffix}" id="input_${id}_${choice_id}" value="${choice_id}"
+        <input type="${input_type}" name="input_${id}${name_array_suffix}" id="input_${id}_${choice_id}" value="${choice_id}"
     % if choice_id in value:
     checked="true"
     % endif
-    /> ${choice_description} </label>
+    />
+    
+    ${choice_description}
+
+    </label>
+
     % endfor
     <span id="answer_${id}"></span>
   </fieldset>

common/lib/xmodule/xmodule/css/capa/display.scss

@@ -227,7 +227,7 @@ section.problem {
         background: url('../images/correct-icon.png') center center no-repeat;
         height: 20px;
         position: relative;
-        top: 6px;
+        top: 3px;
         width: 25px;
       }
 
@@ -237,7 +237,7 @@ section.problem {
         height: 20px;
         width: 20px;
         position: relative;
-        top: 6px;
+        top: 3px;
       }
     }