X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/2f1c330e555c24deb17b7d6018b59c52dab7aafd..4dc763d30ce6b8065c316731e2ed06220a74813c:/wolnelektury/settings.py diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py index c5b8d6797..077922436 100644 --- a/wolnelektury/settings.py +++ b/wolnelektury/settings.py @@ -13,9 +13,9 @@ ADMINS = ( MANAGERS = ADMINS -DATABASE_ENGINE = 'sqlite3' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. -DATABASE_NAME = path.join(PROJECT_DIR, 'lektury.sqlite') # Or path to database file if using sqlite3. -DATABASE_USER = '' # Not used with sqlite3. +DATABASE_ENGINE = 'mysql' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. +DATABASE_NAME = 'wolnelektury' # Or path to database file if using sqlite3. +DATABASE_USER = 'root' # Not used with sqlite3. DATABASE_PASSWORD = '' # Not used with sqlite3. DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3. DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3. @@ -72,7 +72,7 @@ MIDDLEWARE_CLASSES = [ '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', ] @@ -83,7 +83,7 @@ if DEBUG: ROOT_URLCONF = 'urls' TEMPLATE_DIRS = ( - PROJECT_DIR + '/templates/' + PROJECT_DIR + '/templates/', ) # CSS and JS files to compress @@ -91,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', } } @@ -114,6 +126,7 @@ INSTALLED_APPS = ( 'django.contrib.sessions', 'django.contrib.sites', 'django.contrib.admin', + 'django.contrib.admindocs', 'newtagging', 'pagination', 'chunks',