Skip to content

X
xblock-drag-and-drop-v2
Commit c958bc54 by Tim Krones Committed by GitHub
Options

Merge pull request #88 from open-craft/mtyaka/studio-help 

Clean up studio edit template
parents 7b5bc7d5 f0c1f02a
Showing with 262 additions and 203 deletions
drag_and_drop_v2/drag_and_drop_v2.py
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
""" Drag and Drop v2 XBlock """ """ Drag and Drop v2 XBlock """
# Imports ########################################################### # Imports ###########################################################
import copy import copy
...@@ -93,7 +94,7 @@ class DragAndDropBlock(XBlock, XBlockWithSettingsMixin, ThemableXBlockMixin): ...@@ -93,7 +94,7 @@ class DragAndDropBlock(XBlock, XBlockWithSettingsMixin, ThemableXBlockMixin):
question_text = String( question_text = String(
display_name=_("Problem text"), display_name=_("Problem text"),
help=_("The description of the problem or instructions shown to the learner"), help=_("The description of the problem or instructions shown to the learner."),
scope=Scope.settings, scope=Scope.settings,
default="", default="",
) )
...@@ -106,22 +107,22 @@ class DragAndDropBlock(XBlock, XBlockWithSettingsMixin, ThemableXBlockMixin): ...@@ -106,22 +107,22 @@ class DragAndDropBlock(XBlock, XBlockWithSettingsMixin, ThemableXBlockMixin):
) )
weight = Float( weight = Float(
display_name=_("Weight"), display_name=_("Maximum score"),
help=_("The maximum score the learner can receive for the problem"), help=_("The maximum score the learner can receive for the problem."),
scope=Scope.settings, scope=Scope.settings,
default=1, default=1,
) )
item_background_color = String( item_background_color = String(
display_name=_("Item background color"), display_name=_("Item background color"),
help=_("The background color of draggable items in the problem."), help=_("The background color of draggable items in the problem (example: 'blue' or '#0000ff')."),
scope=Scope.settings, scope=Scope.settings,
default="", default="",
) )
item_text_color = String( item_text_color = String(
display_name=_("Item text color"), display_name=_("Item text color"),
help=_("Text color to use for draggable items."), help=_("Text color to use for draggable items (example: 'white' or '#ffffff')."),
scope=Scope.settings, scope=Scope.settings,
default="", default="",
) )
...@@ -247,18 +248,17 @@ class DragAndDropBlock(XBlock, XBlockWithSettingsMixin, ThemableXBlockMixin): ...@@ -247,18 +248,17 @@ class DragAndDropBlock(XBlock, XBlockWithSettingsMixin, ThemableXBlockMixin):
""" """
js_templates = loader.load_unicode('/templates/html/js_templates.html') js_templates = loader.load_unicode('/templates/html/js_templates.html')
help_texts = { # Get a 'html_id' string that is unique for this block.
field_name: self.ugettext(field.help) # We append it to HTML element ID attributes to ensure multiple instances of the DnDv2 block
for field_name, field in self.fields.viewitems() if hasattr(field, "help") # on the same page don't share the same ID value.
} # We avoid using ID attributes in preference to classes, but sometimes we still need IDs to
field_values = { # connect 'for' and 'aria-describedby' attributes to the associated elements.
field_name: field.values id_suffix = self.location.html_id() # pylint: disable=no-member
for field_name, field in self.fields.viewitems() if hasattr(field, "values") js_templates = js_templates.replace('{{id_suffix}}', id_suffix)
}
context = { context = {
'js_templates': js_templates, 'js_templates': js_templates,
'help_texts': help_texts, 'id_suffix': id_suffix,
'field_values': field_values, 'fields': self.fields,
'self': self, 'self': self,
'data': urllib.quote(json.dumps(self.data)), 'data': urllib.quote(json.dumps(self.data)),
} }
......
drag_and_drop_v2/public/css/drag_and_drop_edit.css
...@@ -61,52 +61,78 @@ ...@@ -61,52 +61,78 @@
position: relative; position: relative;
} }
.xblock--drag-and-drop--editor .tab::after, .xblock--drag-and-drop--editor .tab::after {
.xblock--drag-and-drop--editor .tab-footer::after {
content: ""; content: "";
display: table; display: table;
clear: both; clear: both;
} }
.xblock--drag-and-drop--editor .tab h3, .xblock--drag-and-drop--editor .tab h3 {
.xblock--drag-and-drop--editor .tab .h3 { font-size: 18px;
margin: 20px 0 8px 0;
} }
.xblock--drag-and-drop--editor .tab .h3 { .xblock--drag-and-drop--editor .tab h4,
.xblock--drag-and-drop--editor .tab .h4 {
display: block; display: block;
font: inherit; font-size: 16px;
font-size: 100%; margin: 20px 0 8px 0;
} }
.xblock--drag-and-drop--editor .tab .nested-input { .xblock--drag-and-drop--editor .tab .items-form .item .row:first-of-type .h4 {
display: block; margin-top: 0;
margin-top: 8px;
} }
.xblock--drag-and-drop--editor .tab-header, .xblock--drag-and-drop--editor .tab-header,
.xblock--drag-and-drop--editor .tab-content, .xblock--drag-and-drop--editor .tab-content {
.xblock--drag-and-drop--editor .tab-footer {
width: 96%; width: 96%;
margin: 2%; margin: 2%;
} }
.xblock--drag-and-drop--editor .tab-footer {
height: 25px;
position: relative;
display: block;
float: left;
}
.xblock--drag-and-drop--editor .items { .xblock--drag-and-drop--editor .items {
width: calc(100% - 515px); width: calc(100% - 515px);
margin: 10px 0 0 0; margin: 10px 0 0 0;
} }
.xblock--drag-and-drop--editor .target-image-form input, .xblock--drag-and-drop--editor .target-image-form input {
.xblock--drag-and-drop--editor .target-image-form textarea {
width: 50%; width: 50%;
} }
.xblock--drag-and-drop--editor .target-image-form textarea {
width: 97%;
}
.xblock--drag-and-drop--editor .target-image-form textarea {
display: block;
}
.xblock--drag-and-drop--editor input,
.xblock--drag-and-drop--editor textarea {
box-sizing: border-box;
font-size: 14px;
background: #fff;
box-shadow: none;
padding: 6px 8px;
border: 1px solid #b2b2b2;
color: #4c4c4c;
}
.xblock--drag-and-drop--editor label > span {
display: inline-block;
margin-bottom: 0.25em;
}
.xblock--drag-and-drop--editor label.checkbox-label {
font-size: 14px;
}
/* Main Tab */
.xblock--drag-and-drop--editor .feedback-tab input,
.xblock--drag-and-drop--editor .feedback-tab select {
display: block;
}
.xblock--drag-and-drop--editor .feedback-tab input[type=checkbox] {
display: inline-block;
}
/* Zones Tab */ /* Zones Tab */
.xblock--drag-and-drop--editor .zones-tab .zone-editor { .xblock--drag-and-drop--editor .zones-tab .zone-editor {
...@@ -122,7 +148,6 @@ ...@@ -122,7 +148,6 @@
width: 40%; width: 40%;
max-width: 50%; max-width: 50%;
min-width: 330px; min-width: 330px;
margin-right: 15px;
} }
.xblock--drag-and-drop--editor .zones-tab .tab-content .target { .xblock--drag-and-drop--editor .zones-tab .tab-content .target {
...@@ -137,39 +162,57 @@ ...@@ -137,39 +162,57 @@
max-width: 100%; max-width: 100%;
} }
.xblock--drag-and-drop--editor .zones-form .zone-row {
background-color: #b1d9f1;
padding: 1rem;
margin-bottom: 2rem;
}
.xblock--drag-and-drop--editor .zones-form .zone-row label { .xblock--drag-and-drop--editor .zones-form .zone-row label {
display: block;
}
.xblock--drag-and-drop--editor .zones-form .zone-row label > span {
display: inline-block; display: inline-block;
width: 18%; font-size: 14px;
min-width: 8rem;
} }
.xblock--drag-and-drop--editor .zones-form .zone-row > input { .xblock--drag-and-drop--editor .zones-form .zone-row label > input {
width: 60%; width: 63%;
margin: 0 0 5px; margin: 0 0 5px;
line-height: 2.664rem; /* .title gets line-height from a Studio rule that does not apply to .description; line-height: 2.664rem; /* .title gets line-height from a Studio rule that does not apply to .description;
here we make sure that both input fields get the same value for line-height */ here we make sure that both input fields get the same value for line-height */
} }
.xblock--drag-and-drop--editor .zones-form .zone-row .alignment { .xblock--drag-and-drop--editor .zones-form .zone-row .layout {
margin-bottom: 15px; margin: 2rem 0;
} }
.xblock--drag-and-drop--editor .zones-form .zone-row .layout label {
display: inline-block;
width: 45%;
}
.xblock--drag-and-drop--editor .zones-form .zone-row .layout .zone-size,
.xblock--drag-and-drop--editor .zones-form .zone-row .layout .zone-coord {
width: 35%;
line-height: inherit;
}
.xblock--drag-and-drop--editor .zones-form .zone-row .layout .size, .xblock--drag-and-drop--editor .zones-form .zone-row .alignment {
.xblock--drag-and-drop--editor .zones-form .zone-row .layout .coord { margin-bottom: 15px;
width: 15%;
margin: 0 19px 5px 0;
} }
.xblock--drag-and-drop--editor .feedback-form textarea { .xblock--drag-and-drop--editor .feedback-form textarea {
width: 99%; width: 99%;
height: 128px; height: 128px;
} }
.xblock--drag-and-drop--editor .zones-form .zones-form-help, .xblock--drag-and-drop--editor .form-help {
.xblock--drag-and-drop--editor .target-image-form .target-image-form-help, margin: 0.5rem 0 1rem;
.xblock--drag-and-drop--editor .item-styles-form .item-styles-form-help { font-size: 12px;
margin-top: 5px;
font-size: small;
} }
.xblock--drag-and-drop--editor .item-styles-form, .xblock--drag-and-drop--editor .item-styles-form,
...@@ -178,14 +221,9 @@ ...@@ -178,14 +221,9 @@
} }
.xblock--drag-and-drop--editor .items-form .item { .xblock--drag-and-drop--editor .items-form .item {
background-color: #8fcaec; background-color: #b1d9f1;
padding: 10px 0 1px; padding: 2rem;
margin: 15px 0; margin-bottom: 2rem;
}
.xblock--drag-and-drop--editor .items-form label,
.xblock--drag-and-drop--editor .items-form .h3 {
margin: 0 1%;
} }
.xblock--drag-and-drop--editor .items-form select { .xblock--drag-and-drop--editor .items-form select {
...@@ -199,7 +237,6 @@ ...@@ -199,7 +237,6 @@
.xblock--drag-and-drop--editor .items-form .item-text, .xblock--drag-and-drop--editor .items-form .item-text,
.xblock--drag-and-drop--editor .items-form .item-image-url { .xblock--drag-and-drop--editor .items-form .item-image-url {
width: 50%; width: 50%;
margin: 0 1%;
} }
.xblock--drag-and-drop--editor .items-form .item-width { .xblock--drag-and-drop--editor .items-form .item-width {
...@@ -208,23 +245,30 @@ ...@@ -208,23 +245,30 @@
.xblock--drag-and-drop--editor .items-form textarea { .xblock--drag-and-drop--editor .items-form textarea {
width: 97%; width: 97%;
margin: 0 1%;
} }
.xblock--drag-and-drop--editor .items-form .zone-checkbox-label {
text-align: left;
}
.xblock--drag-and-drop--editor .items-form .row {
margin-bottom: 20px;
}
.xblock--drag-and-drop--editor .items-form .row.advanced { .xblock--drag-and-drop--editor .items-form .row.advanced {
display: none; display: none;
} }
.xblock--drag-and-drop--editor .items-form .row.advanced-link { .xblock--drag-and-drop--editor .items-form .row.advanced-link {
padding-left: 1em; font-size: 12px;
font-size: 80%; margin-top: 2em;
}
.xblock--drag-and-drop--editor .items-form .row.advanced-link button {
background: none;
border: none;
color: #4c4c4c;
}
.xblock--drag-and-drop--editor .items-form .row.advanced-link button:before {
content: '\25B6';
margin-right: 0.5em;
} }
.rtl .xblock--drag-and-drop--editor .items-form .row.advanced-link button:before {
content: '\25C0';
margin-left: 0.5em;
margin-right: 0;
}
.xblock--drag-and-drop-editor .items-form .zone-checkbox-row { .xblock--drag-and-drop-editor .items-form .zone-checkbox-row {
margin-bottom: 0px; margin-bottom: 0px;
} }
...@@ -238,48 +282,33 @@ ...@@ -238,48 +282,33 @@
padding: 5px 10px; padding: 5px 10px;
} }
.xblock--drag-and-drop--editor .btn:hover { .xblock--drag-and-drop--editor .btn:hover,
opacity: 0.8;
cursor: pointer;
}
.xblock--drag-and-drop--editor .btn:focus { .xblock--drag-and-drop--editor .btn:focus {
outline: none; background-color: #296ba5;
opacity: 0.5; box-shadow: 0 1px 1px rgba(0,0,0,0.5);
}
.xblock--drag-and-drop--editor .add-element {
text-decoration: none;
color: #1d5280;
}
.xblock--drag-and-drop--editor .remove-zone {
float: right;
margin-top: 2px;
margin-right: 16px;
} }
.xblock--drag-and-drop--editor .remove-zone,
.xblock--drag-and-drop--editor .remove-item { .xblock--drag-and-drop--editor .remove-item {
float: right; float: right;
display: inline-block; padding: 3px;
margin-right: 16px; border-radius: 12px;
}
.rtl .xblock--drag-and-drop--editor .remove-zone,
.rtl .xblock--drag-and-drop--editor .remove-item {
float: left;
} }
.xblock--drag-and-drop--editor .icon { .xblock--drag-and-drop--editor .icon {
width: 14px; width: 14px;
height: 14px; height: 14px;
border-radius: 7px; border-radius: 7px;
background-color: #1d5280; display: inline-block;
position: relative;
float: left;
margin: 0 5px 0 0;
} }
.xblock--drag-and-drop--editor .add-zone:hover, .xblock--drag-and-drop--editor .remove-zone .icon,
.xblock--drag-and-drop--editor .add-zone:hover .icon, .xblock--drag-and-drop--editor .remove-item .icon {
.xblock--drag-and-drop--editor .remove-zone:hover, display: block;
.xblock--drag-and-drop--editor .remove-zone:hover .icon {
opacity: 0.7;
} }
.xblock--drag-and-drop--editor .tab .field-error { .xblock--drag-and-drop--editor .tab .field-error {
...@@ -342,12 +371,3 @@ ...@@ -342,12 +371,3 @@
-ms-transform: rotate(45deg); -ms-transform: rotate(45deg);
transform: rotate(45deg); transform: rotate(45deg);
} }
.xblock--drag-and-drop--editor .remove-item .icon.remove {
background-color: #fff;
color: #0072a7; /* Override default color from Studio to ensure contrast is large enough */
}
.xblock--drag-and-drop--editor .remove-item .icon.remove:before,
.xblock--drag-and-drop--editor .remove-item .icon.remove:after {
background-color: #1d5280;
}
drag_and_drop_v2/templates/html/js_templates.html
<script id="zone-element-tpl" type="text/html"> <script class="zone-element-tpl" type="text/html">
<div class="zone" data-zone="{{ uid }}" style=" <div class="zone" data-zone="{{ uid }}" style="
top:{{ y_percent }}%; top:{{ y_percent }}%;
left:{{ x_percent }}%; left:{{ x_percent }}%;
...@@ -9,55 +9,61 @@ ...@@ -9,55 +9,61 @@
</div> </div>
</script> </script>
<script id="zone-input-tpl" type="text/html"> <script class="zone-input-tpl" type="text/html">
<div class="zone-row" data-uid="{{zone.uid}}"> <fieldset class="zone-row" data-uid="{{zone.uid}}">
<!-- uid values from old versions of the block may contain spaces and other characters, so we use 'index' as an alternate unique ID here. --> <button type="button" class="btn remove-zone hidden" title="{{i18n 'Remove zone'}}">
<label for="zone-{{index}}-title">{{i18n "Text"}}</label> <span class="icon remove" aria-hidden="true"></span>
</button>
<label>
<span>{{i18n "Title"}}</span>
<input type="text" <input type="text"
id="zone-{{index}}-title" class="zone-title"
class="title"
value="{{ zone.title }}" value="{{ zone.title }}"
required /> required />
<a href="#" class="remove-zone hidden"> </label>
<div class="icon remove"></div> <label>
</a> <span>{{i18n "Description"}}</span>
<label for="zone-{{index}}-description">{{i18n "Description"}}</label>
<input type="text" <input type="text"
id="zone-{{index}}-description" class="zone-description"
class="description"
value="{{ zone.description }}" value="{{ zone.description }}"
placeholder="{{i18n 'Describe this zone to non-visual users'}}" aria-describedby="zone-description-description-{{zone.uid}}-{{id_suffix}}"
required /> required />
<div id="zone-description-description-{{zone.uid}}-{{id_suffix}}" class="form-help">
{{i18n "Describe this zone to non-visual users."}}
</div>
</label>
<div class="layout"> <div class="layout">
<label for="zone-{{index}}-width">{{i18n "width"}}</label> <label>
<span>{{i18n "width"}}</span>
<input type="text" <input type="text"
id="zone-{{index}}-width" class="zone-size zone-width"
class="size width"
value="{{ zone.width }}" /> value="{{ zone.width }}" />
<label for="zone-{{index}}-height">{{i18n "height"}}</label> </label>
<label>
<span>{{i18n "height"}}</span>
<input type="text" <input type="text"
id="zone-{{index}}-height" class="zone-size zone-height"
class="size height"
value="{{ zone.height }}" /> value="{{ zone.height }}" />
</label>
<br /> <br />
<label for="zone-{{index}}-x">x</label> <label>
<span>x</span>
<input type="text" <input type="text"
id="zone-{{index}}-x" class="zone-coord zone-x"
class="coord x"
value="{{ zone.x }}" /> value="{{ zone.x }}" />
<label for="zone-{{index}}-y">y</label> </label>
<label>
<span>y</span>
<input type="text" <input type="text"
id="zone-{{index}}-y" class="zone-coord zone-y"
class="coord y"
value="{{ zone.y }}" /> value="{{ zone.y }}" />
</label>
</div> </div>
<div class="alignment"> <div class="alignment">
<label for="zone-{{index}}-align"> <label>
{{i18n "Alignment"}} <span>{{i18n "Alignment"}}</span>
</label> <select class="zone-align-select"
<select id="zone-{{index}}-align" aria-describedby="zone-align-description-{{zone.uid}}-{{id_suffix}}">
class="align-select"
aria-describedby="zone-align-description">
<option value="" <option value=""
{{#ifeq zone.align ""}}selected{{/ifeq}}> {{#ifeq zone.align ""}}selected{{/ifeq}}>
{{i18n "none"}} {{i18n "none"}}
...@@ -75,16 +81,17 @@ ...@@ -75,16 +81,17 @@
{{i18n "right"}} {{i18n "right"}}
</option> </option>
</select> </select>
<div id="zone-align-description" class="zones-form-help"> </label>
<div id="zone-align-description-{{zone.uid}}-{{id_suffix}}" class="form-help">
{{i18n "Align dropped items to the left, center, or right. Default is no alignment (items stay exactly where the user drops them)."}} {{i18n "Align dropped items to the left, center, or right. Default is no alignment (items stay exactly where the user drops them)."}}
</div> </div>
</div> </div>
</div> </fieldset>
</script> </script>
<script id="zone-checkbox-tpl" type="text/html"> <script class="zone-checkbox-tpl" type="text/html">
<div class="zone-checkbox-row"> <div class="zone-checkbox-row">
<label> <label class="checkbox-label">
<input type="checkbox" <input type="checkbox"
value="{{ zoneUid }}" value="{{ zoneUid }}"
class="zone-checkbox" class="zone-checkbox"
...@@ -94,64 +101,78 @@ ...@@ -94,64 +101,78 @@
</div> </div>
</script> </script>
<script id="item-input-tpl" type="text/html"> <script class="item-input-tpl" type="text/html">
<div class="item"> <fieldset class="item">
<button type="button" class="btn remove-item hidden" title="{{i18n 'Remove item'}}">
<span class="icon remove" aria-hidden="true"></span>
</button>
<div class="row"> <div class="row">
<label class="h3"> <label class="h4">
{{i18n "Text"}} {{i18n "Text"}}
<input type="text" <input type="text"
placeholder="{{i18n 'Use text that is clear and descriptive of the item to be placed'}}" aria-describedby="item-text-description-{{index}}-{{id_suffix}}"
class="item-text" class="item-text"
value="{{ displayName }}" /> value="{{ displayName }}" />
</label> </label>
<a href="#" class="remove-item hidden"> <div id="item-text-description-{{index}}-{{id_suffix}}" class="form-help">
<div class="icon remove"></div> {{i18n "Use text that is clear and descriptive of the item to be placed."}}
</a> </div>
</div> </div>
<div class="row"> <div class="row">
<fieldset> <fieldset>
<legend class="h3"> <legend class="h4">
{{ i18n "Zones" }} {{ i18n "Zones" }}
</legend> </legend>
{{ checkboxes }} {{ checkboxes }}
</fieldset> </fieldset>
</div> </div>
<div class="row"> <div class="row">
<label class="h3"> <label class="h4">
{{i18n "Image URL (alternative to the text)"}} {{i18n "Image URL (alternative to the text)"}}
<input type="text" <input type="text"
placeholder="{{i18n 'For example, http://example.com/image.png or /static/image.png'}}" aria-describedby="item-image-url-description-{{index}}-{{id_suffix}}"
class="item-image-url" class="item-image-url"
value="{{ imageURL }}" /> value="{{ imageURL }}" />
</label> </label>
<div id="item-image-url-description-{{index}}-{{id_suffix}}" class="form-help">
{{i18n "For example, 'http://example.com/image.png' or '/static/image.png'."}}
</div>
</div> </div>
<div class="row"> <div class="row">
<label class="h3" for="item-{{id}}-image-description">{{i18n "Image description (should provide sufficient information to place the item even if the image did not load)"}}</label> <label class="h4">
<textarea id="item-{{id}}-image-description" {{#if imageURL}}required{{/if}} <span>{{i18n "Image description (should provide sufficient information to place the item even if the image did not load)"}}</span>
class="item-image-description">{{ imageDescription }}</textarea> <textarea {{#if imageURL}}required{{/if}} class="item-image-description">{{ imageDescription }}</textarea>
</label>
</div> </div>
<div class="row"> <div class="row">
<label class="h3" for="item-{{id}}-success-feedback">{{i18n "Success Feedback"}}</label> <label class="h4">
<textarea id="item-{{id}}-success-feedback" <span>{{i18n "Success Feedback"}}</span>
class="success-feedback">{{ feedback.correct }}</textarea> <textarea class="success-feedback">{{ feedback.correct }}</textarea>
</label>
</div> </div>
<div class="row"> <div class="row">
<label class="h3" for="item-{{id}}-error-feedback">{{i18n "Error Feedback"}}</label> <label class="h4">
<textarea id="item-{{id}}-error-feedback" <span>{{i18n "Error Feedback"}}</span>
class="error-feedback">{{ feedback.incorrect }}</textarea> <textarea class="error-feedback">{{ feedback.incorrect }}</textarea>
</label>
</div> </div>
<div class="row advanced-link"> <div class="row advanced-link">
<a href="#">{{i18n "Show advanced settings" }}</a> <button type="button">{{i18n "Show advanced settings" }}</button>
</div> </div>
<div class="row advanced"> <div class="row advanced">
<label> <label class="h4">
{{i18n "Preferred width as a percentage of the background image width (or blank for automatic width):"}} <span>{{i18n "Preferred width"}}</span>
<input type="number" <input type="number"
class="item-width" class="item-width"
value="{{ singleDecimalFloat widthPercent }}" value="{{ singleDecimalFloat widthPercent }}"
aria-describedby="item-width-description-{{index}}-{{id_suffix}}"
step="0.1" step="0.1"
min="1" min="1"
max="99" />% max="99" />%
</label>
<div id="item-width-description-{{index}}-{{id_suffix}}" class="form-help">
{{i18n "Specify preferred width as percentage of the background image width. Leave blank for automatic width."}}
</div> </div>
</div> </div>
</fieldset>
</script> </script>
drag_and_drop_v2/translations/en/LC_MESSAGES/text.po
...@@ -90,6 +90,7 @@ msgid "I don't belong anywhere" ...@@ -90,6 +90,7 @@ msgid "I don't belong anywhere"
msgstr "" msgstr ""
#: drag_and_drop_v2.py #: drag_and_drop_v2.py
#: templates/html/js_templates.html
msgid "Title" msgid "Title"
msgstr "" msgstr ""
...@@ -121,7 +122,6 @@ msgid "Assessment" ...@@ -121,7 +122,6 @@ msgid "Assessment"
msgstr "" msgstr ""
#: drag_and_drop_v2.py #: drag_and_drop_v2.py
#: templates/html/drag_and_drop_edit.html
msgid "Maximum attempts" msgid "Maximum attempts"
msgstr "" msgstr ""
...@@ -132,7 +132,6 @@ msgid "" ...@@ -132,7 +132,6 @@ msgid ""
msgstr "" msgstr ""
#: drag_and_drop_v2.py #: drag_and_drop_v2.py
#: templates/html/drag_and_drop_edit.html
msgid "Show title" msgid "Show title"
msgstr "" msgstr ""
...@@ -141,16 +140,14 @@ msgid "Display the title to the learner?" ...@@ -141,16 +140,14 @@ msgid "Display the title to the learner?"
msgstr "" msgstr ""
#: drag_and_drop_v2.py #: drag_and_drop_v2.py
#: templates/html/drag_and_drop_edit.html
msgid "Problem text" msgid "Problem text"
msgstr "" msgstr ""
#: drag_and_drop_v2.py #: drag_and_drop_v2.py
msgid "The description of the problem or instructions shown to the learner" msgid "The description of the problem or instructions shown to the learner."
msgstr "" msgstr ""
#: drag_and_drop_v2.py #: drag_and_drop_v2.py
#: templates/html/drag_and_drop_edit.html
msgid "Show \"Problem\" heading" msgid "Show \"Problem\" heading"
msgstr "" msgstr ""
...@@ -159,11 +156,11 @@ msgid "Display the heading \"Problem\" above the problem text?" ...@@ -159,11 +156,11 @@ msgid "Display the heading \"Problem\" above the problem text?"
msgstr "" msgstr ""
#: drag_and_drop_v2.py #: drag_and_drop_v2.py
msgid "Weight" msgid "Maximum score"
msgstr "" msgstr ""
#: drag_and_drop_v2.py #: drag_and_drop_v2.py
msgid "The maximum score the learner can receive for the problem" msgid "The maximum score the learner can receive for the problem."
msgstr "" msgstr ""
#: drag_and_drop_v2.py #: drag_and_drop_v2.py
...@@ -171,7 +168,7 @@ msgid "Item background color" ...@@ -171,7 +168,7 @@ msgid "Item background color"
msgstr "" msgstr ""
#: drag_and_drop_v2.py #: drag_and_drop_v2.py
msgid "The background color of draggable items in the problem." msgid "The background color of draggable items in the problem (example: 'blue' or '#0000ff')."
msgstr "" msgstr ""
#: drag_and_drop_v2.py #: drag_and_drop_v2.py
...@@ -179,7 +176,7 @@ msgid "Item text color" ...@@ -179,7 +176,7 @@ msgid "Item text color"
msgstr "" msgstr ""
#: drag_and_drop_v2.py #: drag_and_drop_v2.py
msgid "Text color to use for draggable items." msgid "Text color to use for draggable items (example: 'white' or '#ffffff')."
msgstr "" msgstr ""
#: drag_and_drop_v2.py #: drag_and_drop_v2.py
...@@ -200,9 +197,33 @@ msgid "" ...@@ -200,9 +197,33 @@ msgid ""
msgstr "" msgstr ""
#: drag_and_drop_v2.py #: drag_and_drop_v2.py
msgid "Number of attempts learner used"
msgstr ""
#: drag_and_drop_v2.py
msgid "Indicates whether a learner has completed the problem at least once" msgid "Indicates whether a learner has completed the problem at least once"
msgstr "" msgstr ""
#: drag_and_drop_v2.py
msgid "Keeps maximum achieved score by student"
msgstr ""
#: drag_and_drop_v2.py
msgid "do_attempt handler should only be called for assessment mode"
msgstr ""
#: drag_and_drop_v2.py
msgid "Max number of attempts reached"
msgstr ""
#: drag_and_drop_v2.py
msgid "Unknown DnDv2 mode {mode} - course is misconfigured"
msgstr ""
#: templates/html/js_templates.html
msgid "Remove zone"
msgstr ""
#: templates/html/js_templates.html #: templates/html/js_templates.html
msgid "Text" msgid "Text"
msgstr "" msgstr ""
...@@ -212,7 +233,7 @@ msgid "Description" ...@@ -212,7 +233,7 @@ msgid "Description"
msgstr "" msgstr ""
#: templates/html/js_templates.html #: templates/html/js_templates.html
msgid "Describe this zone to non-visual users" msgid "Describe this zone to non-visual users."
msgstr "" msgstr ""
#: templates/html/js_templates.html #: templates/html/js_templates.html
...@@ -250,6 +271,10 @@ msgid "" ...@@ -250,6 +271,10 @@ msgid ""
msgstr "" msgstr ""
#: templates/html/js_templates.html #: templates/html/js_templates.html
msgid "Remove item"
msgstr ""
#: templates/html/js_templates.html
msgid "Zone" msgid "Zone"
msgstr "" msgstr ""
...@@ -258,7 +283,7 @@ msgid "Image URL (alternative to the text)" ...@@ -258,7 +283,7 @@ msgid "Image URL (alternative to the text)"
msgstr "" msgstr ""
#: templates/html/js_templates.html #: templates/html/js_templates.html
msgid "For example, http://example.com/image.png or /static/image.png" msgid "For example, 'http://example.com/image.png' or '/static/image.png'."
msgstr "" msgstr ""
#: templates/html/js_templates.html #: templates/html/js_templates.html
...@@ -280,13 +305,17 @@ msgid "Show advanced settings" ...@@ -280,13 +305,17 @@ msgid "Show advanced settings"
msgstr "" msgstr ""
#: templates/html/js_templates.html #: templates/html/js_templates.html
msgid "Preferred width"
msgstr ""
#: templates/html/js_templates.html
msgid "" msgid ""
"Preferred width as a percentage of the background image width (or blank for " "Specify preferred width as percentage of the background image width. "
"automatic width):" "Leave blank for automatic width."
msgstr "" msgstr ""
#: templates/html/js_templates.html #: templates/html/js_templates.html
msgid "Use text that is clear and descriptive of the item to be placed" msgid "Use text that is clear and descriptive of the item to be placed."
msgstr "" msgstr ""
#: templates/html/drag_and_drop.html #: templates/html/drag_and_drop.html
...@@ -300,18 +329,6 @@ msgid "" ...@@ -300,18 +329,6 @@ msgid ""
msgstr "" msgstr ""
#: templates/html/drag_and_drop_edit.html #: templates/html/drag_and_drop_edit.html
msgid "Problem title"
msgstr ""
#: templates/html/drag_and_drop_edit.html
msgid "Problem mode"
msgstr ""
#: templates/html/drag_and_drop_edit.html
msgid "Maximum score"
msgstr ""
#: templates/html/drag_and_drop_edit.html
msgid "Introductory Feedback" msgid "Introductory Feedback"
msgstr "" msgstr ""
...@@ -319,8 +336,8 @@ msgstr "" ...@@ -319,8 +336,8 @@ msgstr ""
msgid "Final Feedback" msgid "Final Feedback"
msgstr "" msgstr ""
#: templates/html/js_templates.html
#: templates/html/drag_and_drop_edit.html #: templates/html/drag_and_drop_edit.html
#: templates/html/js_templates.html
msgid "Zones" msgid "Zones"
msgstr "" msgstr ""
...@@ -330,7 +347,7 @@ msgstr "" ...@@ -330,7 +347,7 @@ msgstr ""
#: templates/html/drag_and_drop_edit.html #: templates/html/drag_and_drop_edit.html
msgid "" msgid ""
"For example, http://example.com/background.png or /static/background.png" "For example, 'http://example.com/background.png' or '/static/background.png'."
msgstr "" msgstr ""
#: templates/html/drag_and_drop_edit.html #: templates/html/drag_and_drop_edit.html
...@@ -354,6 +371,10 @@ msgid "" ...@@ -354,6 +371,10 @@ msgid ""
msgstr "" msgstr ""
#: templates/html/drag_and_drop_edit.html #: templates/html/drag_and_drop_edit.html
msgid "Zone definitions"
msgstr ""
#: templates/html/drag_and_drop_edit.html
msgid "Zone labels" msgid "Zone labels"
msgstr "" msgstr ""
...@@ -378,14 +399,6 @@ msgid "Items" ...@@ -378,14 +399,6 @@ msgid "Items"
msgstr "" msgstr ""
#: templates/html/drag_and_drop_edit.html #: templates/html/drag_and_drop_edit.html
msgid "Background color"
msgstr ""
#: templates/html/drag_and_drop_edit.html
msgid "Text color"
msgstr ""
#: templates/html/drag_and_drop_edit.html
msgid "Add an item" msgid "Add an item"
msgstr "" msgstr ""
...@@ -421,6 +434,7 @@ msgstr "" ...@@ -421,6 +434,7 @@ msgstr ""
msgid "Reset" msgid "Reset"
msgstr "" msgstr ""
#: public/js/drag_and_drop.js
msgid "Submit" msgid "Submit"
msgstr "" msgstr ""
...@@ -470,6 +484,10 @@ msgstr "" ...@@ -470,6 +484,10 @@ msgstr ""
msgid "An error occurred. Unable to load drag and drop problem." msgid "An error occurred. Unable to load drag and drop problem."
msgstr "" msgstr ""
#: public/js/drag_and_drop.js
msgid "You have used {used} of {total} attempts."
msgstr ""
#: public/js/drag_and_drop_edit.js #: public/js/drag_and_drop_edit.js
msgid "There was an error with your form." msgid "There was an error with your form."
msgstr "" msgstr ""
......
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