diff --git a/AUTHORS b/AUTHORS index ec1ae352..ccc94ca8 100644 --- a/AUTHORS +++ b/AUTHORS @@ -10,6 +10,7 @@ * Arne Schauf * Benjamin Wohlwend * Bertrand Bordage +* Bryan Marty * Claudio Bartolini * Cucu * Dan Johnson @@ -49,4 +50,4 @@ * Toni Röyhy * Venelin Stoykov * Waldecir Loureiro dos Santos Filho -* Yann Malet \ No newline at end of file +* Yann Malet diff --git a/README.rst b/README.rst index c4ac610a..ed403938 100644 --- a/README.rst +++ b/README.rst @@ -23,7 +23,7 @@ Dependencies * Django >= 1.8 * django-cms >= 3.1 * django-sekizai >= 0.4.2 -* easy_thumbnails >= 1.0 +* easy_thumbnails >= 2.4.1 * django-appconf * djangocms-attributes-field diff --git a/cmsplugin_filer_file/cms_plugins.py b/cmsplugin_filer_file/cms_plugins.py index 44270bfe..0c16f334 100644 --- a/cmsplugin_filer_file/cms_plugins.py +++ b/cmsplugin_filer_file/cms_plugins.py @@ -58,4 +58,5 @@ def icon_src(self, instance): return file_icon return static("filer/icons/file_%sx%s.png" % (32, 32,)) + plugin_pool.register_plugin(FilerFilePlugin) diff --git a/cmsplugin_filer_folder/templates/cmsplugin_filer_folder/plugins/folder/default.html b/cmsplugin_filer_folder/templates/cmsplugin_filer_folder/plugins/folder/default.html index b43e97d8..2ea17643 100644 --- a/cmsplugin_filer_folder/templates/cmsplugin_filer_folder/plugins/folder/default.html +++ b/cmsplugin_filer_folder/templates/cmsplugin_filer_folder/plugins/folder/default.html @@ -1,4 +1,4 @@ -{% load i18n thumbnail sekizai_tags staticfiles %} +{% load i18n easy_thumbnails_tags sekizai_tags staticfiles %} {% addtoblock "css" %}{% endaddtoblock "css" %} {% addtoblock "js" %}{% endaddtoblock "js" %} {% addtoblock "js" %} diff --git a/cmsplugin_filer_image/cms_plugins.py b/cmsplugin_filer_image/cms_plugins.py index 0c7673d7..cc4cd997 100644 --- a/cmsplugin_filer_image/cms_plugins.py +++ b/cmsplugin_filer_image/cms_plugins.py @@ -144,4 +144,6 @@ def icon_src(self, instance): return thumbnail.url else: return static("filer/icons/missingfile_%sx%s.png" % (32, 32,)) + + plugin_pool.register_plugin(FilerImagePlugin) diff --git a/cmsplugin_filer_image/templates/cmsplugin_filer_image/plugins/image/default.html b/cmsplugin_filer_image/templates/cmsplugin_filer_image/plugins/image/default.html index 798e3dcb..a48ae7f8 100644 --- a/cmsplugin_filer_image/templates/cmsplugin_filer_image/plugins/image/default.html +++ b/cmsplugin_filer_image/templates/cmsplugin_filer_image/plugins/image/default.html @@ -1,4 +1,4 @@ -{% load thumbnail filer_tags filer_image_tags %}{% spaceless %} +{% load easy_thumbnails_tags filer_tags filer_image_tags %}{% spaceless %} {% comment %} You may change the image size for special cases in your project by overriding this template. There are a few size manipulation filters for this in diff --git a/cmsplugin_filer_teaser/cms_plugins.py b/cmsplugin_filer_teaser/cms_plugins.py index 3a92d065..263bcbe8 100644 --- a/cmsplugin_filer_teaser/cms_plugins.py +++ b/cmsplugin_filer_teaser/cms_plugins.py @@ -97,4 +97,5 @@ def get_render_template(self, context, instance, placeholder): )) return template + plugin_pool.register_plugin(FilerTeaserPlugin) diff --git a/cmsplugin_filer_teaser/templates/cmsplugin_filer_teaser/plugins/teaser/default.html b/cmsplugin_filer_teaser/templates/cmsplugin_filer_teaser/plugins/teaser/default.html index 1c9f2b4d..44574225 100644 --- a/cmsplugin_filer_teaser/templates/cmsplugin_filer_teaser/plugins/teaser/default.html +++ b/cmsplugin_filer_teaser/templates/cmsplugin_filer_teaser/plugins/teaser/default.html @@ -1,4 +1,4 @@ -{% load i18n thumbnail %} +{% load i18n easy_thumbnails_tags %}

{{ instance.title }}

{% if instance.image or instance.image_url %} diff --git a/cmsplugin_filer_video/cms_plugins.py b/cmsplugin_filer_video/cms_plugins.py index ba6102c9..0fa74188 100644 --- a/cmsplugin_filer_video/cms_plugins.py +++ b/cmsplugin_filer_video/cms_plugins.py @@ -59,4 +59,5 @@ def render(self, context, instance, placeholder): def icon_src(self, instance): return static("filer/icons/video_%sx%s.png" % (32, 32,)) + plugin_pool.register_plugin(FilerVideoPlugin) diff --git a/setup.py b/setup.py index d5017eed..266e42f3 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ "django-cms >= 3.1", "django-sekizai >= 0.4.2", - "easy_thumbnails >= 1.0", + "easy_thumbnails >= 2.4.1", "django-appconf", "djangocms-attributes-field>=0.1.1", ], diff --git a/test_settings.py b/test_settings.py index 3e57d9c0..41e7bb2d 100644 --- a/test_settings.py +++ b/test_settings.py @@ -60,5 +60,6 @@ def run(): from djangocms_helper import runner runner.cms('cmsplugin_filer_file') + if __name__ == "__main__": run()