fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
"Wrzuć cały zbiór na półkę" -> "Wrzuć lekturę na półkę"
[wolnelektury.git]
/
wolnelektury
/
settings.py
diff --git
a/wolnelektury/settings.py
b/wolnelektury/settings.py
index
2948693
..
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.
@@
-68,28
+68,22
@@
TEMPLATE_CONTEXT_PROCESSORS = (
'django.core.context_processors.request',
)
'django.core.context_processors.request',
)
-MIDDLEWARE_CLASSES =
(
+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',
- 'debug_toolbar.middleware.DebugToolbarMiddleware',
+ # 'django.middleware.doc.XViewMiddleware',
'pagination.middleware.PaginationMiddleware',
'pagination.middleware.PaginationMiddleware',
-)
-
-DEBUG_TOOLBAR_PANELS = (
- 'debug_toolbar.panels.version.VersionDebugPanel',
- 'debug_toolbar.panels.sql.SQLDebugPanel',
- 'debug_toolbar.panels.timer.TimerDebugPanel',
- 'debug_toolbar.panels.headers.HeaderDebugPanel',
-)
+]
-INTERNAL_IPS = ('127.0.0.1', )
+# If DEBUG is enabled add query log to bottom of every template
+if DEBUG:
+ MIDDLEWARE_CLASSES.append('middleware.ProfileMiddleware')
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
@@
-97,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',
'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 = {
}
}
COMPRESS_JS = {
+ 'jquery': {
+ 'source_filenames': ('js/jquery.js',),
+ 'output_filename': 'js/jquery.min.js',
+ },
'all': {
'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',
'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',
}
}
}
}
@@
-120,11
+126,11
@@
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',
'compress',
'newtagging',
'pagination',
'chunks',
'compress',
- 'debug_toolbar',
'catalogue',
)
'catalogue',
)