X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/b9055c7fc8caed025fd28c12532bd462edb8c78d..7dc17cce79e01deeea3d7ba84e4e937c73594a50:/redakcja/settings/common.py diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py index 24a4258c..7b32ba63 100644 --- a/redakcja/settings/common.py +++ b/redakcja/settings/common.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- +from __future__ import absolute_import import os.path -PROJECT_ROOT = os.path.realpath(os.path.dirname(__file__)) +PROJECT_ROOT = os.path.realpath(os.path.dirname(os.path.dirname(__file__))) DEBUG = False TEMPLATE_DEBUG = DEBUG @@ -66,7 +67,7 @@ TEMPLATE_CONTEXT_PROCESSORS = ( "django.core.context_processors.auth", "django.core.context_processors.debug", "django.core.context_processors.i18n", - "redakcja.context_processors.settings", # this is instead of media + "redakcja.context_processors.settings", # this is instead of media "django.core.context_processors.request", ) @@ -102,8 +103,6 @@ FIREPYTHON_LOGGER_NAME = "fnp" # CAS_SERVER_URL = "http://cas.fnp.pl/ CAS_LOGOUT_COMPLETELY = True -from compress_settings import * - INSTALLED_APPS = ( 'django.contrib.auth', 'django.contrib.contenttypes', @@ -139,4 +138,9 @@ WL_API_CONFIG = { "AUTH_PASSWD": "platforma", } -# Import localsettings file, which may override settings defined here +SHOW_APP_VERSION = False + +try: + from redakcja.settings.compress import * +except ImportError: + pass