New annoying banner.

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

diff --git a/src/wolnelektury/settings/static.py b/src/wolnelektury/settings/static.py
index 80bd9ea..0d599f2 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/'
 
 MEDIA_URL = '/media/'
 STATIC_URL = '/static/'
 

+IMAGE_DIR = 'book/pictures/'
+

 # CSS and JavaScript file groups
 
 PIPELINE = {
 # CSS and JavaScript file groups
 
 PIPELINE = {

-    'PIPELINE_ENABLED': False,

     'STYLESHEETS': {
         'main': {
             # styles both for mobile and for big screen
     'STYLESHEETS': {
         'main': {
             # styles both for mobile and for big screen


@@ -30,11 +31,12 @@ PIPELINE = {
 
                 'sponsors/css/sponsors.css',
 
 
                 '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/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',


@@ -88,9 +90,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',


@@ -103,8 +108,9 @@ PIPELINE = {
                 'player/openplayer.js',
                 'js/search.js',
                 'funding/funding.js',
                 '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',
         },
                 ),
             'output_filename': 'js/base.min.js',
         },


@@ -134,7 +140,11 @@ PIPELINE = {
             'source_filenames': [
                 'js/contrib/jquery.form.js',
                 'js/contrib/jquery.jqmodal.js',
             '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',
 
                 'js/locale.js',
                 'js/dialogs.js',
 


@@ -172,7 +182,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 = ''


@@ -181,5 +192,6 @@ PIPELINE = {
 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',
 ]