Merge pull request #2299 from lduarte1991/master

Text and Video Annotation Modules - First Iteration
2014-01-27 11:18:32 -08:00
parent 78c85ea3b2 7e2652b5a8
commit cd7f1d92a1
79 changed files with 25267 additions and 40 deletions
--- a/cms/djangoapps/contentstore/tests/test_contentstore.py
+++ b/cms/djangoapps/contentstore/tests/test_contentstore.py
@@ -146,6 +146,8 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
        # response HTML
        self.check_components_on_page(ADVANCED_COMPONENT_TYPES, ['Word cloud',
                                                                 'Annotation',
+                                                                 'Text Annotation',
+                                                                 'Video Annotation',
                                                                 'Open Response Assessment',
                                                                 'Peer Grading Interface'])

--- a/cms/djangoapps/contentstore/views/component.py
+++ b/cms/djangoapps/contentstore/views/component.py
@@ -52,6 +52,8 @@ else:

    ADVANCED_COMPONENT_TYPES = [
        'annotatable',
+        'textannotation',  # module for annotating text (with annotation table)
+        'videoannotation',  # module for annotating video (with annotation table)
        'word_cloud',
        'graphical_slider_tool',
        'lti',