Added --force option to importbooks command.

[wolnelektury.git] / wolnelektury / settings.py

diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index 2948693..12edea3 100644 (file)
--- a/wolnelektury/settings.py
+++ b/wolnelektury/settings.py
@@ -68,23 +68,17 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.request',
 )
 
     'django.core.context_processors.request',
 )
 

-MIDDLEWARE_CLASSES = (
+MIDDLEWARE_CLASSES = [

     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.middleware.doc.XViewMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.middleware.doc.XViewMiddleware',

-    'debug_toolbar.middleware.DebugToolbarMiddleware',

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

-)
-
-DEBUG_TOOLBAR_PANELS = (
-    'debug_toolbar.panels.version.VersionDebugPanel',
-    'debug_toolbar.panels.sql.SQLDebugPanel',
-    'debug_toolbar.panels.timer.TimerDebugPanel',
-    'debug_toolbar.panels.headers.HeaderDebugPanel',
-)
+]

 
 

-INTERNAL_IPS = ('127.0.0.1', )
+# If DEBUG is enabled add query log to bottom of every template
+if DEBUG:
+    MIDDLEWARE_CLASSES.append('middleware.ProfileMiddleware')

 
 ROOT_URLCONF = 'urls'
 
 
 ROOT_URLCONF = 'urls'
 


@@ -97,14 +91,26 @@ COMPRESS_CSS = {
     'all': {
         'source_filenames': ('css/master.css', 'css/jquery.autocomplete.css', 'css/master.plain.css',),
         'output_filename': 'css/all.min.css',
     'all': {
         'source_filenames': ('css/master.css', 'css/jquery.autocomplete.css', 'css/master.plain.css',),
         'output_filename': 'css/all.min.css',

+    },
+    'book': {
+        'source_filenames': ('css/master.book.css',),
+        'output_filename': 'css/book.min.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.autocolumn.js', 'js/jquery.autocomplete.js', 
-            'js/jquery.form.js', 'js/jquery.jqmodal.js', 'js/jquery.labelify.js', 'js/catalogue.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',
         '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',

     }
 }
 
     }
 }
 


@@ -124,7 +130,6 @@ INSTALLED_APPS = (
     'pagination',
     'chunks',
     'compress',
     'pagination',
     'chunks',
     'compress',

-    'debug_toolbar',

     'catalogue',
 )
 
     'catalogue',
 )