Save shelves for each book during reimport.

[wolnelektury.git] / wolnelektury / settings.py

diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index 12edea3..0779224 100644 (file)
--- a/wolnelektury/settings.py
+++ b/wolnelektury/settings.py
@@ -13,9 +13,9 @@ ADMINS = (
 
 MANAGERS = 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.
 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.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',

-    'django.middleware.doc.XViewMiddleware',
+    # 'django.middleware.doc.XViewMiddleware',

     'pagination.middleware.PaginationMiddleware',
 ]
 
     'pagination.middleware.PaginationMiddleware',
 ]
 


@@ -83,7 +83,7 @@ if DEBUG:
 ROOT_URLCONF = 'urls'
 
 TEMPLATE_DIRS = (
 ROOT_URLCONF = 'urls'
 
 TEMPLATE_DIRS = (

-    PROJECT_DIR + '/templates/'
+    PROJECT_DIR + '/templates/',

 )
 
 # CSS and JS files to compress
 )
 
 # CSS and JS files to compress


@@ -126,6 +126,7 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.admin',

+    'django.contrib.admindocs',

     'newtagging',
     'pagination',
     'chunks',
     'newtagging',
     'pagination',
     'chunks',