From: Jan Szejko Date: Tue, 8 Nov 2016 16:35:03 +0000 (+0100) Subject: adapt to new migdal and fnpdjango X-Git-Url: https://git.mdrn.pl/prawokultury.git/commitdiff_plain/0a08745958649d32c95b1a5da115dde92614c629?ds=sidebyside adapt to new migdal and fnpdjango --- diff --git a/events/templates/events/event_list.html b/events/templates/events/event_list.html index b6dd773..ad2a92c 100755 --- a/events/templates/events/event_list.html +++ b/events/templates/events/event_list.html @@ -3,7 +3,7 @@ {% load i18n pagination_tags fnp_prevnext %} {% load events_tags %} -{% block "body" %} +{% block body %}

{% trans "Events" %}

{% autopaginate object_list 10 %} diff --git a/prawokultury/settings.d/50-static.py b/prawokultury/settings.d/50-static.py index a6af4e6..031658c 100644 --- a/prawokultury/settings.d/50-static.py +++ b/prawokultury/settings.d/50-static.py @@ -9,7 +9,7 @@ STATICFILES_FINDERS = ( # 'django.contrib.staticfiles.finders.DefaultStorageFinder', ) -STATICFILES_STORAGE = 'fnpdjango.utils.pipeline_storage.GzipPipelineCachedStorage' +STATICFILES_STORAGE = 'fnpdjango.pipeline_storage.GzipPipelineCachedStorage' PIPELINE_CSS_COMPRESSOR = None PIPELINE_JS_COMPRESSOR = None PIPELINE_CSS = { diff --git a/prawokultury/templates/404.html b/prawokultury/templates/404.html index 62bbbe8..1ef6711 100644 --- a/prawokultury/templates/404.html +++ b/prawokultury/templates/404.html @@ -2,10 +2,10 @@ {% load i18n %} -{% block "titleextra" %}{% trans "Page not found" %} :: {% endblock %} +{% block titleextra %}{% trans "Page not found" %} :: {% endblock %} -{% block "body" %} +{% block body %}

{% trans "Page not found" %}

diff --git a/prawokultury/templates/base.html b/prawokultury/templates/base.html index a7ba6e8..e479416 100644 --- a/prawokultury/templates/base.html +++ b/prawokultury/templates/base.html @@ -8,19 +8,19 @@ {% load piwik_tags %} - {% block "titleextra" %}{% endblock %}{% trans "Right to Culture" %} + {% block titleextra %}{% endblock %}{% trans "Right to Culture" %} {% compressed_css 'base' %} - {% block "extra_css" %}{% endblock %} + {% block extra_css %}{% endblock %} - - + + - - - + + + - {% block "headextra" %}{% endblock %} + {% block headextra %}{% endblock %} {% load fnp_annoy %}{% annoy %} @@ -54,7 +54,7 @@