Commit 8af9fa2b by Tim Krones

Minor clean up and i18n.

parent 4ee4532b
...@@ -411,8 +411,8 @@ class PlotOverlayBlock(StudioEditableXBlockMixin, XBlockWithPreviewMixin, XBlock ...@@ -411,8 +411,8 @@ class PlotOverlayBlock(StudioEditableXBlockMixin, XBlockWithPreviewMixin, XBlock
help=_( help=_(
'Claim data to include in this overlay. ' 'Claim data to include in this overlay. '
'Each line defines a tuple of the form "q1, q2", ' 'Each line defines a tuple of the form "q1, q2", '
'where "q1" is the value associated with the first 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 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.' 'Note that data will be associated with claims in the order that they are defined in the parent plot.'
), ),
default="", default="",
......
...@@ -241,7 +241,6 @@ function PlotBlock(runtime, element) { ...@@ -241,7 +241,6 @@ function PlotBlock(runtime, element) {
}); });
// Hide overlay info initially // Hide overlay info initially
toggleOverlayInfo(klass, 'hide'); toggleOverlayInfo(klass, 'hide');
}); });
......
{% load i18n %}
<div class="sb-plot"> <div class="sb-plot">
<div class="quadrants"> <div class="quadrants">
<label> <label>
Quadrant labels {% trans "Quadrant labels" %}
<input type="button" <input type="button"
class="plot-quadrants" class="plot-quadrants"
data-q1-label="{{ self.q1_label }}" data-q1-label="{{ self.q1_label }}"
...@@ -14,7 +15,7 @@ ...@@ -14,7 +15,7 @@
</div> </div>
<div class="overlays"> <div class="overlays">
<h3>Compare your plot to others!</h3> <h3>{% trans "Compare your plot to others!" %}</h3>
<input type="button" <input type="button"
class="plot-default" class="plot-default"
...@@ -44,19 +45,19 @@ ...@@ -44,19 +45,19 @@
{% endfor %} {% endfor %}
<div class="plot-info"> <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 %} {% for overlay in self.overlay_data %}
<div class="plot-overlay plot-overlay-{{ overlay.position }}"> <div class="plot-overlay plot-overlay-{{ overlay.position }}">
{% if overlay.description or overlay.citation %} {% if overlay.description or overlay.citation %}
<p class="overlay-plot-label" style="color: {{ overlay.point_color }};">{{ overlay.plot_label }}</p> <p class="overlay-plot-label" style="color: {{ overlay.point_color }};">{{ overlay.plot_label }}</p>
{% if overlay.description %} {% if overlay.description %}
<p class="overlay-description"> <p class="overlay-description">
<strong>Description:</strong> {{ overlay.description }} <strong>{% trans "Description:" %}</strong> {{ overlay.description }}
</p> </p>
{% endif %} {% endif %}
{% if overlay.citation %} {% if overlay.citation %}
<p class="overlay-citation"> <p class="overlay-citation">
<strong>Source:</strong> {{ overlay.citation }} <strong>{% trans "Source:" %}</strong> {{ overlay.citation }}
</p> </p>
{% endif %} {% endif %}
{% endif %} {% endif %}
......
...@@ -877,8 +877,8 @@ class StepBuilderTest(MentoringAssessmentBaseTest): ...@@ -877,8 +877,8 @@ class StepBuilderTest(MentoringAssessmentBaseTest):
'point_color': PointColors.ORANGE, 'point_color': PointColors.ORANGE,
'titles': ['2 + 2 = 5: 1, 5', 'The answer to everything is 42: 5, 1'], 'titles': ['2 + 2 = 5: 1, 5', 'The answer to everything is 42: 5, 1'],
'positions': [ '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) ('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 = { teacher_overlay = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment