Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
problem-builder
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
OpenEdx
problem-builder
Commits
8af9fa2b
Commit
8af9fa2b
authored
Oct 23, 2015
by
Tim Krones
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor clean up and i18n.
parent
4ee4532b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
9 deletions
+9
-9
problem_builder/plot.py
+2
-2
problem_builder/public/js/plot.js
+0
-1
problem_builder/templates/html/plot.html
+6
-5
problem_builder/tests/integration/test_step_builder.py
+1
-1
No files found.
problem_builder/plot.py
View file @
8af9fa2b
...
...
@@ -411,8 +411,8 @@ class PlotOverlayBlock(StudioEditableXBlockMixin, XBlockWithPreviewMixin, XBlock
help
=
_
(
'Claim data to include in this overlay. '
'Each line defines a tuple of the form "q1, q2", '
'where "q1" is the value associated with the first scale question, '
'and "q2" is the value associated with the second scale question. '
'where "q1" is the value associated with the first scale
or rating
question, '
'and "q2" is the value associated with the second scale
or rating
question. '
'Note that data will be associated with claims in the order that they are defined in the parent plot.'
),
default
=
""
,
...
...
problem_builder/public/js/plot.js
View file @
8af9fa2b
...
...
@@ -241,7 +241,6 @@ function PlotBlock(runtime, element) {
});
// Hide overlay info initially
toggleOverlayInfo
(
klass
,
'hide'
);
});
...
...
problem_builder/templates/html/plot.html
View file @
8af9fa2b
{% load i18n %}
<div
class=
"sb-plot"
>
<div
class=
"quadrants"
>
<label>
Quadrant labels
{% trans "Quadrant labels" %}
<input
type=
"button"
class=
"plot-quadrants"
data-q1-label=
"{{ self.q1_label }}"
...
...
@@ -14,7 +15,7 @@
</div>
<div
class=
"overlays"
>
<h3>
Compare your plot to others!
</h3>
<h3>
{% trans "Compare your plot to others!" %}
</h3>
<input
type=
"button"
class=
"plot-default"
...
...
@@ -44,19 +45,19 @@
{% endfor %}
<div
class=
"plot-info"
>
<p
class=
"plot-info-header"
>
Plot info
</p>
<p
class=
"plot-info-header"
>
{% trans "Plot info" %}
</p>
{% for overlay in self.overlay_data %}
<div
class=
"plot-overlay plot-overlay-{{ overlay.position }}"
>
{% if overlay.description or overlay.citation %}
<p
class=
"overlay-plot-label"
style=
"color: {{ overlay.point_color }};"
>
{{ overlay.plot_label }}
</p>
{% if overlay.description %}
<p
class=
"overlay-description"
>
<strong>
Description:
</strong>
{{ overlay.description }}
<strong>
{% trans "Description:" %}
</strong>
{{ overlay.description }}
</p>
{% endif %}
{% if overlay.citation %}
<p
class=
"overlay-citation"
>
<strong>
Source:
</strong>
{{ overlay.citation }}
<strong>
{% trans "Source:" %}
</strong>
{{ overlay.citation }}
</p>
{% endif %}
{% endif %}
...
...
problem_builder/tests/integration/test_step_builder.py
View file @
8af9fa2b
...
...
@@ -877,8 +877,8 @@ class StepBuilderTest(MentoringAssessmentBaseTest):
'point_color'
:
PointColors
.
ORANGE
,
'titles'
:
[
'2 + 2 = 5: 1, 5'
,
'The answer to everything is 42: 5, 1'
],
'positions'
:
[
(
'20'
,
'396'
),
# Values computed according to xScale and yScale (cf. plot.js)
(
'4'
,
'380'
),
# Values computed according to xScale and yScale (cf. plot.js)
(
'20'
,
'396'
),
# Values computed according to xScale and yScale (cf. plot.js)
],
}
teacher_overlay
=
{
...
...
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