fix

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

diff --git a/src/wolnelektury/settings/static.py b/src/wolnelektury/settings/static.py
index 2caf798..53c54b0 100644 (file)
--- a/src/wolnelektury/settings/static.py
+++ b/src/wolnelektury/settings/static.py
@@ -33,11 +33,10 @@ PIPELINE = {
 
                 'css/annoy.css',
 
 
                 'css/annoy.css',
 

-                'uni_form/uni-form.css',
-                'uni_form/default.uni-form.css',
-

                 'css/ui-lightness/jquery-ui-1.8.16.custom.css',
 
                 'css/ui-lightness/jquery-ui-1.8.16.custom.css',
 

+                'css/tlite.css',
+

                 'scss/main.scss',
             ],
             'output_filename': 'css/compressed/main.css',
                 'scss/main.scss',
             ],
             'output_filename': 'css/compressed/main.css',


@@ -52,6 +51,7 @@ PIPELINE = {
             'source_filenames': [
                 'scss/book_text.scss',
                 'css/new.book.css',
             'source_filenames': [
                 'scss/book_text.scss',
                 'css/new.book.css',

+                'css/annoy.css',

 
                 'css/master.picture.css',
             ],
 
                 'css/master.picture.css',
             ],


@@ -91,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.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/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',
                 'jplayer/jquery.jplayer.min.js',
                 'jplayer/jplayer.playlist.min.js',
                 'player/player.js',


@@ -106,8 +109,7 @@ PIPELINE = {
                 'player/openplayer.js',
                 'js/search.js',
                 'funding/funding.js',
                 'player/openplayer.js',
                 'js/search.js',
                 'funding/funding.js',

-
-                'uni_form/uni-form.js',
+                'club/form.js',

 
                 'js/annoy.js',
                 ),
 
                 'js/annoy.js',
                 ),


@@ -151,10 +153,16 @@ PIPELINE = {
                 'js/contrib/raphael-min.js',
                 'player/openplayer.js',
                 'js/contrib/progressSpin.min.js',
                 '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',
         },
             ],
             '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',
         'book_ie': {
             'source_filenames': ('js/contrib/ierange-m2.js',),
             'output_filename': 'js/book_ie.min.js',


@@ -181,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 = ''
 
 # PIPELINE_PYSCSS_BINARY = '/usr/bin/env pyscss'
 # PIPELINE_PYSCSS_ARGUMENTS = ''


@@ -190,5 +199,6 @@ STATICFILES_STORAGE = 'fnpdjango.utils.pipeline_storage.GzipPipelineCachedStorag
 STATICFILES_FINDERS = [
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
 STATICFILES_FINDERS = [
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',

+    'pipeline.finders.CachedFileFinder',

     'pipeline.finders.PipelineFinder',
 ]
     'pipeline.finders.PipelineFinder',
 ]