Naming, footer, layout fixes.

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

diff --git a/src/wolnelektury/settings/static.py b/src/wolnelektury/settings/static.py
index b7beb79..179467d 100644 (file)
--- a/src/wolnelektury/settings/static.py
+++ b/src/wolnelektury/settings/static.py
@@ -22,11 +22,15 @@ IMAGE_DIR = 'book/pictures/'
 
 PIPELINE = {
     'STYLESHEETS': {
 
 PIPELINE = {
     'STYLESHEETS': {

-        '2021': {
+        '2022': {

             'source_filenames': [
             'source_filenames': [

-                '2021/css/main.scss',
+                'contrib/jquery-ui-1.13.1.custom/jquery-ui.css',
+                'css/jquery.countdown.css',
+                '2022/styles/main.scss',
+                '2022/more.scss',
+                'chunks/edit.scss',

             ],
             ],

-            'output_filename': 'css/compressed/2021.css',
+            'output_filename': 'css/compressed/2022.css',

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


@@ -63,6 +67,7 @@ PIPELINE = {
                 'css/new.book.css',
                 'annoy/banner.scss',
                 'annoy/book_text.scss',
                 'css/new.book.css',
                 'annoy/banner.scss',
                 'annoy/book_text.scss',

+                '2022/styles/reader_player.scss',

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


@@ -133,6 +138,29 @@ PIPELINE = {
                 ),
             'output_filename': 'js/base.min.js',
         },
                 ),
             'output_filename': 'js/base.min.js',
         },

+        '2022': {
+            'source_filenames': [
+                '2022/scripts/vendor.js',
+                'contrib/jquery-ui-1.13.1.custom/jquery-ui.js',
+                'js/search.js',
+                'js/2022.js',
+                '2022/book/filter.js',
+                'chunks/edit.js',
+                '2022/scripts/modernizr.js',
+                '2021/scripts/main.js',
+
+                'js/contrib/jquery.cycle2.min.js',
+                'sponsors/js/sponsors.js',
+
+                'js/contrib/jquery.countdown.js', 'js/contrib/jquery.countdown-pl.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',
+                'pdcounter/pdcounter.js',
+
+            ],
+            'output_filename': 'js/2022.min.js'
+        },

         'player': {
             'source_filenames': [
                 'jplayer/jquery.jplayer.min.js',
         'player': {
             'source_filenames': [
                 'jplayer/jquery.jplayer.min.js',


@@ -141,6 +169,14 @@ PIPELINE = {
             ],
             'output_filename': 'js/player.min.js',
         },
             ],
             'output_filename': 'js/player.min.js',
         },

+        '2022_player': {
+            'source_filenames': [
+                'js/contrib/jplayer/jquery.jplayer.min.js',
+                'js/contrib/jplayer/jplayer.playlist.min.js',
+                'player/2022_player.js',
+            ],
+            'output_filename': 'js/2022_player.min.js',
+        },

         'book': {
             'source_filenames': [
                 'js/contrib/jquery.eventdelegation.js',
         'book': {
             'source_filenames': [
                 'js/contrib/jquery.eventdelegation.js',


@@ -205,8 +241,7 @@ PIPELINE = {
     )
 }
 
     )
 }
 

-STATICFILES_STORAGE = 'fnpdjango.pipeline_storage.GzipPipelineCachedStorage'
-#STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
+STATICFILES_STORAGE = 'fnpdjango.pipeline_storage.GzipPipelineManifestStorage'

 
 # PIPELINE_PYSCSS_BINARY = '/usr/bin/env pyscss'
 # PIPELINE_PYSCSS_ARGUMENTS = ''
 
 # PIPELINE_PYSCSS_BINARY = '/usr/bin/env pyscss'
 # PIPELINE_PYSCSS_ARGUMENTS = ''


@@ -218,9 +253,3 @@ 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,
-)