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
11d5eea2
Commit
11d5eea2
authored
Dec 19, 2012
by
Diana Huang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add in CSS updates and fixes to the template so that it will work.
parent
8a0dae01
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
78 additions
and
11 deletions
+78
-11
common/lib/capa/capa/inputtypes.py
+10
-8
common/lib/capa/capa/templates/rubricinput.html
+23
-3
common/lib/xmodule/xmodule/css/capa/display.scss
+45
-0
No files found.
common/lib/capa/capa/inputtypes.py
View file @
11d5eea2
...
@@ -803,17 +803,19 @@ class RubricInput(InputTypeBase):
...
@@ -803,17 +803,19 @@ class RubricInput(InputTypeBase):
Convert options to a convenient format.
Convert options to a convenient format.
"""
"""
return
[
return
[
]
Attribute
(
'height'
,
None
),
Attribute
(
'width'
,
None
)]
def
_extra_context
(
self
):
def
_extra_context
(
self
):
"""
"""
Add in the various bits and pieces
of the
Add in the various bits and pieces
that we need
"""
"""
return
{}
return
{
'categories'
:
self
.
categories
,
'view_only'
:
False
}
def
setup
(
self
):
def
setup
(
self
):
# set the categories
extract_categories
(
self
.
xml
)
self
.
categories
=
self
.
extract_categories
(
self
.
xml
)
@staticmethod
@staticmethod
def
extract_categories
(
element
):
def
extract_categories
(
element
):
...
@@ -833,8 +835,8 @@ class RubricInput(InputTypeBase):
...
@@ -833,8 +835,8 @@ class RubricInput(InputTypeBase):
if
category
.
tag
!=
'category'
:
if
category
.
tag
!=
'category'
:
raise
Exception
(
"[capa.inputtypes.extract_categories] Expected a <category> tag: got {0} instead"
.
format
(
category
.
tag
))
raise
Exception
(
"[capa.inputtypes.extract_categories] Expected a <category> tag: got {0} instead"
.
format
(
category
.
tag
))
else
:
else
:
categories
.
append
(
extract_category
(
category
))
categories
.
append
(
RubricInput
.
extract_category
(
category
))
self
.
categories
=
categories
return
categories
@staticmethod
@staticmethod
...
@@ -883,7 +885,7 @@ class RubricInput(InputTypeBase):
...
@@ -883,7 +885,7 @@ class RubricInput(InputTypeBase):
# sort and check for duplicates
# sort and check for duplicates
options
=
sorted
(
options
,
key
=
lambda
option
:
option
[
'points'
])
options
=
sorted
(
options
,
key
=
lambda
option
:
option
[
'points'
])
validate_options
(
options
)
RubricInput
.
validate_options
(
options
)
return
{
'description'
:
description
,
'options'
:
options
}
return
{
'description'
:
description
,
'options'
:
options
}
...
...
common/lib/capa/capa/templates/rubricinput.html
View file @
11d5eea2
<
section
id=
"rubric_${id}"
class=
"rubric-section
"
>
<
form
class=
"rubric-template"
id=
"inputtype_${id}
"
>
<table
class=
"rubric"
>
<table
class=
"rubric"
>
% for i in range(len(categories)):
<
%
category =
categories[i]
%
>
<tr>
<th>
${category['description']}
</th>
% for j in range(len(category['options'])):
<
%
option =
category['options'][j]
%
>
<td>
<!--TODO: figure out the state variables/selected info -->
% if view_only:
<div
class=
"view-only"
>
${option['text']}
<div
class=
"grade"
>
[${option['points']} points]
</div>
</div>
% else:
<input
type=
"radio"
class=
"score-selection"
name=
"score-selection-${i}"
id=
"score-${i}-${j}"
value=
"${option['points']}"
/>
<label
for=
"score-${i}-${j}"
>
${option['text']}
</label>
% endif
</td>
% endfor
</tr>
% endfor
</table>
</table>
</
section
>
</
form
>
common/lib/xmodule/xmodule/css/capa/display.scss
View file @
11d5eea2
...
@@ -20,6 +20,51 @@ h2 {
...
@@ -20,6 +20,51 @@ h2 {
color
:
darken
(
$error-red
,
10%
);
color
:
darken
(
$error-red
,
10%
);
}
}
.rubric
{
tr
{
margin
:
10px
0px
;
height
:
100%
;
}
td
{
padding
:
20px
0px
;
margin
:
10px
0px
;
height
:
100%
;
}
th
{
padding
:
5px
;
margin
:
5px
;
}
label
,
.view-only
{
margin
:
10px
;
position
:
relative
;
padding
:
15px
;
width
:
175px
;
height
:
100%
;
display
:
inline-block
;
min-height
:
50px
;
min-width
:
50px
;
background-color
:
#CCC
;
text-size
:
1
.5em
;
}
.grade
{
position
:
absolute
;
bottom
:
0px
;
right
:
0px
;
margin
:
10px
;
}
.selected-grade
{
background
:
#666
;
color
:
white
;
}
input
[
type
=
radio
]
:checked
+
label
{
background
:
#666
;
color
:
white
;
}
input
[
class
=
'score-selection'
]
{
display
:
none
;
}
}
section
.problem
{
section
.problem
{
@media
print
{
@media
print
{
display
:
block
;
display
:
block
;
...
...
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