diff options
| author | Rodney Ewing <ewing.rj@gmail.com> | 2013-08-28 08:21:20 -0700 |
|---|---|---|
| committer | Rodney Ewing <ewing.rj@gmail.com> | 2013-08-29 08:22:16 -0700 |
| commit | 3f5951846390eaefd7a89d5c4038af139785adf8 (patch) | |
| tree | d9cad96d28ec59afcccb069ed4b4d4645cbd05d7 | |
| parent | 738cc499261e60a111f4ab76ebf94576d448e01c (diff) | |
| download | mediagoblin-3f5951846390eaefd7a89d5c4038af139785adf8.tar.lz mediagoblin-3f5951846390eaefd7a89d5c4038af139785adf8.tar.xz mediagoblin-3f5951846390eaefd7a89d5c4038af139785adf8.zip | |
pdf media_type now have their own config_spec.ini
| -rw-r--r-- | mediagoblin/config_spec.ini | 4 | ||||
| -rw-r--r-- | mediagoblin/media_types/pdf/config_spec.ini | 5 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/media_displays/pdf.html | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini index 9ad44fc6..43e1898c 100644 --- a/mediagoblin/config_spec.ini +++ b/mediagoblin/config_spec.ini @@ -104,10 +104,6 @@ max_height = integer(default=640) max_width = integer(default=180) max_height = integer(default=180) -[media_type:mediagoblin.media_types.pdf] -pdf_js = boolean(default=True) - - [celery] # default result stuff CELERY_RESULT_BACKEND = string(default="database") diff --git a/mediagoblin/media_types/pdf/config_spec.ini b/mediagoblin/media_types/pdf/config_spec.ini new file mode 100644 index 00000000..c8a12cba --- /dev/null +++ b/mediagoblin/media_types/pdf/config_spec.ini @@ -0,0 +1,5 @@ +[plugin_spec] +pdf_js = boolean(default=True) + + + 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 %} |