fnp / redakcja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6351971)
Upgrade pipeline, sorl.thumbnail.
authorRadek Czajka <radekczajka@nowoczesnapolska.org.pl>
Thu, 19 Mar 2015 15:32:05 +0000 (16:32 +0100)
committerRadek Czajka <radekczajka@nowoczesnapolska.org.pl>
Thu, 19 Mar 2015 15:32:05 +0000 (16:32 +0100)
apps/catalogue/templates/catalogue/base.html patch | blob | history
apps/catalogue/templates/catalogue/book_html.html patch | blob | history
apps/catalogue/templates/catalogue/book_text.html patch | blob | history
apps/catalogue/templates/catalogue/document_list.html patch | blob | history
apps/catalogue/templates/catalogue/image_list.html patch | blob | history
apps/catalogue/templates/catalogue/my_page.html patch | blob | history
apps/wiki/templates/wiki/document_details_base.html patch | blob | history
apps/wiki_img/templates/wiki_img/document_details_base.html patch | blob | history
redakcja/settings/compress.py patch | blob | history
requirements.txt patch | blob | history

diff --git a/apps/catalogue/templates/catalogue/base.html b/apps/catalogue/templates/catalogue/base.html
index 9a56d72..466abe9 100644 (file)
--- 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 %}
 <!DOCTYPE html>
 <html>
 <head lang="{{ LANGUAGE_CODE }}">
     <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-    {% compressed_css 'catalogue' %}
+    {% stylesheet 'catalogue' %}
     <title>{% block title %}{% trans "Platforma Redakcyjna" %} ::
         {% block titleextra %}{% endblock %}{% endblock title %}</title>
     {% block add_css %}{% endblock %}
@@ -45,7 +45,7 @@
 
 
 <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-{% 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 af4cfa7..518811e 100755 (executable)
--- a/apps/catalogue/templates/catalogue/book_html.html
+++ b/apps/catalogue/templates/catalogue/book_html.html
@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load compressed %}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
diff --git a/apps/catalogue/templates/catalogue/book_text.html b/apps/catalogue/templates/catalogue/book_text.html
index b9cc2f0..2e48448 100644 (file)
--- 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 %}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
         <title>{% trans "Redakcja" %} :: {{ book.title }}</title>
-       {% compressed_css 'book' %}
+       {% stylesheet 'book' %}
         <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
-       {% compressed_js 'book' %}
+       {% javascript 'book' %}
     </head>
     <body>
         <div id="menu">
diff --git a/apps/catalogue/templates/catalogue/document_list.html b/apps/catalogue/templates/catalogue/document_list.html
index f0bd50c..fe3598e 100644 (file)
--- 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 a5e35f7..4ce1668 100755 (executable)
--- 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 00df71c..d334750 100755 (executable)
--- 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 891e9e8..8cd603b 100644 (file)
--- 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 %}
 <script type="text/javascript">
     var STATIC_URL = '{{STATIC_URL}}';
 </script>
-{% 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 642c916..0bb58b2 100644 (file)
--- 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 %}
 <script type="text/javascript">
     var STATIC_URL = '{{STATIC_URL}}';
 </script>
-{% compressed_js 'wiki_img' %}
+{% javascript 'wiki_img' %}
 {% endblock %}
 
 {% block maincontent %}
diff --git a/redakcja/settings/compress.py b/redakcja/settings/compress.py
index 483e0ed..9bee670 100644 (file)
--- 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 3c82e4d..6818fd0 100644 (file)
--- 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