Merge branch 'master' into patch-3

wagtailvideos/models.py

@@ -189,6 +189,12 @@ class AbstractVideo(CollectionMember, index.Indexed, models.Model):
     def get_current_transcodes(self):
         return self.transcodes.exclude(processing=True).filter(error_message__exact='')
 
+    def get_tracks(self):
+        tracks = []
+        if hasattr(self, 'track_listing'):
+            tracks = [t.track_tag() for t in self.track_listing.tracks.all()]
+        return tracks
+
     def video_tag(self, attrs=None):
         if attrs is None:
             attrs = {}
@@ -207,12 +213,8 @@ class AbstractVideo(CollectionMember, index.Indexed, models.Model):
 
         sources.append("<p>Sorry, your browser doesn't support playback for this video</p>")
 
-        tracks = []
-        if hasattr(self, 'track_listing'):
-            tracks = [t.track_tag() for t in self.track_listing.tracks.all()]
-
         return mark_safe(
-            "<video {0}>\n{1}\n{2}\n</video>".format(flatatt(attrs), "\n".join(sources), "\n".join(tracks)))
+            "<video {0}>\n{1}\n{2}\n</video>".format(flatatt(attrs), "\n".join(sources), "\n".join(self.get_tracks())))
 
     def do_transcode(self, media_format, quality):
         transcode, created = self.transcodes.get_or_create(

wagtailvideos/templates/wagtailvideos/videos/edit.html

@@ -78,7 +78,6 @@
             </div>
         </div>
         <div class="row" style='margin-top: 2em;'>
-        {% block transcode %}
         {% if can_transcode %}
             <h2 class="u-text-transform-uppercase">{% trans "Transcodes" %}</h2>
             <p>{% trans "If you wish to generate HTML5 compliant transcodes use the form below. This may take a while depending on the length of the video." %}</p>
@@ -116,7 +115,6 @@
             <br/><br/>
             <span class='transcode-error'>{% trans "Ffmpeg is not found on your server. Please install if you wish to transcode videos into an HTML5 video compliant format." %}</span>
         {% endif %}
-        {% endblock %}
         {% if tracks_action_url %}
             <h2 class="u-text-transform-uppercase">{% trans "Tracks" %}</h2>
             <p>{% trans 'You can add/edit subtitles or accessibility captions for this video. For information about the filetype that should be used see the mozilla docs on <a href="https://developer.mozilla.org/en-US/docs/Web/API/WebVTT_API">WebVTT</a>' %}</p>