Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
9aa024b5
Commit
9aa024b5
authored
Sep 05, 2013
by
chrisndodge
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #845 from edx/bugfix/ichuang/fix-capa-optioninput-for-inline
Fix capa optioninput template to honor inline flag
parents
a78c913d
69f72989
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
common/lib/capa/capa/inputtypes.py
+1
-1
common/lib/capa/capa/templates/optioninput.html
+3
-1
common/lib/capa/capa/tests/test_inputtypes.py
+1
-1
No files found.
common/lib/capa/capa/inputtypes.py
View file @
9aa024b5
...
@@ -325,7 +325,7 @@ class OptionInput(InputTypeBase):
...
@@ -325,7 +325,7 @@ class OptionInput(InputTypeBase):
Convert options to a convenient format.
Convert options to a convenient format.
"""
"""
return
[
Attribute
(
'options'
,
transform
=
cls
.
parse_options
),
return
[
Attribute
(
'options'
,
transform
=
cls
.
parse_options
),
Attribute
(
'inline'
,
''
)]
Attribute
(
'inline'
,
False
)]
registry
.
register
(
OptionInput
)
registry
.
register
(
OptionInput
)
...
...
common/lib/capa/capa/templates/optioninput.html
View file @
9aa024b5
<form
class=
"inputtype option-input"
>
<
%
doinline =
"inline"
if
inline
else
""
%
>
<form
class=
"inputtype option-input ${doinline}"
>
<select
name=
"input_${id}"
id=
"input_${id}"
aria-describedby=
"answer_${id}"
>
<select
name=
"input_${id}"
id=
"input_${id}"
aria-describedby=
"answer_${id}"
>
<option
value=
"option_${id}_dummy_default"
>
</option>
<option
value=
"option_${id}_dummy_default"
>
</option>
% for option_id, option_description in options:
% for option_id, option_description in options:
...
...
common/lib/capa/capa/tests/test_inputtypes.py
View file @
9aa024b5
...
@@ -55,7 +55,7 @@ class OptionInputTest(unittest.TestCase):
...
@@ -55,7 +55,7 @@ class OptionInputTest(unittest.TestCase):
'options'
:
[(
'Up'
,
'Up'
),
(
'Down'
,
'Down'
)],
'options'
:
[(
'Up'
,
'Up'
),
(
'Down'
,
'Down'
)],
'status'
:
'answered'
,
'status'
:
'answered'
,
'msg'
:
''
,
'msg'
:
''
,
'inline'
:
''
,
'inline'
:
False
,
'id'
:
'sky_input'
}
'id'
:
'sky_input'
}
self
.
assertEqual
(
context
,
expected
)
self
.
assertEqual
(
context
,
expected
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment