diff options
| author | Boris Bobrov <breton@cynicmansion.ru> | 2018-07-10 18:29:30 +0200 |
|---|---|---|
| committer | Boris Bobrov <breton@cynicmansion.ru> | 2018-07-10 18:29:30 +0200 |
| commit | e08de70757b6f973bc2955f1b3292d383a19b21d (patch) | |
| tree | f60ad20e55538e1945cbc61284b09540dd601975 /mediagoblin/templates | |
| parent | 588162b861f4993ee8412b14601b215505134bfc (diff) | |
| parent | 7ab18019782b285a5bf9fc79227e0d0d4896398a (diff) | |
| download | mediagoblin-e08de70757b6f973bc2955f1b3292d383a19b21d.tar.lz mediagoblin-e08de70757b6f973bc2955f1b3292d383a19b21d.tar.xz mediagoblin-e08de70757b6f973bc2955f1b3292d383a19b21d.zip | |
Merge remote-tracking branch 'gsoc2016/Subtitle-1'
Diffstat (limited to 'mediagoblin/templates')
| -rw-r--r-- | mediagoblin/templates/mediagoblin/media_displays/video.html | 4 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media.html | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/mediagoblin/templates/mediagoblin/media_displays/video.html b/mediagoblin/templates/mediagoblin/media_displays/video.html index 5aac3529..8e3a202f 100644 --- a/mediagoblin/templates/mediagoblin/media_displays/video.html +++ b/mediagoblin/templates/mediagoblin/media_displays/video.html @@ -60,6 +60,10 @@ {% else %} type="{{ media.media_manager['default_webm_type'] }}" {% endif %} /> + {%- for subtitle in media.subtitle_files %} + <track src="{{ request.app.public_store.file_url(subtitle.filepath) }}" + label = "{{ subtitle.name }}" kind="subtitles" > + {%- endfor %} <div class="no_html5"> {%- trans -%}Sorry, this video will not work because your web browser does not support HTML5 diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index ce19717f..b93da06e 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -233,6 +233,7 @@ </a> </p> {%- endif %} + {% template_hook("subtitle_sidebar") %} {% block mediagoblin_sidebar %} {% endblock %} |