More fixes in Filebrowser.

[redakcja.git] / platforma / settings.py

diff --git a/platforma/settings.py b/platforma/settings.py
index 58861bf..2faab1b 100755 (executable)
--- 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',
 )
 


@@ -109,6 +107,7 @@ TEMPLATE_DIRS = (
 # 
 # COMPRESS_CSS_FILTERS = None
 
 # 
 # COMPRESS_CSS_FILTERS = None
 

+

 INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',
 INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',


@@ -117,14 +116,22 @@ INSTALLED_APPS = (
     'django.contrib.admin',
     'django.contrib.admindocs',
 
     'django.contrib.admin',
     'django.contrib.admindocs',
 

+    'django_nose',
+

     'wiki',
     'wiki',

-    'piston',

     'sorl.thumbnail',
     'filebrowser',
     'sorl.thumbnail',
     'filebrowser',

-    'explorer',

     'toolbar',
     'toolbar',

-    'bookthemes',
-    'api',
+)
+
+TEST_RUNNER = 'django_nose.run_tests'
+TEST_MODULES = ('wiki', 'toolbar', 'vstorage')
+NOSE_ARGS = (
+    '--tests=' + ','.join(TEST_MODULES),
+    '--cover-package=' + ','.join(TEST_MODULES),
+    '-d',
+    '--with-coverage',
+    '--with-doctest'

 )
 
 
 )
 
 


@@ -132,16 +139,10 @@ FILEBROWSER_URL_FILEBROWSER_MEDIA = STATIC_URL + 'filebrowser/'
 FILEBROWSER_DIRECTORY = 'images/'
 FILEBROWSER_ADMIN_VERSIONS = []
 FILEBROWSER_VERSIONS_BASEDIR = 'thumbnails/'
 FILEBROWSER_DIRECTORY = 'images/'
 FILEBROWSER_ADMIN_VERSIONS = []
 FILEBROWSER_VERSIONS_BASEDIR = 'thumbnails/'

+FILEBROWSER_DEFAULT_ORDER = "path_relative"

 
 # 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


@@ -157,7 +158,9 @@ log.addHandler(ch)
 
 # Import localsettings file, which may override settings defined here
 try:
 
 # Import localsettings file, which may override settings defined here
 try:

+    EXTRA_INSTALLED_APPS = tuple()

     from localsettings import *
     from localsettings import *

+    INSTALLED_APPS += EXTRA_INSTALLED_APPS

 except ImportError:
     pass
 
 except ImportError:
     pass