Fix multiple inheritance with NewsletterForm. Make phplist URL a setting.

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

diff --git a/src/wolnelektury/settings/static.py b/src/wolnelektury/settings/static.py
index 3c1997d..2873410 100644 (file)
--- a/src/wolnelektury/settings/static.py
+++ b/src/wolnelektury/settings/static.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #


@@ -26,15 +25,14 @@ PIPELINE = {
         'main': {
             # styles both for mobile and for big screen
             'source_filenames': [
         'main': {
             # styles both for mobile and for big screen
             'source_filenames': [

+                'css/import/gelasio.css',
+

                 'css/jquery.countdown.css',
                 'jplayer/jplayer.blue.monday.css',
 
                 'sponsors/css/sponsors.css',
 
                 'css/jquery.countdown.css',
                 'jplayer/jplayer.blue.monday.css',
 
                 'sponsors/css/sponsors.css',
 

-                'css/annoy.css',
-
-                'uni_form/uni-form.css',
-                'uni_form/default.uni-form.css',
+                'annoy/banner.scss',

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


@@ -46,21 +44,32 @@ PIPELINE = {
         },
         'book': {
             'source_filenames': [
         },
         'book': {
             'source_filenames': [

+                'css/import/gelasio.css',

                 'css/master.book.css',
             ],
             'output_filename': 'css/compressed/book.css',
         },
         'book_text': {
             'source_filenames': [
                 'css/master.book.css',
             ],
             'output_filename': 'css/compressed/book.css',
         },
         'book_text': {
             'source_filenames': [

+                'css/import/gelasio.css',

                 'scss/book_text.scss',
                 'css/new.book.css',
                 'scss/book_text.scss',
                 'css/new.book.css',

+                'annoy/banner.scss',
+                'annoy/book_text.scss',

 
                 'css/master.picture.css',
             ],
             'output_filename': 'css/compressed/book_text.css',
         },
 
                 'css/master.picture.css',
             ],
             'output_filename': 'css/compressed/book_text.css',
         },

+        'forum': {
+            'source_filenames': [
+                'scss/forum.scss',
+            ],
+            'output_filename': 'css/compressed/compressed/forum.css',
+        },

         'picture': {
             'source_filenames': [
         'picture': {
             'source_filenames': [

+                'css/import/gelasio.css',

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


@@ -85,7 +94,7 @@ PIPELINE = {
     'JAVASCRIPT': {
         'base': {
             'source_filenames': (
     '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',
                 'js/contrib/jquery.jqmodal.js',
                 'js/contrib/jquery.form.js',
                 'js/contrib/jquery.paging.min.js',


@@ -111,10 +120,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',
+                'annoy/banner.js',

                 ),
             'output_filename': 'js/base.min.js',
         },
                 ),
             'output_filename': 'js/base.min.js',
         },


@@ -142,6 +150,7 @@ PIPELINE = {
         },
         'book_text': {
             'source_filenames': [
         },
         'book_text': {
             'source_filenames': [

+                'js/contrib/jquery.cycle2.min.js',

                 'js/contrib/jquery.form.js',
                 'js/contrib/jquery.jqmodal.js',
                 'js/book_text/info.js',
                 'js/contrib/jquery.form.js',
                 'js/contrib/jquery.jqmodal.js',
                 'js/book_text/info.js',


@@ -151,15 +160,22 @@ PIPELINE = {
                 'js/book_text/toc.js',
                 'js/locale.js',
                 'js/dialogs.js',
                 'js/book_text/toc.js',
                 'js/locale.js',
                 'js/dialogs.js',

+                'annoy/book_text.js',

 
                 'js/contrib/jquery.highlightfade.js',
                 'js/contrib/raphael-min.js',
                 'player/openplayer.js',
                 'js/contrib/progressSpin.min.js',
 
                 'js/contrib/jquery.highlightfade.js',
                 'js/contrib/raphael-min.js',
                 'player/openplayer.js',
                 'js/contrib/progressSpin.min.js',

-                'js/picture.js',
+                'annoy/banner.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',


@@ -177,16 +193,12 @@ PIPELINE = {
     'CSS_COMPRESSOR': None,
     'JS_COMPRESSOR': 'pipeline.compressors.jsmin.JSMinCompressor',
     'COMPILERS': (
     'CSS_COMPRESSOR': None,
     'JS_COMPRESSOR': 'pipeline.compressors.jsmin.JSMinCompressor',
     'COMPILERS': (

-        'pipeline.compilers.sass.SASSCompiler',
-        # We could probably use PySCSS instead,
-        # but they have some serious problems, like:
-        # https://github.com/Kronuz/pyScss/issues/166 (empty list syntax)
-        # https://github.com/Kronuz/pyScss/issues/258 (bad @media order)
-        # 'pyscss_compiler.PySCSSCompiler',
+        'libsasscompiler.LibSassCompiler',

     )
 }
 
 STATICFILES_STORAGE = 'fnpdjango.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 = ''


@@ -195,5 +207,12 @@ STATICFILES_STORAGE = 'fnpdjango.pipeline_storage.GzipPipelineCachedStorage'
 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',
 ]

+
+
+from machina import MACHINA_MAIN_STATIC_DIR
+STATICFILES_DIRS = (
+    MACHINA_MAIN_STATIC_DIR,
+)