Commit dd06d817 by Tim Krones

Add support for exercise descriptions.

parent 9a9a3241
...@@ -4,6 +4,10 @@ ...@@ -4,6 +4,10 @@
display: inline-block; display: inline-block;
} }
.vectordraw_block .vectordraw-description {
margin-bottom: 1.5em;
}
.vectordraw_block .jxgboard { .vectordraw_block .jxgboard {
float: left; float: left;
border: 2px solid #1f628d; border: 2px solid #1f628d;
......
<div class="vectordraw_block"> <div class="vectordraw_block">
<h2>{{ self.display_name }}</h2>
{% if self.description %}
<div class="vectordraw-description">
{{ self.description|safe }}
</div>
{% endif %}
<div id="vectordraw" /> <div id="vectordraw" />
</div> </div>
...@@ -35,6 +35,15 @@ class VectorDrawXBlock(StudioEditableXBlockMixin, XBlock): ...@@ -35,6 +35,15 @@ class VectorDrawXBlock(StudioEditableXBlockMixin, XBlock):
scope=Scope.content scope=Scope.content
) )
description = String(
display_name="Description",
help="Exercise description displayed above vector drawing box",
default="",
multiline_editor="html",
resettable_editor=False,
scope=Scope.content
)
width = Integer( width = Integer(
display_name="Width", display_name="Width",
help="The width of the board in pixels", help="The width of the board in pixels",
...@@ -172,6 +181,7 @@ class VectorDrawXBlock(StudioEditableXBlockMixin, XBlock): ...@@ -172,6 +181,7 @@ class VectorDrawXBlock(StudioEditableXBlockMixin, XBlock):
editable_fields = ( editable_fields = (
'display_name', 'display_name',
'description',
'width', 'width',
'height', 'height',
'bounding_box_size', 'bounding_box_size',
...@@ -217,6 +227,7 @@ class VectorDrawXBlock(StudioEditableXBlockMixin, XBlock): ...@@ -217,6 +227,7 @@ class VectorDrawXBlock(StudioEditableXBlockMixin, XBlock):
The primary view of the VectorDrawXBlock, shown to students The primary view of the VectorDrawXBlock, shown to students
when viewing courses. when viewing courses.
""" """
context['self'] = self
fragment = Fragment() fragment = Fragment()
fragment.add_content(loader.render_template('static/html/vectordraw.html', context)) fragment.add_content(loader.render_template('static/html/vectordraw.html', context))
fragment.add_css(self.resource_string('static/css/vectordraw.css')) fragment.add_css(self.resource_string('static/css/vectordraw.css'))
......
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