Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #518 from MITx/feature/arjun/fix_choicegroup

Browse Source 
Get rid of inline flag for choicegroup, radiogroup, and checkboxgroup.
This commit is contained in:
kimth
2012-08-23 04:56:59 -07:00
parent 27347fbc87 0757712e4b
commit b0e418a390
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/lib/capa/capa/inputtypes.py
View File

@@ -185,7 +185,7 @@ def choicegroup(element, value, status, render_template, msg=''):
if choice.text is not None:
ctext += choice.text # TODO: fix order?
choices.append((choice.get("name"), ctext))
context = {'id': eid, 'value': value, 'state': status, 'input_type': type, 'choices': choices, 'inline': True, 'name_array_suffix': ''}
context = {'id': eid, 'value': value, 'state': status, 'input_type': type, 'choices': choices, 'name_array_suffix': ''}
html = render_template("choicegroup.html", context)
return etree.XML(html)
@@ -226,7 +226,7 @@ def radiogroup(element, value, status, render_template, msg=''):
choices = extract_choices(element)
context = {'id': eid, 'value': value, 'state': status, 'input_type': 'radio', 'choices': choices, 'inline': False, 'name_array_suffix': '[]'}
context = {'id': eid, 'value': value, 'state': status, 'input_type': 'radio', 'choices': choices, 'name_array_suffix': '[]'}
html = render_template("choicegroup.html", context)
return etree.XML(html)
@@ -244,7 +244,7 @@ def checkboxgroup(element, value, status, render_template, msg=''):
choices = extract_choices(element)
context = {'id': eid, 'value': value, 'state': status, 'input_type': 'checkbox', 'choices': choices, 'inline': False, 'name_array_suffix': '[]'}
context = {'id': eid, 'value': value, 'state': status, 'input_type': 'checkbox', 'choices': choices, 'name_array_suffix': '[]'}
html = render_template("choicegroup.html", context)
return etree.XML(html)

3
common/lib/capa/capa/templates/choicegroup.html
View File

@@ -6,9 +6,6 @@
checked="true"
% endif
/> ${choice_description} </label>
% if not inline:
<br/>
% endif
% endfor
<span id="answer_${id}"></span>