Report fix.

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

diff --git a/src/wolnelektury/settings/static.py b/src/wolnelektury/settings/static.py
index 08871d6..f2a8423 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.
 #


@@ -57,6 +56,12 @@ PIPELINE = {
             ],
             'output_filename': 'css/compressed/book_text.css',
         },
             ],
             'output_filename': 'css/compressed/book_text.css',
         },

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

         'picture': {
             'source_filenames': [
                 'css/master.book.css',
         'picture': {
             'source_filenames': [
                 'css/master.book.css',


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


@@ -162,7 +167,7 @@ PIPELINE = {
                 'js/picture.js',
             ],
             'output_filename': 'js/picture.min.js',
                 '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',


@@ -202,3 +207,9 @@ STATICFILES_FINDERS = [
     'pipeline.finders.CachedFileFinder',
     'pipeline.finders.PipelineFinder',
 ]
     'pipeline.finders.CachedFileFinder',
     'pipeline.finders.PipelineFinder',
 ]

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