migration for infopages table

[wolnelektury.git] / wolnelektury / settings.py

diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index 48d96e0..a1ad878 100644 (file)
--- 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
@@ -59,6 +47,8 @@ LANGUAGES = tuple(sorted([
     ('ru', u'русский'),
     ('es', u'español'),
     ('uk', u'українська'),
+    ('jp', u'日本語'),
+    ('it', u'italiano'),
 ], key=lambda x: x[0]))
 
 
@@ -202,6 +192,7 @@ COMPRESS_CSS = {
             'css/jquery.countdown.css', 
 
             'css/base.css',
+            'css/cite.css',
             'css/header.css',
             'css/main_page.css',
             'css/dialogs.css',
@@ -209,18 +200,30 @@ 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': {
         'source_filenames': [
             'jplayer/jplayer.blue.monday.css', 
+            'css/player.css', 
         ],
         'output_filename': 'css/player.min?.css',
     },
@@ -250,8 +253,6 @@ COMPRESS_JS = {
             'js/pdcounter.js',
 
             'js/search.js',
-
-            'js/jquery.labelify.js',
             ),
         'output_filename': 'js/base?.min.js',
     },