diff options
| -rw-r--r-- | mediagoblin/config_spec.ini | 2 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/media_displays/video.html | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini index 0a8da73e..6ded23fd 100644 --- a/mediagoblin/config_spec.ini +++ b/mediagoblin/config_spec.ini @@ -81,7 +81,7 @@ celery_setup_elsewhere = boolean(default=False) # Whether or not users are able to upload files of any filetype with # their media entries -- This is useful if you want to provide the # source files for a media file but can also be a HUGE security risk. -allow_attachments = boolean(default=False) +allow_attachments = boolean(default=True) # Cookie stuff csrf_cookie_name = string(default='mediagoblin_csrftoken') diff --git a/mediagoblin/templates/mediagoblin/media_displays/video.html b/mediagoblin/templates/mediagoblin/media_displays/video.html index 5aac3529..c9a27702 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 attachment in media.attachment_files %} + <track src="{{ request.app.public_store.file_url(attachment.filepath) }}" + label = "{{- attachment.name -}}" kind="subtitles" > + {%- endfor %} <div class="no_html5"> {%- trans -%}Sorry, this video will not work because your web browser does not support HTML5 |