From 22ead871eee2d6bd9d096158d5237403d9da4f38 Mon Sep 17 00:00:00 2001 From: Bryan Marty Date: Sun, 25 Jun 2017 00:43:28 -0700 Subject: [PATCH] Require easy_thumbnails 2.4.1 and load easy_thumbnails_tags (#378) * Require easy_thumbnails 2.4.1 and load easy_thumbnails_tags --- AUTHORS.rst | 1 + HISTORY.rst | 1 + .../templates/djangocms_blog/includes/blog_item.html | 2 +- .../templates/djangocms_blog/includes/blog_meta.html | 2 +- djangocms_blog/templates/djangocms_blog/plugins/authors.html | 4 ++-- djangocms_blog/templates/djangocms_blog/post_detail.html | 2 +- .../templates/djangocms_blog/post_instant_article.html | 2 +- djangocms_blog/templates/djangocms_blog/post_list.html | 2 +- setup.py | 1 + 9 files changed, 10 insertions(+), 7 deletions(-) diff --git a/AUTHORS.rst b/AUTHORS.rst index d18d10c..83a90c4 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -11,6 +11,7 @@ Contributors ------------ * alex +* Bryan Marty * Carlo Ascani * Christoph Reimers * cluster-master diff --git a/HISTORY.rst b/HISTORY.rst index 5901fe0..3e8c4a5 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -22,6 +22,7 @@ History * Improved admin filtering. * Added featured date to post. * Fixed issue with urls in sitemap if apphook is not published +* Use the easy_thumbnails_tags template tag. Require easy_thumbnails >= 2.4.1 ******************* diff --git a/djangocms_blog/templates/djangocms_blog/includes/blog_item.html b/djangocms_blog/templates/djangocms_blog/includes/blog_item.html index d4abd15..8e3b4be 100644 --- a/djangocms_blog/templates/djangocms_blog/includes/blog_item.html +++ b/djangocms_blog/templates/djangocms_blog/includes/blog_item.html @@ -1,4 +1,4 @@ -{% load i18n thumbnail cms_tags %} +{% load i18n easy_thumbnails_tags cms_tags %}
diff --git a/djangocms_blog/templates/djangocms_blog/includes/blog_meta.html b/djangocms_blog/templates/djangocms_blog/includes/blog_meta.html index df1e6c5..9eaec49 100644 --- a/djangocms_blog/templates/djangocms_blog/includes/blog_meta.html +++ b/djangocms_blog/templates/djangocms_blog/includes/blog_meta.html @@ -1,4 +1,4 @@ -{% load i18n thumbnail cms_tags %} +{% load i18n easy_thumbnails_tags cms_tags %}
    {% if post.author %} diff --git a/djangocms_blog/templates/djangocms_blog/plugins/authors.html b/djangocms_blog/templates/djangocms_blog/plugins/authors.html index 09276c7..2e5b5a2 100644 --- a/djangocms_blog/templates/djangocms_blog/plugins/authors.html +++ b/djangocms_blog/templates/djangocms_blog/plugins/authors.html @@ -1,4 +1,4 @@ -{% load i18n thumbnail %}{% spaceless %} +{% load i18n easy_thumbnails_tags %}{% spaceless %}

    {% trans "Authors" %}

      @@ -16,4 +16,4 @@ {% endfor %}
    -{% endspaceless %} \ No newline at end of file +{% endspaceless %} diff --git a/djangocms_blog/templates/djangocms_blog/post_detail.html b/djangocms_blog/templates/djangocms_blog/post_detail.html index f46dc73..e0a928c 100644 --- a/djangocms_blog/templates/djangocms_blog/post_detail.html +++ b/djangocms_blog/templates/djangocms_blog/post_detail.html @@ -1,5 +1,5 @@ {% extends "djangocms_blog/base.html" %} -{% load i18n thumbnail cms_tags %} +{% load i18n easy_thumbnails_tags cms_tags %} {% block canonical_url %}{% endblock canonical_url %} {% block title %}{{ post.get_title }}{% endblock %} diff --git a/djangocms_blog/templates/djangocms_blog/post_instant_article.html b/djangocms_blog/templates/djangocms_blog/post_instant_article.html index 499490d..f4be163 100644 --- a/djangocms_blog/templates/djangocms_blog/post_instant_article.html +++ b/djangocms_blog/templates/djangocms_blog/post_instant_article.html @@ -1,4 +1,4 @@ -{% load thumbnail cms_tags %} +{% load easy_thumbnails_tags cms_tags %} diff --git a/djangocms_blog/templates/djangocms_blog/post_list.html b/djangocms_blog/templates/djangocms_blog/post_list.html index 74f405d..a36625e 100644 --- a/djangocms_blog/templates/djangocms_blog/post_list.html +++ b/djangocms_blog/templates/djangocms_blog/post_list.html @@ -1,5 +1,5 @@ {% extends "djangocms_blog/base.html" %} -{% load i18n thumbnail %}{% spaceless %} +{% load i18n easy_thumbnails_tags %}{% spaceless %} {% block canonical_url %}{% endblock canonical_url %} diff --git a/setup.py b/setup.py index 55bce8d..da1a139 100755 --- a/setup.py +++ b/setup.py @@ -36,6 +36,7 @@ setup( 'django-taggit-autosuggest', 'djangocms-text-ckeditor', 'cmsplugin-filer>=1.0', + 'easy-thumbnails>=2.4.1', 'django-meta>=1.2', 'django-meta-mixin>=0.3', 'aldryn-apphooks-config>=0.2.6',