Fixed overlapping themes in reader.

[wolnelektury.git] / wolnelektury / settings.py

diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index 3135bc2..8b03f9c 100644 (file)
--- a/wolnelektury/settings.py
+++ b/wolnelektury/settings.py
@@ -72,7 +72,7 @@ MIDDLEWARE_CLASSES = [
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',

-    'django.middleware.doc.XViewMiddleware',
+    # 'django.middleware.doc.XViewMiddleware',

     'pagination.middleware.PaginationMiddleware',
 ]
 
     'pagination.middleware.PaginationMiddleware',
 ]
 


@@ -83,7 +83,7 @@ if DEBUG:
 ROOT_URLCONF = 'urls'
 
 TEMPLATE_DIRS = (
 ROOT_URLCONF = 'urls'
 
 TEMPLATE_DIRS = (

-    PROJECT_DIR + '/templates/'
+    PROJECT_DIR + '/templates/',

 )
 
 # CSS and JS files to compress
 )
 
 # CSS and JS files to compress


@@ -99,10 +99,18 @@ COMPRESS_CSS = {
 }
 
 COMPRESS_JS = {
 }
 
 COMPRESS_JS = {

+    'jquery': {
+        'source_filenames': ('js/jquery.js',),
+        'output_filename': 'js/jquery.min.js',
+    },

     'all': {
     'all': {

-        'source_filenames': ('js/jquery.js', 'js/jquery.autocomplete.js', 'js/jquery.form.js', 
+        'source_filenames': ('js/jquery.autocomplete.js', 'js/jquery.form.js', 

             'js/jquery.jqmodal.js', 'js/jquery.labelify.js', 'js/catalogue.js',),
         'output_filename': 'js/all.min.js',
             'js/jquery.jqmodal.js', 'js/jquery.labelify.js', 'js/catalogue.js',),
         'output_filename': 'js/all.min.js',

+    },
+    'book': {
+        'source_filenames': ('js/jquery.eventdelegation.js', 'js/jquery.scrollto.js', 'js/jquery.highlightfade.js', 'js/book.js',),
+        'output_filename': 'js/book.min.js',

     }
 }
 
     }
 }
 


@@ -118,6 +126,7 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.admin',

+    'django.contrib.admindocs',

     'newtagging',
     'pagination',
     'chunks',
     'newtagging',
     'pagination',
     'chunks',