pdf media_type now have their own config_spec.ini

diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini
index 9ad44fc6a4017d1a9c775f5675894d3fa0abb6ff..43e1898cae29b76489ca858b7614c3e0220a7d00 100644 (file)
--- 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 (file)
index 0000000..c8a12cb
--- /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 9319e87cee7e27178856f0e6300b06a14414ca73..a615cba6f5a014aeb23d5707ccceebeddd8399eb 100644 (file)
--- 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 %}