X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/3eec01e4c2a842c7383857e49d68664f04759c1f..03c5ba6e50339d7bc470eb6d7f051483eff1e96b:/platforma/settings.py?ds=inline diff --git a/platforma/settings.py b/platforma/settings.py old mode 100755 new mode 100644 index 58861bf4..5485b305 --- a/platforma/settings.py +++ b/platforma/settings.py @@ -1,13 +1,15 @@ # -*- coding: utf-8 -*- -from os import path +import os.path -PROJECT_ROOT = path.realpath(path.dirname(__file__)) +PROJECT_ROOT = os.path.realpath(os.path.dirname(__file__)) -DEBUG = True +DEBUG = False TEMPLATE_DEBUG = DEBUG +MAINTENANCE_MODE = False + ADMINS = ( - (u'Marek Stępniowski', 'marek@stepniowski.com'), + # (u'Marek Stępniowski', 'marek@stepniowski.com'), (u'Łukasz Rekucki', 'lrekucki@gmail.com'), ) @@ -70,7 +72,7 @@ TEMPLATE_CONTEXT_PROCESSORS = ( "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", ) @@ -78,11 +80,18 @@ TEMPLATE_CONTEXT_PROCESSORS = ( MIDDLEWARE_CLASSES = ( 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'explorer.middleware.EditorSettingsMiddleware', - 'django.middleware.doc.XViewMiddleware', + 'django_cas.middleware.CASMiddleware', + 'django.middleware.doc.XViewMiddleware', 'maintenancemode.middleware.MaintenanceModeMiddleware', + 'debug_toolbar.middleware.DebugToolbarMiddleware' +) + +AUTHENTICATION_BACKENDS = ( + 'django.contrib.auth.backends.ModelBackend', + 'django_cas.backends.CASBackend', ) ROOT_URLCONF = 'urls' @@ -91,23 +100,72 @@ TEMPLATE_DIRS = ( PROJECT_ROOT + '/templates', ) + +# +# Central Auth System +# +## Set this to where the CAS server lives +# CAS_SERVER_URL = "http://cas.fnp.pl/ +CAS_ADMIN_PREFIX = "/admin/" +CAS_LOGOUT_COMPLETELY = True + # CSS and JS files to compress -# COMPRESS_CSS = { -# 'all': { -# 'source_filenames': ('css/master.css', 'css/jquery.date_input.css', 'css/jquery.countdown.css',), -# 'output_filename': 'css/all.min.css', -# } -# } -# -# COMPRESS_JS = { -# 'all': { -# 'source_filenames': ('js/jquery.js', 'js/jquery.date_input.js', 'js/jquery.date_input-pl.js', -# 'js/jquery.countdown.js', 'js/jquery.countdown-pl.js',), -# 'output_filename': 'js/all.min.js', -# } -# } -# -# COMPRESS_CSS_FILTERS = None +COMPRESS_CSS = { + 'detail': { + 'source_filenames': ( + 'css/master.css', + 'css/history.css', + 'css/html.css', + 'css/jquery.autocomplete.css', + ), + 'output_filename': 'compressed/detail_styles_?.css', + }, + 'listing': { + 'source_filenames': ( + 'css/filelist.css', + ), + 'output_filename': 'compressed/listing_styles_?.css', + } +} + +COMPRESS_JS = { + # everything except codemirror and jquery (which we take from google) + 'detail': { + 'source_filenames': ( + #'js/jquery-1.4.2.min.js', + 'js/jquery.autocomplete.js', + 'js/jquery.blockui.js', + 'js/jquery.elastic.js', + 'js/button_scripts.js', + 'js/slugify.js', + + # wiki scripts + 'js/wiki/wikiapi.js', + 'js/wiki/base.js', + 'js/wiki/xslt.js', + 'js/wiki/history.js', + 'js/wiki/source_editor.js', + 'js/wiki/wysiwyg_editor.js', + 'js/wiki/main.js', + ), + 'output_filename': 'compressed/detail_scripts_?.js', + }, + 'listing': { + 'source_filenames': ( + # 'js/jquery-1.4.2.min.js', + 'js/slugify.js', + ), + 'output_filename': 'compressed/listing_scripts_?.js', + } +} + +COMPRESS = True +COMPRESS_CSS_FILTERS = None +COMPRESS_JS_FILTERS = None +COMPRESS_AUTO = False +COMPRESS_VERSION = True +COMPRESS_VERSIONING = 'compress.versioning.hash.MD5Versioning' + INSTALLED_APPS = ( 'django.contrib.auth', @@ -117,14 +175,31 @@ INSTALLED_APPS = ( 'django.contrib.admin', 'django.contrib.admindocs', - 'wiki', - 'piston', + 'django_nose', + 'debug_toolbar', + + 'compress', + 'south', 'sorl.thumbnail', 'filebrowser', - 'explorer', + + 'wiki', 'toolbar', - 'bookthemes', - 'api', +) + + +# +# Nose tests +# + +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 +207,10 @@ FILEBROWSER_URL_FILEBROWSER_MEDIA = STATIC_URL + 'filebrowser/' 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' -EDITOR_COOKIE_NAME = 'options' -EDITOR_DEFAULT_SETTINGS = { - 'panels': [ - {'name': 'htmleditor', 'ratio': 0.5}, - {'name': 'gallery', 'ratio': 0.5} - ], -} # Python logging settings import logging @@ -154,10 +223,25 @@ formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(messag ch.setFormatter(formatter) log.addHandler(ch) - # Import localsettings file, which may override settings defined here try: from localsettings import * except ImportError: pass +try: + LOGGING_CONFIG_FILE +except NameError: + LOGGING_CONFIG_FILE = os.path.join(PROJECT_ROOT, + ('logging.cfg' if not DEBUG else 'logging.cfg.dev')) + +try: + import logging + import logging.config + + logging.config.fileConfig(LOGGING_CONFIG_FILE) +except ImportError, exc: + import traceback + traceback.print_exc() + raise +