Remove obsolete jsonfield dependency.

[wolnelektury.git] / src / wolnelektury / settings / static.py

diff --git a/src/wolnelektury/settings/static.py b/src/wolnelektury/settings/static.py
index 80bd9ea..b8b7828 100644 (file)
--- a/src/wolnelektury/settings/static.py
+++ b/src/wolnelektury/settings/static.py
@@ -17,10 +17,11 @@ SEARCH_INDEX = path.join(VAR_DIR, 'search_index/')
 MEDIA_URL = '/media/'
 STATIC_URL = '/static/'
 
+IMAGE_DIR = 'book/pictures/'
+
 # CSS and JavaScript file groups
 
 PIPELINE = {
-    'PIPELINE_ENABLED': False,
     'STYLESHEETS': {
         'main': {
             # styles both for mobile and for big screen
@@ -30,11 +31,12 @@ PIPELINE = {
 
                 'sponsors/css/sponsors.css',
 
-                'uni_form/uni-form.css',
-                'uni_form/default.uni-form.css',
+                'css/annoy.css',
 
                 'css/ui-lightness/jquery-ui-1.8.16.custom.css',
 
+                'css/tlite.css',
+
                 'scss/main.scss',
             ],
             'output_filename': 'css/compressed/main.css',
@@ -49,6 +51,7 @@ PIPELINE = {
             'source_filenames': [
                 'scss/book_text.scss',
                 'css/new.book.css',
+                'css/annoy.css',
 
                 'css/master.picture.css',
             ],
@@ -80,7 +83,7 @@ PIPELINE = {
     'JAVASCRIPT': {
         'base': {
             'source_filenames': (
-                'js/contrib/jquery.cycle.min.js',
+                'js/contrib/jquery.cycle2.min.js',
                 'js/contrib/jquery.jqmodal.js',
                 'js/contrib/jquery.form.js',
                 'js/contrib/jquery.paging.min.js',
@@ -88,9 +91,12 @@ PIPELINE = {
                 'js/contrib/jquery.countdown-de.js', 'js/contrib/jquery.countdown-uk.js',
                 'js/contrib/jquery.countdown-es.js', 'js/contrib/jquery.countdown-lt.js',
                 'js/contrib/jquery.countdown-ru.js', 'js/contrib/jquery.countdown-fr.js',
+                'js/contrib/jquery.shorten.js',
 
                 'js/contrib/jquery-ui-1.8.16.custom.min.js',
 
+                'js/contrib/tlite.min.js',
+
                 'jplayer/jquery.jplayer.min.js',
                 'jplayer/jplayer.playlist.min.js',
                 'player/player.js',
@@ -103,8 +109,9 @@ PIPELINE = {
                 'player/openplayer.js',
                 'js/search.js',
                 'funding/funding.js',
+                'club/form.js',
 
-                'uni_form/uni-form.js',
+                'js/annoy.js',
                 ),
             'output_filename': 'js/base.min.js',
         },
@@ -134,7 +141,11 @@ PIPELINE = {
             'source_filenames': [
                 'js/contrib/jquery.form.js',
                 'js/contrib/jquery.jqmodal.js',
-                'js/book_text/*.js',
+                'js/book_text/info.js',
+                'js/book_text/menu.js',
+                'js/book_text/note.js',
+                'js/book_text/settings.js',
+                'js/book_text/toc.js',
                 'js/locale.js',
                 'js/dialogs.js',
 
@@ -142,10 +153,16 @@ PIPELINE = {
                 'js/contrib/raphael-min.js',
                 'player/openplayer.js',
                 'js/contrib/progressSpin.min.js',
-                'js/picture.js',
+                'js/annoy.js',
             ],
             'output_filename': 'js/book_text.js',
         },
+        'picture': {
+            'source_filenames': [
+                'js/picture.js',
+            ],
+            'output_filename': 'js/picture.min.js',
+        },
         'book_ie': {
             'source_filenames': ('js/contrib/ierange-m2.js',),
             'output_filename': 'js/book_ie.min.js',
@@ -172,7 +189,8 @@ PIPELINE = {
     )
 }
 
-# STATICFILES_STORAGE = 'fnpdjango.utils.pipeline_storage.GzipPipelineCachedStorage'
+STATICFILES_STORAGE = 'fnpdjango.pipeline_storage.GzipPipelineCachedStorage'
+#STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
 
 # PIPELINE_PYSCSS_BINARY = '/usr/bin/env pyscss'
 # PIPELINE_PYSCSS_ARGUMENTS = ''
@@ -181,5 +199,12 @@ PIPELINE = {
 STATICFILES_FINDERS = [
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+    'pipeline.finders.CachedFileFinder',
     'pipeline.finders.PipelineFinder',
 ]
+
+
+from machina import MACHINA_MAIN_STATIC_DIR
+STATICFILES_DIRS = (
+    MACHINA_MAIN_STATIC_DIR,
+)