Diacritic Plugin for Annotator Tool: Pull-request Fixes

Making sure extension comes after annotator css

common/lib/xmodule/xmodule/textannotation_module.py

@@ -48,20 +48,20 @@ class AnnotatableFields(object):
         default='None',
     )
     annotation_storage_url = String(
-        help="Location of Annotation backend", 
-        scope=Scope.settings, 
-        default="http://your_annotation_storage.com", 
-        display_name="Url for Annotation Storage"
+        help=_("Location of Annotation backend"),
+        scope=Scope.settings,
+        default="http://your_annotation_storage.com",
+        display_name=_("Url for Annotation Storage"),
     )
     annotation_token_secret = String(
-        help="Secret string for annotation storage", 
-        scope=Scope.settings, 
-        default="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx", 
-        display_name="Secret Token String for Annotation"
+        help=_("Secret string for annotation storage"),
+        scope=Scope.settings,
+        default="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+        display_name=_("Secret Token String for Annotation"),
     )
     diacritics = String(
-        display_name="Diacritic Marks",
-        help= "Add diacritic marks to be added to a text using the comma-separated form, i.e. markname;urltomark;baseline,markname2;urltomark2;baseline2",
+        display_name=_("Diacritic Marks"),
+        help=_("Add diacritic marks to be added to a text using the comma-separated form, i.e. markname;urltomark;baseline,markname2;urltomark2;baseline2"),
         scope=Scope.settings,
         default='',
     )

common/lib/xmodule/xmodule/videoannotation_module.py

@@ -34,10 +34,29 @@ class AnnotatableFields(object):
         scope=Scope.settings,
         default=_('Video Annotation'),
     )
-    sourceurl = String(help=_("The external source URL for the video."), display_name=_("Source URL"), scope=Scope.settings, default="http://video-js.zencoder.com/oceans-clip.mp4")
-    poster_url = String(help=_("Poster Image URL"), display_name=_("Poster URL"), scope=Scope.settings, default="")
-    annotation_storage_url = String(help=_("Location of Annotation backend"), scope=Scope.settings, default="http://your_annotation_storage.com", display_name=_("Url for Annotation Storage"))
-    annotation_token_secret = String(help=_("Secret string for annotation storage"), scope=Scope.settings, default="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx", display_name=_("Secret Token String for Annotation"))
+    sourceurl = String(
+        help=_("The external source URL for the video."),
+        display_name=_("Source URL"),
+        scope=Scope.settings, default="http://video-js.zencoder.com/oceans-clip.mp4"
+    )
+    poster_url = String(
+        help=_("Poster Image URL"),
+        display_name=_("Poster URL"),
+        scope=Scope.settings,
+        default=""
+    )
+    annotation_storage_url = String(
+        help=_("Location of Annotation backend"),
+        scope=Scope.settings,
+        default="http://your_annotation_storage.com", 
+        display_name=_("Url for Annotation Storage"),
+    )
+    annotation_token_secret = String(
+        help=_("Secret string for annotation storage"),
+        scope=Scope.settings,
+        default="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+        display_name=_("Secret Token String for Annotation")
+    )
 
 class VideoAnnotationModule(AnnotatableFields, XModule):
     '''Video Annotation Module'''

lms/envs/common.py

@@ -871,8 +871,8 @@ PIPELINE_CSS = {
             'css/vendor/jquery.qtip.min.css',
             'css/vendor/responsive-carousel/responsive-carousel.css',
             'css/vendor/responsive-carousel/responsive-carousel.slide.css',
-            'css/vendor/ova/edx-annotator.css',
             'css/vendor/ova/annotator.css',
+            'css/vendor/ova/edx-annotator.css',
             'css/vendor/ova/video-js.min.css',
             'css/vendor/ova/rangeslider.css',
             'css/vendor/ova/share-annotator.css',

lms/templates/textannotation.html

@@ -148,6 +148,9 @@ ${static.css(group='style-vendor-tinymce-skin', raw=True)}
             highlightTags:{
                 tag: "${tag}",
             },
+            diacriticMarks:{
+                diacritics: "${diacritic_marks}"
+            }
         },
         optionsVideoJS: {techOrder: ["html5","flash","youtube"]},
         optionsRS: {},