fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git@stigma.nowoczesnapolska.org.pl:platforma
[redakcja.git]
/
project
/
settings.py
diff --git
a/project/settings.py
b/project/settings.py
index
6f0f694
..
3bfc7db
100644
(file)
--- a/
project/settings.py
+++ b/
project/settings.py
@@
-62,10
+62,20
@@
TEMPLATE_LOADERS = (
# 'django.template.loaders.eggs.load_template_source',
)
# 'django.template.loaders.eggs.load_template_source',
)
+TEMPLATE_CONTEXT_PROCESSORS = (
+ "django.core.context_processors.auth",
+ "django.core.context_processors.debug",
+ "django.core.context_processors.i18n",
+ "django.core.context_processors.media",
+ "django.core.context_processors.request",
+)
+
+
MIDDLEWARE_CLASSES = (
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
MIDDLEWARE_CLASSES = (
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
+ 'explorer.middleware.EditorSettingsMiddleware',
'django.middleware.doc.XViewMiddleware',
)
'django.middleware.doc.XViewMiddleware',
)
@@
-100,9
+110,16
@@
INSTALLED_APPS = (
'django.contrib.sites',
'django.contrib.admin',
'django.contrib.admindocs',
'django.contrib.sites',
'django.contrib.admin',
'django.contrib.admindocs',
+
+ 'explorer',
+ 'toolbar',
)
)
+# REPOSITORY_PATH = '/Users/zuber/Projekty/platforma/files/books'
+IMAGE_DIR = 'images'
+EDITOR_COOKIE_NAME = 'options'
+
try:
from localsettings import *
except ImportError:
try:
from localsettings import *
except ImportError: