X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/662a8a111721df714e9c95f94db91d2d03d7b19d..ea335ef160fbe5f8488e8bef51a4706163ba9964:/platforma/settings.py?ds=sidebyside diff --git a/platforma/settings.py b/platforma/settings.py index 628b4eff..90ecd27d 100644 --- a/platforma/settings.py +++ b/platforma/settings.py @@ -1,7 +1,7 @@ # -*- 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 = False TEMPLATE_DEBUG = DEBUG @@ -84,9 +84,9 @@ MIDDLEWARE_CLASSES = ( 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django_cas.middleware.CASMiddleware', - 'django.middleware.doc.XViewMiddleware', + 'django.middleware.doc.XViewMiddleware', 'maintenancemode.middleware.MaintenanceModeMiddleware', - 'debug_toolbar.middleware.DebugToolbarMiddleware' + # 'debug_toolbar.middleware.DebugToolbarMiddleware' # ) AUTHENTICATION_BACKENDS = ( @@ -104,7 +104,7 @@ TEMPLATE_DIRS = ( # # Central Auth System # -## Set this to where the CAS server lives +## Set this to where the CAS server lives # CAS_SERVER_URL = "http://cas.fnp.pl/ CAS_ADMIN_PREFIX = "/admin/" CAS_LOGOUT_COMPLETELY = True @@ -113,44 +113,65 @@ CAS_LOGOUT_COMPLETELY = True COMPRESS_CSS = { 'detail': { 'source_filenames': ( - 'css/master.css', - 'css/html.css', + 'css/master.css', + 'css/gallery.css', + 'css/history.css', + 'css/summary.css', + 'css/html.css', 'css/jquery.autocomplete.css', + 'css/dialogs.css', ), 'output_filename': 'compressed/detail_styles_?.css', }, 'listing': { 'source_filenames': ( - 'css/filelist.css', - ), + 'css/filelist.css', + ), 'output_filename': 'compressed/listing_styles_?.css', } } - + COMPRESS_JS = { - # everything except codemirror and jquery (which we take from google) + # everything except codemirror 'detail': { 'source_filenames': ( - #'js/jquery-1.4.2.min.js', - 'js/jquery.autocomplete.js', + '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', - 'js/xslt.js', - 'js/main.js', - ), + + # wiki scripts + 'js/wiki/wikiapi.js', + 'js/wiki/base.js', + 'js/wiki/xslt.js', + + # dialogs + 'js/wiki/save_dialog.js', + + # views + 'js/wiki/history_view.js', + 'js/wiki/summary_view.js', + 'js/wiki/source_editor.js', + 'js/wiki/wysiwyg_editor.js', + 'js/wiki/scan_gallery.js', + 'js/wiki/diff_view.js', + + # bootstrap + 'js/wiki/main.js', + ), 'output_filename': 'compressed/detail_scripts_?.js', }, 'listing': { 'source_filenames': ( - # 'js/jquery-1.4.2.min.js', - 'js/slugify.js', - ), + '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 @@ -169,12 +190,13 @@ INSTALLED_APPS = ( 'django_nose', 'debug_toolbar', - - 'compress', - 'wiki', + 'compress', + 'south', 'sorl.thumbnail', 'filebrowser', + + 'wiki', 'toolbar', ) @@ -190,7 +212,7 @@ NOSE_ARGS = ( '--cover-package=' + ','.join(TEST_MODULES), '-d', '--with-coverage', - '--with-doctest' + '--with-doctest', ) @@ -203,20 +225,21 @@ FILEBROWSER_DEFAULT_ORDER = "path_relative" # REPOSITORY_PATH = '/Users/zuber/Projekty/platforma/files/books' IMAGE_DIR = 'images' -# Python logging settings -import logging - -log = logging.getLogger('platforma') -log.setLevel(logging.DEBUG) -ch = logging.StreamHandler() -ch.setLevel(logging.DEBUG) -formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s') -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, 'config', + ('logging.cfg' if not DEBUG else 'logging.cfg.dev')) +try: + import logging + import logging.config + + logging.config.fileConfig(LOGGING_CONFIG_FILE) +except ImportError, exc: + raise