Commit 2f9185fd by Andrew Gaylard

Add a checkbox to the zone tab to control visibility of zone borders. Render…

Add a checkbox to the zone tab to control visibility of zone borders.  Render the borders accordingly.
parent 7f341c34
...@@ -147,6 +147,7 @@ class DragAndDropBlock(XBlock): ...@@ -147,6 +147,7 @@ class DragAndDropBlock(XBlock):
return { return {
"zones": self.data.get('zones', []), "zones": self.data.get('zones', []),
"display_zone_labels": self.data.get('displayLabels', False), "display_zone_labels": self.data.get('displayLabels', False),
"display_zone_borders": self.data.get('displayBorders', False),
"items": items_without_answers(), "items": items_without_answers(),
"title": self.display_name, "title": self.display_name,
"show_title": self.show_title, "show_title": self.show_title,
......
...@@ -209,6 +209,7 @@ ...@@ -209,6 +209,7 @@
.xblock--drag-and-drop .zone { .xblock--drag-and-drop .zone {
position: absolute; position: absolute;
border: 1px hidden #f00;
display: -webkit-box; display: -webkit-box;
display: -moz-box; display: -moz-box;
......
...@@ -366,6 +366,7 @@ function DragAndDropBlock(runtime, element, configuration) { ...@@ -366,6 +366,7 @@ function DragAndDropBlock(runtime, element, configuration) {
target_img_src: configuration.target_img_expanded_url, target_img_src: configuration.target_img_expanded_url,
target_img_description: configuration.target_img_description, target_img_description: configuration.target_img_description,
display_zone_labels: configuration.display_zone_labels, display_zone_labels: configuration.display_zone_labels,
display_zone_borders: configuration.display_zone_borders,
zones: configuration.zones, zones: configuration.zones,
items: items, items: items,
// state - parts that can change: // state - parts that can change:
......
...@@ -80,6 +80,10 @@ function DragAndDropEditBlock(runtime, element, params) { ...@@ -80,6 +80,10 @@ function DragAndDropEditBlock(runtime, element, params) {
$('.display-labels-form input', element).prop('checked', true); $('.display-labels-form input', element).prop('checked', true);
} }
if (_fn.data.displayBorders) {
$('.display-borders-form input', element).prop('checked', true);
}
$fbkTab.addClass('hidden'); $fbkTab.addClass('hidden');
$zoneTab.removeClass('hidden'); $zoneTab.removeClass('hidden');
...@@ -149,6 +153,9 @@ function DragAndDropEditBlock(runtime, element, params) { ...@@ -149,6 +153,9 @@ function DragAndDropEditBlock(runtime, element, params) {
}) })
.on('click', '.display-labels-form input', function(e) { .on('click', '.display-labels-form input', function(e) {
_fn.data.displayLabels = $('.display-labels-form input', element).is(':checked'); _fn.data.displayLabels = $('.display-labels-form input', element).is(':checked');
})
.on('click', '.display-borders-form input', function(e) {
_fn.data.displayBorders = $('.display-borders-form input', element).is(':checked');
}); });
$itemTab $itemTab
......
...@@ -116,6 +116,7 @@ ...@@ -116,6 +116,7 @@
style: { style: {
top: zone.y_percent + '%', left: zone.x_percent + "%", top: zone.y_percent + '%', left: zone.x_percent + "%",
width: zone.width_percent + '%', height: zone.height_percent + "%", width: zone.width_percent + '%', height: zone.height_percent + "%",
borderStyle: ctx.display_zone_borders ? 'dotted' : 'hidden'
} }
}, },
[ [
......
...@@ -74,6 +74,11 @@ ...@@ -74,6 +74,11 @@
<label for="display-labels">{% trans "Display label names on the image" %}:</label> <label for="display-labels">{% trans "Display label names on the image" %}:</label>
<input name="display-labels" id="display-labels" type="checkbox" /> <input name="display-labels" id="display-labels" type="checkbox" />
</form> </form>
<form class="display-borders-form">
<h3>{% trans "Zone borders" %}</h3>
<label for="display-borders">{% trans "Display zone borders on the image" %}:</label>
<input name="display-borders" id="display-borders" type="checkbox" />
</form>
</section> </section>
<section class="tab-content"> <section class="tab-content">
<div class="zone-editor"> <div class="zone-editor">
......
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