X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/19552dfa90720c774b26c2042e0755ded6aa3c39..6e295f0db470467f3a3bf9ff46a4ed5e8f052229:/wolnelektury/settings.py diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py index 851860f28..54359513e 100644 --- a/wolnelektury/settings.py +++ b/wolnelektury/settings.py @@ -16,19 +16,14 @@ MANAGERS = ADMINS DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': 'wl', # Or path to database file if using sqlite3. - 'USER': 'wl', # Not used with sqlite3. - 'PASSWORD': 'test', # Not used with sqlite3. - 'HOST': 'localhost', # Set to empty string for localhost. Not used with sqlite3. - 'PORT': '', # Set to empty string for default. Not used with sqlite3. + 'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. + 'NAME': path.join(PROJECT_DIR, 'dev.db'), # Or path to database file if using sqlite3. + 'USER': '', # Not used with sqlite3. + 'PASSWORD': '', # Not used with sqlite3. + 'HOST': '', # Set to empty string for localhost. Not used with sqlite3. } } -DATABASE_OPTIONS = { - "init_command": "SET storage_engine=INNODB DEFAULT CHARSET=utf8", -} - # Local time zone for this installation. Choices can be found here: # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name @@ -195,6 +190,7 @@ COMPRESS_CSS = { 'css/jquery.countdown.css', 'css/base.css', + 'css/cite.css', 'css/header.css', 'css/main_page.css', 'css/dialogs.css', @@ -202,13 +198,24 @@ COMPRESS_CSS = { 'css/book_box.css', 'css/catalogue.css', 'css/sponsors.css', - + 'css/logo.css', + + 'css/social/shelf_tags.css', 'css/ui-lightness/jquery-ui-1.8.16.custom.css', ], 'output_filename': 'css/all.min?.css', }, + 'ie': { + 'source_filenames': [ + 'css/ie.css', + ], + 'output_filename': 'css/ie.min?.css', + }, 'book': { - 'source_filenames': ('css/master.book.css',), + 'source_filenames': [ + 'css/logo.css', + 'css/master.book.css', + ], 'output_filename': 'css/book.min?.css', }, 'player': { @@ -243,8 +250,6 @@ COMPRESS_JS = { 'js/pdcounter.js', 'js/search.js', - - 'js/jquery.labelify.js', ), 'output_filename': 'js/base?.min.js', },