Fixed #621: theme management in admin, highlight noncanon themes

[redakcja.git] / redakcja / settings / common.py

diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py
index 379f5b5..7b32ba6 100644 (file)
--- a/redakcja/settings/common.py
+++ b/redakcja/settings/common.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

+from __future__ import absolute_import

 import os.path
 
 PROJECT_ROOT = os.path.realpath(os.path.dirname(os.path.dirname(__file__)))
 import os.path
 
 PROJECT_ROOT = os.path.realpath(os.path.dirname(os.path.dirname(__file__)))


@@ -66,7 +67,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",

-    "redakcja.context_processors.settings", # this is instead of media 
+    "redakcja.context_processors.settings", # this is instead of media

     "django.core.context_processors.request",
 )
 
     "django.core.context_processors.request",
 )
 


@@ -102,8 +103,6 @@ FIREPYTHON_LOGGER_NAME = "fnp"
 # CAS_SERVER_URL = "http://cas.fnp.pl/
 CAS_LOGOUT_COMPLETELY = True
 
 # CAS_SERVER_URL = "http://cas.fnp.pl/
 CAS_LOGOUT_COMPLETELY = True
 

-from compress_settings import *
-

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


@@ -139,18 +138,9 @@ WL_API_CONFIG = {
     "AUTH_PASSWD": "platforma",
 }
 
     "AUTH_PASSWD": "platforma",
 }
 

-# Import localsettings file, which may override settings defined here
+SHOW_APP_VERSION = False

 
 try:
 
 try:

-    import logging
-    if os.path.isfile(LOGGING_CONFIG_FILE):
-        import logging.config
-        logging.config.fileConfig(LOGGING_CONFIG_FILE)
-    else:
-        import sys
-        logging.basicConfig(stream=sys.stderr)
-except NameError:
-    print "No logging"
+    from redakcja.settings.compress import *
+except ImportError:

     pass
     pass

-except ImportError as exc:
-    raise