Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty

[wolnelektury.git] / wolnelektury / settings.py

diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index fe25729..55c845e 100644 (file)
--- a/wolnelektury/settings.py
+++ b/wolnelektury/settings.py
@@ -158,7 +158,8 @@ INSTALLED_APPS = [
 ]
 
 #CACHE_BACKEND = 'locmem:///?max_entries=3000'
-#CACHE_BACKEND = 'memcached://127.0.0.1:11211/'
+CACHE_BACKEND = 'memcached://127.0.0.1:11211/'
+#CACHE_BACKEND = None
 CACHE_MIDDLEWARE_ANONYMOUS_ONLY=True
 
 # CSS and JavaScript file groups
@@ -172,6 +173,7 @@ COMPRESS_CSS = {
             'css/header.css',
             'css/main_page.css',
             'css/dialogs.css',
+            'css/picture_box.css',
             'css/book_box.css',
             'css/catalogue.css',
             'css/sponsors.css',
@@ -184,6 +186,12 @@ COMPRESS_CSS = {
         'source_filenames': ('css/master.book.css',),
         'output_filename': 'css/book.min?.css',
     },
+    'player': {
+        'source_filenames': [
+            'jplayer/jplayer.blue.monday.css', 
+        ],
+        'output_filename': 'css/player.min?.css',
+    },
     'simple': {
         'source_filenames': ('css/simple.css',),
         'output_filename': 'css/simple.min?.css',
@@ -206,6 +214,7 @@ COMPRESS_JS = {
             'js/locale.js',
             'js/dialogs.js',
             'js/sponsors.js',
+            'js/base.js',
             'js/pdcounter.js',
 
             'js/search.js',
@@ -215,6 +224,14 @@ COMPRESS_JS = {
             ),
         'output_filename': 'js/base?.min.js',
     },
+    'player': {
+        'source_filenames': [
+            'jplayer/jquery.jplayer.min.js', 
+            'jplayer/jplayer.playlist.min.js', 
+            'js/player.js', 
+        ],
+        'output_filename': 'js/player.min?.js',
+    },
     #~ 'book': {
         #~ 'source_filenames': ('js/jquery.eventdelegation.js', 'js/jquery.scrollto.js', 'js/jquery.highlightfade.js', 'js/book.js',),
         #~ 'source_filenames': [],
@@ -265,6 +282,7 @@ ALL_PDF_ZIP = 'wolnelektury_pl_pdf'
 ALL_MOBI_ZIP = 'wolnelektury_pl_mobi'
 
 CATALOGUE_DEFAULT_LANGUAGE = 'pol'
+PUBLISH_PLAN_FEED = 'http://redakcja.wolnelektury.pl/documents/track/editor-proofreading/'
 
 PAGINATION_INVALID_PAGE_RAISES_404 = True