Added ability to upload transcripts for teachers #23

sendr · 2016-12-08T14:36:52Z

No description provided.

polesye · 2016-12-08T14:44:04Z

video_xblock/static/html/studio_edit.html

@@ -1,5 +1,5 @@
 {% load i18n %}
-<div class="editor-with-buttons">
+<div class="editor-with-buttons xmodule_VideoDescriptor">


why do we need this class?

to use built-in styles

to use built-in styles

Try avoid dependencies with edX. XBlock should be independent as much as possible.

polesye · 2016-12-08T14:44:26Z

video_xblock/static/css/transcripts.css

@@ -0,0 +1,10 @@
+
+.wrapper-translations-settings{


and a whitespace befor {

polesye · 2016-12-08T14:44:50Z

video_xblock/video_xblock.py

@@ -14,6 +15,7 @@
 from xblockutils.studio_editable import StudioEditableXBlockMixin

 from django.template import Template, Context
+from django.conf import settings


try avoid using django settings

polesye · 2016-12-08T14:45:02Z

video_xblock/video_xblock.py

+        scope=Scope.content,
+        display_name=_('Upload transcript'),
+        help=_('Add transcripts in different languages. '
+               'Click below to specify a language and upload an .srt transcript file for that language.')


fix according edx code style

polesye · 2016-12-08T14:47:31Z

it'd be great if you could setup a demo for me

polesye · 2016-12-08T15:17:31Z

video_xblock/static/html/student_view.html

@@ -14,7 +14,7 @@ <h3 class="hd hd-2">{{display_name}}</h3>
 <ul class="wrapper-downloads-custom">
    {% if handout %}
        <li class="video-handout video-download-button-custom">
-            <a href="{{ handout }}" class="download-handout" download="{{ handout_file_name }}">{% trans 'Download Handout' %}</a>
+            <a href="/{{ handout }}" class="download-handout" download="{{ handout_file_name }}">{% trans 'Download Handout' %}</a>


Why don't do it in python?

…e/transcript_upload

…or xblock

polesye · 2016-12-11T12:41:09Z

video_xblock/static/html/studio_edit.html

      <input class="input-file-uploader" name="file" type="file" data-change-field-name="">
    </form>
+
+    <form method="POST" action="/assets/{{ courseKey }}/" class="transcript-uploader-form is-hidden" enctype="multipart/form-data">


why do we need 2 forms? can we use just one?

polesye · 2016-12-11T12:42:06Z

video_xblock/static/js/studio_edit.js

+        var langExists = false;
+        for (var i=0; i < languages.length; i++){
+            if (lang == languages[i].lang){
+                langExists = true


do we need to break ?

polesye · 2016-12-11T12:45:34Z

video_xblock/static/js/studio_edit.js

+        event.preventDefault();
+
+        var $choiserItem = $('.list-settings-item:hidden').clone();
+        $choiserItem.removeClass('hidden');


you should use is-hidden instead of hidden. See https://smacss.com/book/type-state

polesye · 2016-12-11T12:49:21Z

video_xblock/video_xblock.py

+        fragment.add_css(self.resource_string("static/css/transcripts.css"))
+        fragment.add_css(self.render_resource("static/css/studio-main-v1.css",
+                                              path_to_images=path_to_images,
+                                              path_to_fonts=path_to_fonts))


fix alignment

polesye · 2016-12-11T12:50:28Z

video_xblock/video_xblock.py

+
+    def get_url_for(self, field):
+        """
+        It return url for download of file, which is stored in db


polesye · 2016-12-12T11:39:12Z

How does it handle trascript removing?
Replace - Download buttons, not Upload - Download
How do you handle parallel uploading?
add file format validation

polesye · 2016-12-12T10:57:45Z

video_xblock/static/html/studio_edit.html

@@ -9,7 +9,7 @@
          data-default="{% if field.type == 'boolean' %}{{ field.default|yesno:'1,0' }}{% else %}{{ field.default|default_if_none:"" }}{% endif %}"
          data-cast="{{field.type}}"
        >
-          <div class='wrapper-comp-setting {% if field.type == "set" %}metadata-list-enum{% endif %}  {% if field.type == "file_uploader" %}file-uploader{% endif %}'>
+          <div class='wrapper-comp-setting {% if field.type == "set" %}metadata-list-enum{% endif %}  {% if field.type == "file_uploader" %}file-uploader{% endif %}{% if field.type == "transcript_uploader" %}metadata-video-translations{% endif %}'>


can we avoid such changes?

polesye · 2016-12-12T11:16:16Z

video_xblock/static/html/studio_edit.html

+                      </select>
+                      <a href="#" class="remove-action remove-setting" data-value=""><span class="icon fa fa-times-circle" aria-hidden="true"></span><span class="sr">Remove</span></a>
+                      <div class="list-settings-buttons">
+                        <a href="#" class="upload-setting upload-transcript is-hidden" data-change-field-name="{{field.name}}" data-lang-code="" data-lang-label="">{% trans "Upload" %}</a>


remove field.name

polesye · 2016-12-12T11:17:55Z

video_xblock/static/js/studio_edit.js

    var $fileUploader = $('.input-file-uploader', element);
+    var $langChoicer = $('.lang-choiser', element);


polesye · 2016-12-12T11:18:53Z

video_xblock/static/js/studio_edit.js

+        var indexLanguage;
+        for (var i=0; i < languages.length; i++){
+            if (lang == languages[i].lang){
+                indexLanguage = i


polesye · 2016-12-12T11:20:08Z

video_xblock/static/js/studio_edit.js

+            'lang-code': $buttonBlock.data('lang-code'),
+            'lang-label': $buttonBlock.data('lang-label'),
+            'change-field-name': $buttonBlock.data('change-field-name')
+        });


can be removed

polesye · 2016-12-12T11:33:41Z

video_xblock/static/js/studio_edit.js

+    $('.add-transcript', element).on('click', function (event) {
+        event.preventDefault();
+        $(event.currentTarget).addClass('is-disabled');
+        var $choiserItem = $('.list-settings-item:hidden').clone();


choiser -> chosenItem

templateItem

polesye · 2016-12-12T11:36:09Z

video_xblock/static/js/studio_edit.js

+        var lang = $currentBlock.find('option:selected').val();
+        for (var i=0; i < languages.length; i++){
+            if(lang == languages[i].lang){
+                languages.splice(i,1)


Please find more appropriate name for languages. transcriptsValue

Array.filter

polesye · 2016-12-12T11:37:09Z

video_xblock/static/js/studio_edit.js

-        e.preventDefault();
-        runtime.notify('cancel', {});
+        if(!languages.length){
+            $currentBlock.parents('li').removeClass('is-set');


polesye · 2016-12-12T11:37:58Z

video_xblock/video_xblock.py

+                                              path_to_images=path_to_images,
+                                              path_to_fonts=path_to_fonts
+                                              )
+                         )


fix according to edX code style

http://edx.readthedocs.io/projects/edx-developer-guide/en/latest/style_guides/python_guidelines.html

polesye · 2016-12-12T11:41:56Z

video_xblock/video_xblock.py

+
+    def get_url_for(self, field):
+        """
+        It returns url for download of file, which is stored in db


Returns downloaded asset url.

z4y4ts · 2016-12-13T17:16:52Z

This code was merged in PR #25

Release v0.9.4: player controls fixes

Added ability to upload transcripts for teachers

35baa8d

sendr assigned dorosh, z4y4ts, polesye and xahgmah Dec 8, 2016

polesye suggested changes Dec 8, 2016

View reviewed changes

sendr added 4 commits December 8, 2016 17:41

remarks correction

a9be2a1

Merge branch 'dev' of github.com:raccoongang/xblock-video into featur…

700ca49

…e/transcript_upload

remarks correction

1a9f691

Added language label in transcripts field and css, fonts and images f…

4b46e85

…or xblock

polesye suggested changes Dec 11, 2016

View reviewed changes

sendr added 4 commits December 11, 2016 16:32

refactoring of studio_edit.js with minor bug fixes

122f72b

remarks correction

2f4ef7e

remarks correction

92a3f92

bug fix

0ac3e3f

polesye suggested changes Dec 12, 2016

View reviewed changes

sendr added 3 commits December 12, 2016 19:05

remarks correction

15a46fa

remarks correction

968ee77

remarks correction

d7c6a50

z4y4ts closed this Dec 13, 2016

z4y4ts reopened this Dec 13, 2016

z4y4ts approved these changes Dec 13, 2016

View reviewed changes

z4y4ts closed this Dec 13, 2016

z4y4ts mentioned this pull request Dec 15, 2016

Download and upload handout file on local storage and Amazon S3 #17

Closed

sendr deleted the feature/transcript_upload branch February 24, 2017 15:38

dyudyunov pushed a commit that referenced this pull request Jan 13, 2022

Merge pull request #23 from raccoongang/master

f99a66b

Release v0.9.4: player controls fixes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added ability to upload transcripts for teachers #23

Added ability to upload transcripts for teachers #23

sendr commented Dec 8, 2016

polesye Dec 8, 2016

sendr Dec 8, 2016

polesye Dec 8, 2016

polesye Dec 8, 2016

polesye Dec 8, 2016

polesye Dec 8, 2016

polesye commented Dec 8, 2016

polesye Dec 8, 2016

polesye Dec 11, 2016

polesye Dec 11, 2016

polesye Dec 11, 2016

polesye Dec 11, 2016

polesye Dec 11, 2016

polesye commented Dec 12, 2016

polesye Dec 12, 2016

polesye Dec 12, 2016

polesye Dec 12, 2016

polesye Dec 12, 2016

polesye Dec 12, 2016

polesye Dec 12, 2016

polesye Dec 12, 2016

polesye Dec 12, 2016

polesye Dec 12, 2016

polesye Dec 12, 2016

polesye Dec 12, 2016

polesye Dec 12, 2016

polesye Dec 12, 2016

z4y4ts commented Dec 13, 2016

		var $fileUploader = $('.input-file-uploader', element);
		var $langChoicer = $('.lang-choiser', element);

Added ability to upload transcripts for teachers #23

Added ability to upload transcripts for teachers #23

Conversation

sendr commented Dec 8, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

polesye commented Dec 8, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

polesye commented Dec 12, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

z4y4ts commented Dec 13, 2016