Kyle Mulka
d4cbcfd5d5
INCR-229 ran modernize and isort on some files ( #20463 )
...
* INCR-229 ran modernize on common/lib/xmodule/xmodule/[a-g]*.py except for graders.py
* fix a couple xss-commit-linter issues
2019-05-09 00:57:09 -04:00
Michael Terry
a34c8c8233
Drop remaining coffee use
...
This basically commits the transpiled CoffeeScript JS (with minor
cleanup) and removes coffee build support.
A tiny amount of support for xblocks exists, because external users
may have xblocks with coffee. But no coffee in our tree anyway.
2018-04-13 14:10:40 -04:00
Andy Armstrong
93235d118d
Reorder imports using isort (except lms and cms)
2017-05-30 16:04:54 -04:00
Gregory Martin
e1e47793df
change help strings
2017-01-12 09:02:28 -05:00
cahrens
b8ddf709dc
Convert javascript_loader to JS.
...
Also reformat to 4 spaces per indent.
2016-10-13 13:59:00 -04:00
Christina Roberts
2497f0a0eb
WIP: xblock pipeline work ( #10176 )
...
[PERF-303] Integer XBlocks/XModules into the static asset pipeline.
This PR, based on hackathon work from Christina/Andy, implements a way to discover all installed XBlocks and XModules and to enumerate their public assets, then pulling them in during the collectstatic phase and hashing them. In turn, the methods for generating URLs to resources will then returned the hashed name for assets, allowing them to be served from nginx/CDNs, and cached heavily.
2016-04-29 10:52:42 -04:00
Robert Raposa
5e69224c32
Deprecate escaping in display_name_with_default
...
- Remove escaping in display_name_with_default
- Move escaped version to deprecated display_name_with_default_escaped
- Does not include any other changes to remove double-escaping
Thanks to agaylard who initiated this work:
https://github.com/edx/edx-platform/pull/10756
TNL-3425
2015-12-22 11:52:04 -05:00
Renzo Lucioni
2f0e663581
Use ugettext_noop instead of lambdas assigned to the underscore
...
Replaces instances of an old hack with the more clear ugettext_noop.
2015-11-04 09:17:18 -05:00
stv
b215d771b7
Fix PEP8: E128 continuation line under-indented
...
for visual indent
2014-11-24 20:46:50 -05:00
stv
55de42d19c
Fix PEP8: E122 continuation line missing
...
indentation or outdented
2014-11-24 20:46:35 -05:00
louyihua
63ef3bd05a
i18n: More extractable & localizable strings in xmodules
2014-05-26 15:30:01 +08:00
louyihua
a6bae4d238
i18n: Make static strings in xmodule files extractable
...
They can now be extracted.
2014-05-23 01:58:19 +08:00
Valera Rozuvan
1136336fc4
Converting collapsible module to JavaScript.
2014-03-11 11:28:46 +00:00
Calen Pennington
b4a1840344
Move xmodule_runtime.xmodule_instance registration earlier
...
This allows XModules (specifically CombinedOpenEnded) to use ajax_url
during their init functions (which would, before, have thrown an
exception).
[LMS-1493]
2013-11-20 10:15:09 -05:00
Calen Pennington
8201b1412e
Use XBlock 0.3
2013-09-06 09:45:59 -04:00
Don Mitchell
3722685e1a
No longer persist XModule templates
...
Instead, we use XModule field default values when creating an empty
XModule. Driven by this use case, we also allow for XModules to be
created in memory without being persisted to the database at all. This
necessitates a change to the Modulestore api, replacing clone_item with
create_draft and save_xmodule.
2013-07-16 14:33:58 -04:00
Don Mitchell
8c904f31a9
Move defaults from yaml templates to field definitions.
...
This standardizes the XModule field default values to be the same as the
values that are presented by studio when a component is added to a
course.
2013-07-16 14:24:41 -04:00
Calen Pennington
e791e84ea7
Remove the stores_state field from XModule
...
stores_state is now only used in a single test, in conjunction with
has_score. In practice, it's never the case that stores_state is false
when has_score is true, so we can delete stores_state entirely, and just
use has_score for the grading test.
2013-06-13 14:38:59 -04:00
Chris Dodge
8ece663284
more drive by violation fixes
2013-04-12 15:45:27 -04:00
Arthur Barrett
1b08071fdc
merged from master and resolved conflict with annotatable module.
2013-03-18 15:51:27 -04:00
Chris Dodge
c67f1677fd
remove imports of Mongo.py from modules. They shouldn't need them. Also, video captions shouldn't need special logic to compute the url rewrites as the main get_html() should do this.
2013-03-13 15:57:38 -04:00
Calen Pennington
92e99d7a8b
Move field definitions for XModules into mixin classes, so that descriptors and modules always have the same set of fields
2013-03-13 11:35:50 -04:00
Arthur Barrett
fcf82ba2bc
fixed pep8 violations for annotation module
2013-03-11 18:02:22 -04:00
Calen Pennington
248ce8803b
Make annotable module use the new xmodule format
2013-03-08 15:09:59 -05:00
Calen Pennington
93db5acc15
Make display_name defaulting explicit
2013-03-08 14:58:09 -05:00
Arthur Barrett
6dba2394b2
enable studio authoring (raw) for xmodule
2013-03-01 13:32:56 -05:00
Arthur Barrett
9d939cba94
added more unit tests to module
2013-02-26 17:49:18 -05:00
Arthur Barrett
8162d5473f
added more unit tests for module
2013-02-26 17:08:01 -05:00
Arthur Barrett
18233ef0d7
bolded the section titles and added unittest skeleton for module
2013-02-26 12:15:43 -05:00
Arthur Barrett
1f160d6ef4
added a box around the instructions text
2013-02-25 16:29:19 -05:00
Arthur Barrett
7b195eb0ee
fixed error if highlight not defined
2013-02-25 13:24:05 -05:00
Arthur Barrett
e736ed34f5
added ability to hide/show instructions, if present
2013-02-25 11:29:59 -05:00
Arthur Barrett
66ddfa295d
more refactoring and work on annotationinput (should be working now).
2013-02-22 16:33:28 -05:00
Arthur Barrett
3970ea33e1
return from capa problem
2013-02-21 22:54:50 -05:00
Arthur Barrett
0e2c46a718
Clicking "reply to annotation" scrolls to the problem (specified in xml by problem=index).
2013-02-21 17:01:43 -05:00
Arthur Barrett
07f64abb11
Refactored init method.
2013-02-20 17:38:47 -05:00
Arthur Barrett
a982ebbb03
Refactored rendered method and added span ids.
2013-02-20 17:33:11 -05:00
Arthur Barrett
af2bfa9d4e
Saving work in progress on v2 with capa template for annotation problem.
2013-02-20 16:30:19 -05:00
Arthur Barrett
34cc112cfb
Saving work in progress on annotations v2 with classification problems.
2013-02-19 14:18:56 -05:00
Arthur Barrett
72d9c1d7d2
Saving work-in-progress of guided classification exercise.
2013-02-18 19:02:54 -05:00
Arthur Barrett
6b5bf319c3
Style and behavior changes. Added return links to discussions.
2013-02-12 19:08:23 -05:00
Arthur Barrett
7e7911a08d
Changed the markup and js for associating spans with discussion threads. Uses the discussion id now.
2013-02-12 13:24:50 -05:00
Arthur Barrett
a144896154
Style and behavior changes to the header and tooltips.
2013-02-11 16:17:34 -05:00
Arthur Barrett
3a81ed0651
Updated styling and markup.
2013-02-10 19:40:18 -05:00
Arthur Barrett
a9773eb888
Updated markup, styling, and tooltip behavior for displaying instructor comments. Added drag/drop to the comments so the user can organize them as they wish after clicking on the span. When the user hides the annotations, their positions on the screen are remembered so they can be restored later. Also modified the markup so that block content can be displayed.
2013-02-08 20:38:24 -05:00
Arthur Barrett
7ea87793c2
Modified annotatable to retrieve and display instructor comments from span elements. Instructor commentaries are displayed in tooltips with a reply link when the highlighted area is clicked. The commentaries are connected to inline discussion forums by anchors (for now).
2013-02-07 19:51:22 -05:00
Arthur Barrett
45e4c0cfac
Moved discussion thread html to its own template and only scroll when not in view.
2013-02-05 12:37:58 -05:00
Arthur Barrett
0ca7131974
Clicking on annotation span should scroll to the discussion widget.
2013-02-01 16:08:23 -05:00
Arthur Barrett
8f005a5a1f
Moved discussion html into its own method, should probably be in a template.
2013-02-01 13:31:35 -05:00
Arthur Barrett
48bb447fbd
Adding basic annotatable module and related files.
2013-01-31 18:42:11 -05:00
