X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/e0e33e24cf53aa1b65e08bcabcc674529d09741a..2b57c59f0caa7d096a2e17aec3377d2628377491:/wolnelektury/settings.py?ds=sidebyside diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py index 48d96e056..54359513e 100644 --- a/wolnelektury/settings.py +++ b/wolnelektury/settings.py @@ -24,18 +24,6 @@ DATABASES = { } } -DATABASES['default'] = { - 'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': 'mkoziej_wl', # Or path to database file if using sqlite3. - 'USER': 'mkoziej', # Not used with sqlite3. - 'PASSWORD': 'pelolpe', # 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 @@ -202,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', @@ -209,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': { @@ -250,8 +250,6 @@ COMPRESS_JS = { 'js/pdcounter.js', 'js/search.js', - - 'js/jquery.labelify.js', ), 'output_filename': 'js/base?.min.js', },