X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/bb68c8efe90a6f818c2c26f36ef0e02c91ed6158..3333b0748fd76170f3b44bf9533b21889fa6685f:/wolnelektury/settings.py?ds=sidebyside diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py index 294869355..8b03f9c10 100644 --- a/wolnelektury/settings.py +++ b/wolnelektury/settings.py @@ -68,28 +68,22 @@ TEMPLATE_CONTEXT_PROCESSORS = ( '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', - 'debug_toolbar.middleware.DebugToolbarMiddleware', + # 'django.middleware.doc.XViewMiddleware', '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' TEMPLATE_DIRS = ( - PROJECT_DIR + '/templates/' + PROJECT_DIR + '/templates/', ) # CSS and JS files to compress @@ -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', + }, + 'book': { + 'source_filenames': ('css/master.book.css',), + 'output_filename': 'css/book.min.css', } } COMPRESS_JS = { + 'jquery': { + 'source_filenames': ('js/jquery.js',), + 'output_filename': 'js/jquery.min.js', + }, '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', + }, + 'book': { + 'source_filenames': ('js/jquery.eventdelegation.js', 'js/jquery.scrollto.js', 'js/jquery.highlightfade.js', 'js/book.js',), + 'output_filename': 'js/book.min.js', } } @@ -120,11 +126,11 @@ INSTALLED_APPS = ( 'django.contrib.sessions', 'django.contrib.sites', 'django.contrib.admin', + 'django.contrib.admindocs', 'newtagging', 'pagination', 'chunks', 'compress', - 'debug_toolbar', 'catalogue', )