{% block title %}{% trans "Platforma Redakcyjna" %} :: {% block titleextra %}{% endblock %}{% endblock title %}

From: Radek Czajka Date: Thu, 19 Mar 2015 15:32:05 +0000 (+0100) Subject: Upgrade pipeline, sorl.thumbnail. X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/ea7deea0bd4f5ca47a8e6a27f6ab640c594fdf78?ds=inline Upgrade pipeline, sorl.thumbnail. --- diff --git a/apps/catalogue/templates/catalogue/base.html b/apps/catalogue/templates/catalogue/base.html index 9a56d726..466abe9e 100644 --- a/apps/catalogue/templates/catalogue/base.html +++ b/apps/catalogue/templates/catalogue/base.html @@ -1,10 +1,10 @@ -{% load compressed i18n %} +{% load pipeline i18n %} {% load catalogue %} - {% compressed_css 'catalogue' %} + {% stylesheet 'catalogue' %} {% block title %}{% trans "Platforma Redakcyjna" %} :: {% block titleextra %}{% endblock %}{% endblock title %} {% block add_css %}{% endblock %} @@ -45,7 +45,7 @@ -{% compressed_js 'catalogue' %} +{% javascript 'catalogue' %} {% block add_js %}{% endblock %} {% block extrabody %} {% endblock %} diff --git a/apps/catalogue/templates/catalogue/book_html.html b/apps/catalogue/templates/catalogue/book_html.html index af4cfa79..518811ee 100755 --- a/apps/catalogue/templates/catalogue/book_html.html +++ b/apps/catalogue/templates/catalogue/book_html.html @@ -1,5 +1,4 @@ {% load i18n %} -{% load compressed %} diff --git a/apps/catalogue/templates/catalogue/book_text.html b/apps/catalogue/templates/catalogue/book_text.html index b9cc2f0c..2e484483 100644 --- a/apps/catalogue/templates/catalogue/book_text.html +++ b/apps/catalogue/templates/catalogue/book_text.html @@ -1,13 +1,13 @@ -{% load i18n compressed %} +{% load i18n pipeline %} {% trans "Redakcja" %} :: {{ book.title }} - {% compressed_css 'book' %} + {% stylesheet 'book' %} - {% compressed_js 'book' %} + {% javascript 'book' %}

diff --git a/apps/catalogue/templates/catalogue/document_list.html b/apps/catalogue/templates/catalogue/document_list.html index f0bd50c8..fe3598e1 100644 --- a/apps/catalogue/templates/catalogue/document_list.html +++ b/apps/catalogue/templates/catalogue/document_list.html @@ -2,17 +2,17 @@ {% load i18n %} {% load catalogue book_list %} -{% load compressed %} +{% load pipeline %} {% block titleextra %}{% trans "Book list" %}{% endblock %} {% block add_js %} -{% compressed_js 'book_list' %} +{% javascript 'book_list' %} {% endblock %} {% block add_css %} -{% compressed_css 'book_list' %} +{% stylesheet 'book_list' %} {% endblock %} {% block content %} diff --git a/apps/catalogue/templates/catalogue/image_list.html b/apps/catalogue/templates/catalogue/image_list.html index a5e35f7e..4ce1668a 100755 --- a/apps/catalogue/templates/catalogue/image_list.html +++ b/apps/catalogue/templates/catalogue/image_list.html @@ -2,18 +2,18 @@ {% load i18n %} {% load catalogue book_list %} -{% load compressed %} +{% load pipeline %} {% block titleextra %}{% trans "Image list" %}{% endblock %} {% block add_js %} -{% compressed_js 'book_list' %} +{% javascript 'book_list' %} {% endblock %} {% block add_css %} -{% compressed_css 'book_list' %} +{% stylesheet 'book_list' %} {% endblock %} diff --git a/apps/catalogue/templates/catalogue/my_page.html b/apps/catalogue/templates/catalogue/my_page.html index 00df71c9..d3347503 100755 --- a/apps/catalogue/templates/catalogue/my_page.html +++ b/apps/catalogue/templates/catalogue/my_page.html @@ -2,14 +2,14 @@ {% load i18n %} {% load catalogue book_list wall %} -{% load compressed %} +{% load pipeline %} {% block add_js %} -{% compressed_js 'book_list' %} +{% javascript 'book_list' %} {% endblock %} {% block add_css %} -{% compressed_css 'book_list' %} +{% stylesheet 'book_list' %} {% endblock %} {% block titleextra %}{% trans "My page" %}{% endblock %} diff --git a/apps/wiki/templates/wiki/document_details_base.html b/apps/wiki/templates/wiki/document_details_base.html index 891e9e85..8cd603bb 100644 --- a/apps/wiki/templates/wiki/document_details_base.html +++ b/apps/wiki/templates/wiki/document_details_base.html @@ -3,15 +3,15 @@ {% block titleextra %}{{ chunk.pretty_title }}{% endblock %} {% block extrahead %} -{% load compressed %} -{% compressed_css 'detail' %} +{% load pipeline %} +{% stylesheet 'detail' %} {% endblock %} {% block extrabody %} -{% compressed_js 'detail' %} +{% javascript 'detail' %} {% endblock %} {% block maincontent %} diff --git a/apps/wiki_img/templates/wiki_img/document_details_base.html b/apps/wiki_img/templates/wiki_img/document_details_base.html index 642c9163..0bb58b2d 100644 --- a/apps/wiki_img/templates/wiki_img/document_details_base.html +++ b/apps/wiki_img/templates/wiki_img/document_details_base.html @@ -3,15 +3,15 @@ {% block title %}{{ document.title }} - {{ block.super }}{% endblock %} {% block extrahead %} -{% load compressed %} -{% compressed_css 'detail' %} +{% load pipeline %} +{% stylesheet 'detail' %} {% endblock %} {% block extrabody %} -{% compressed_js 'wiki_img' %} +{% javascript 'wiki_img' %} {% endblock %} {% block maincontent %} diff --git a/redakcja/settings/compress.py b/redakcja/settings/compress.py index 483e0ede..9bee6706 100644 --- a/redakcja/settings/compress.py +++ b/redakcja/settings/compress.py @@ -2,6 +2,7 @@ STATICFILES_FINDERS = ( 'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.AppDirectoriesFinder', # 'django.contrib.staticfiles.finders.DefaultStorageFinder', + 'pipeline.finders.PipelineFinder', ) diff --git a/requirements.txt b/requirements.txt index 3c82e4d1..6818fd0d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,9 +14,9 @@ httplib2 # oauth2 dependency ## Django Django>=1.6,<1.7 fnpdjango>=0.2,<0.3 -django-pipeline>=1.2,<1.3 +django-pipeline>=1.4.7,<1.5 django_cas>=2.1,<2.2 -sorl-thumbnail>=11.09,<12 +sorl-thumbnail>=12.2,<13 django-maintenancemode>=0.9 django-pagination django-gravatar2