diff options
| author | Aditi Mittal <aditi.iitr@gmail.com> | 2013-08-31 12:34:02 +0530 |
|---|---|---|
| committer | Aditi Mittal <aditi.iitr@gmail.com> | 2013-08-31 12:34:02 +0530 |
| commit | a7f02e9514ca9256412d138c9bba89b299431efa (patch) | |
| tree | 351079460e45f2ee50fbdb363473f5708857171c /mediagoblin/templates | |
| parent | dc56835a79d8b77fd90064711ca745583f38a111 (diff) | |
| parent | 6b61a51e4527379a26b2c5cfd892dd351bce62bb (diff) | |
| download | mediagoblin-a7f02e9514ca9256412d138c9bba89b299431efa.tar.lz mediagoblin-a7f02e9514ca9256412d138c9bba89b299431efa.tar.xz mediagoblin-a7f02e9514ca9256412d138c9bba89b299431efa.zip | |
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/templates')
| -rw-r--r-- | mediagoblin/templates/mediagoblin/media_displays/pdf.html | 2 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/media_displays/video.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/templates/mediagoblin/media_displays/pdf.html b/mediagoblin/templates/mediagoblin/media_displays/pdf.html index 9319e87c..a615cba6 100644 --- a/mediagoblin/templates/mediagoblin/media_displays/pdf.html +++ b/mediagoblin/templates/mediagoblin/media_displays/pdf.html @@ -29,7 +29,7 @@ media.media_files['original']) %} {% endif %} -{% set pdf_js = global_config.get('media_type:mediagoblin.media_types.pdf', {}).get('pdf_js', False) %} +{% set pdf_js = global_config['plugins'].get('mediagoblin.media_types.pdf', {}).get('pdf_js', False) %} {% if pdf_js %} {% block mediagoblin_html_tag %} diff --git a/mediagoblin/templates/mediagoblin/media_displays/video.html b/mediagoblin/templates/mediagoblin/media_displays/video.html index 5c52f9f0..e35169bf 100644 --- a/mediagoblin/templates/mediagoblin/media_displays/video.html +++ b/mediagoblin/templates/mediagoblin/media_displays/video.html @@ -30,7 +30,7 @@ {% set display_type, display_path = media.get_display_media() %} <video controls - {% if global_config['media_type:mediagoblin.media_types.video']['auto_play'] %}autoplay{% endif %} + {% if global_config['plugins']['mediagoblin.media_types.video']['auto_play'] %}autoplay{% endif %} preload="auto" class="video-js vjs-mg-skin" data-setup='{"height": {{ media.media_data.height }}, "width": {{ media.media_data.width }} }'> |