Make DnDv2 themable #48
Conversation
use xblock-utils equivalents instead. - load_resource ⟶ ResourceLoader.load_unicode - render_template ⟶ ResourceLoader.render_template
| @@ -123,7 +123,7 @@ | |||
| </div> | |||
| <div class="row"> | |||
| <label for="item-{{id}}-numerical-margin"> | |||
| {{i18n "Margin ± (when a numerical value is required, values entered by students must not differ from the expected value by more than this margin; default is zero)"}} | |||
| {{i18n "Margin +/- (when a numerical value is required, values entered by students must not differ from the expected value by more than this margin; default is zero)"}} | |||
There was a problem hiding this comment.
Why this change? Personally I prefer the correct symbol, but don't have a strong opinion.
There was a problem hiding this comment.
After replacing load_resource with ResourceLoader.load_unicode in the line that pulls in js_templates.html for the EDIT dialog, I got the following error:
Error: 'ascii' codec can't decode byte 0xc2 in position 5557: ordinal not in range(128)
The difference between load_resource and load_unicode from xblock-utils is that the former wasn't calling unicode on the content pulled from a resource before returning it.
Changing the symbol seemed like a better option than keeping load_resource just for the sake of avoiding this error, but let me know -- maybe there's another way to approach this?
There was a problem hiding this comment.
@itsjeyd Hmm, you'd think a method called load_unicode would support loading unicode text :-p
Your workaround is fine for now, so we can get this merged on time. But the proper fix is to change xblock-utils to use return unicode(resource_content, 'utf-8') instead of just return unicode(resource_content). Would you be able to open a second PR to fix that in xblock-utils?
There was a problem hiding this comment.
Already mentioned this on OC-1164 but for reference, openedx-unsupported/xblock-utils#36 implements the fix for this issue.
Use the more specific "background-color" instead of "background" where applicable.
This was mainly done to improve the appearance of DnDv2 exercises in Apros but the appearance of DnDv2 exercises in the LMS benefits from it as well.
items to become visible before making assertions.
#48. While working on getting the Drag and Drop v2 XBlock ready for edx.org, we discovered a bug in xblock-utils that kept resources containing non-ASCII chars from being loaded correctly. This bug was fixed in openedx-unsupported/xblock-utils#36, and the fix was integrated into edx-platform via https://github.com/edx/edx-platform/pull/11282 (target branch: named-release/dogwood.rc) and https://github.com/edx/edx-platform/pull/11283 (target branch: master).
This PR adds the necessary infrastructure for applying custom themes to DnDv2. It also makes legacy (Apros) styling of the block available as an opt-in theme.
Screenshot
Appearance of a DnDv2 exercise with legacy theme enabled:
Testing