fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FIX: Zmiany wykonane w edytorze XML były ignorowane.
[redakcja.git]
/
platforma
/
settings.py
diff --git
a/platforma/settings.py
b/platforma/settings.py
old mode 100644
(file)
new mode 100755
(executable)
index
87868ce
..
4aa2fb2
--- a/
platforma/settings.py
+++ b/
platforma/settings.py
@@
-70,7
+70,7
@@
TEMPLATE_CONTEXT_PROCESSORS = (
"django.core.context_processors.auth",
"django.core.context_processors.debug",
"django.core.context_processors.i18n",
"django.core.context_processors.auth",
"django.core.context_processors.debug",
"django.core.context_processors.i18n",
- "
explorer
.context_processors.settings",
+ "
platforma
.context_processors.settings",
"django.core.context_processors.request",
)
"django.core.context_processors.request",
)
@@
-79,9
+79,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',
- 'explorer.middleware.EditorSettingsMiddleware',
'django.middleware.doc.XViewMiddleware',
'django.middleware.doc.XViewMiddleware',
-
'maintenancemode.middleware.MaintenanceModeMiddleware',
)
'maintenancemode.middleware.MaintenanceModeMiddleware',
)
@@
-117,22
+115,24
@@
INSTALLED_APPS = (
'django.contrib.admin',
'django.contrib.admindocs',
'django.contrib.admin',
'django.contrib.admindocs',
+ 'wiki',
'piston',
'piston',
- 'explorer',
+ 'sorl.thumbnail',
+ 'filebrowser',
+ # 'explorer',
'toolbar',
'toolbar',
- 'api',
+ 'bookthemes',
+ # 'api',
)
)
+FILEBROWSER_URL_FILEBROWSER_MEDIA = STATIC_URL + 'filebrowser/'
+FILEBROWSER_DIRECTORY = 'images/'
+FILEBROWSER_ADMIN_VERSIONS = []
+FILEBROWSER_VERSIONS_BASEDIR = 'thumbnails/'
+
# REPOSITORY_PATH = '/Users/zuber/Projekty/platforma/files/books'
IMAGE_DIR = 'images'
# REPOSITORY_PATH = '/Users/zuber/Projekty/platforma/files/books'
IMAGE_DIR = 'images'
-EDITOR_COOKIE_NAME = 'options'
-EDITOR_DEFAULT_SETTINGS = {
- 'panels': [
- {'name': 'htmleditor', 'ratio': 0.5},
- {'name': 'gallery', 'ratio': 0.5}
- ],
-}
# Python logging settings
import logging
# Python logging settings
import logging