From: Łukasz Rekucki Date: Tue, 8 Jun 2010 11:59:48 +0000 (+0200) Subject: Seettings cleanup. X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/62b05e9c226f0a65a1df6f83dfae85b028cff0f8?ds=sidebyside Seettings cleanup. --- diff --git a/localsettings.sample b/localsettings.sample deleted file mode 100644 index c174cf92..00000000 --- a/localsettings.sample +++ /dev/null @@ -1,18 +0,0 @@ -# -# localsettings template for Platforma -# -# Duplicate this file as localsettings.py and change it to your liking. -# Settings defined in localsettings.py will override settings from -# settings.py file. localsettings.py should never be commited -# to a version control system. Please make changes to settings.py -# or localsettings.sample instead. -# - -# Path to repository with managed documents -REPOSITORY_PATH = '/home/user/repository' - -# Subdirectory of STATIC_ROOT containing images -IMAGE_DIR = 'images' - -CAS_SERVICE_URL = 'http://stigma.nowoczesnapolska.org.pl/cas/' - diff --git a/redakcja/compress_settings.py b/redakcja/compress_settings.py deleted file mode 100644 index 7207f1b9..00000000 --- a/redakcja/compress_settings.py +++ /dev/null @@ -1,72 +0,0 @@ -# CSS and JS files to compress -COMPRESS_CSS = { - 'detail': { - 'source_filenames': ( - 'css/master.css', - 'css/toolbar.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', - ), - 'output_filename': 'compressed/listing_styles_?.css', - } -} - -COMPRESS_JS = { - # everything except codemirror - 'detail': { - 'source_filenames': ( - # libraries - 'js/lib/jquery-1.4.2.min.js', - 'js/lib/jquery/jquery.autocomplete.js', - 'js/lib/jquery/jquery.blockui.js', - 'js/lib/jquery/jquery.elastic.js', - 'js/button_scripts.js', - 'js/slugify.js', - - # wiki scripts - 'js/wiki/wikiapi.js', - 'js/wiki/xslt.js', - - # base UI - 'js/wiki/base.js', - 'js/wiki/toolbar.js', - - # dialogs - 'js/wiki/dialog_save.js', - 'js/wiki/dialog_addtag.js', - - # views - 'js/wiki/view_history.js', - 'js/wiki/view_summary.js', - 'js/wiki/view_editor_source.js', - 'js/wiki/view_editor_wysiwyg.js', - 'js/wiki/view_gallery.js', - 'js/wiki/view_column_diff.js', - ), - 'output_filename': 'compressed/detail_scripts_?.js', - }, - 'listing': { - 'source_filenames': ( - 'js/lib/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 = True -COMPRESS_VERSION = True -COMPRESS_VERSIONING = 'compress.versioning.hash.MD5Versioning' diff --git a/redakcja/localsettings.sample b/redakcja/localsettings.sample new file mode 100644 index 00000000..6f99ddd3 --- /dev/null +++ b/redakcja/localsettings.sample @@ -0,0 +1,27 @@ +# +# localsettings template for Platforma +# +# Duplicate this file as localsettings.py and change it to your liking. +# Settings defined in localsettings.py will override settings from +# settings.py file. localsettings.py should never be commited +# to a version control system. Please make changes to settings.py +# or localsettings.sample instead. +# + +# THIS IS REQUIRED +from redakcja.settings import * + +# Path to repository with managed documents +WIKI_REPOSITORY_PATH = '/home/lrekucki/projekty/fundacja/books' + +LOGGING_CONFIG_FILE = "/home/lrekucki/projekty/fundacja/redakcja/logging.cfg.dev" + +STATIC_ROOT = '/home/lrekucki/projekty/fundacja/redakcja/redakcja/static/' +MEDIA_ROOT = '/home/lrekucki/projekty/fundacja/media/' + +# Subdirectory of STATIC_ROOT containing images +IMAGE_DIR = 'images' + +CAS_SERVER_URL = 'http://logowanie.wolnelektury.pl/cas/' +DEBUG = True +COMPRESS = False \ No newline at end of file diff --git a/redakcja/manage.py b/redakcja/manage.py index 4c118422..28b571d4 100755 --- a/redakcja/manage.py +++ b/redakcja/manage.py @@ -1,23 +1,25 @@ #!/usr/bin/env python from django.core.management import execute_manager -try: - import settings # Assumed to be in the same directory. -except ImportError: - import sys - sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__) - sys.exit(1) -if __name__ == "__main__": - # Append lib and apps directories to PYTHONPATH - import os - import sys +import logging +import sys +import os + +logging.basicConfig(level=logging.DEBUG, stream=sys.stderr) - PROJECT_ROOT = os.path.realpath(os.path.dirname(__file__)) - sys.path += [os.path.realpath(os.path.join(*x)) for x in ( +PROJECT_ROOT = os.path.realpath(os.path.dirname(__file__)) +sys.path += [os.path.realpath(os.path.join(*x)) for x in ( + (PROJECT_ROOT, '..'), (PROJECT_ROOT, '..', 'apps'), (PROJECT_ROOT, '..', 'lib') - )] - +)] +try: + import localsettings # Assumed to be in the same directory. +except ImportError: + logging.exception("Failed to import settings") + import sys + sys.exit(1) - execute_manager(settings) +if __name__ == "__main__": + execute_manager(localsettings) diff --git a/redakcja/settings/__init__.py b/redakcja/settings/__init__.py index d3f9d7c5..6f1c094e 100644 --- a/redakcja/settings/__init__.py +++ b/redakcja/settings/__init__.py @@ -1,5 +1,5 @@ from __future__ import absolute_import -from .common import * +from redakcja.settings.common import * DATABASE_ENGINE = 'sqlite3' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. DATABASE_NAME = PROJECT_ROOT + '/dev.sqlite' # Or path to database file if using sqlite3. @@ -8,11 +8,6 @@ DATABASE_PASSWORD = '' # Not used with sqlite3. DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3. DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3. -try: - from localsettings import * -except ImportError: - pass - try: LOGGING_CONFIG_FILE except NameError: diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py index 377a4d50..9689f729 100644 --- a/redakcja/settings/common.py +++ b/redakcja/settings/common.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +from __future__ import absolute_import import os.path PROJECT_ROOT = os.path.realpath(os.path.dirname(os.path.dirname(__file__))) @@ -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,17 +138,7 @@ WL_API_CONFIG = { "AUTH_PASSWD": "platforma", } -# Import localsettings file, which may override settings defined here - -from localsettings import * - 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 ImportError as exc: - raise + from redakcja.settings.compress import * +except ImportError: + pass diff --git a/redakcja/settings/compress.py b/redakcja/settings/compress.py new file mode 100644 index 00000000..7207f1b9 --- /dev/null +++ b/redakcja/settings/compress.py @@ -0,0 +1,72 @@ +# CSS and JS files to compress +COMPRESS_CSS = { + 'detail': { + 'source_filenames': ( + 'css/master.css', + 'css/toolbar.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', + ), + 'output_filename': 'compressed/listing_styles_?.css', + } +} + +COMPRESS_JS = { + # everything except codemirror + 'detail': { + 'source_filenames': ( + # libraries + 'js/lib/jquery-1.4.2.min.js', + 'js/lib/jquery/jquery.autocomplete.js', + 'js/lib/jquery/jquery.blockui.js', + 'js/lib/jquery/jquery.elastic.js', + 'js/button_scripts.js', + 'js/slugify.js', + + # wiki scripts + 'js/wiki/wikiapi.js', + 'js/wiki/xslt.js', + + # base UI + 'js/wiki/base.js', + 'js/wiki/toolbar.js', + + # dialogs + 'js/wiki/dialog_save.js', + 'js/wiki/dialog_addtag.js', + + # views + 'js/wiki/view_history.js', + 'js/wiki/view_summary.js', + 'js/wiki/view_editor_source.js', + 'js/wiki/view_editor_wysiwyg.js', + 'js/wiki/view_gallery.js', + 'js/wiki/view_column_diff.js', + ), + 'output_filename': 'compressed/detail_scripts_?.js', + }, + 'listing': { + 'source_filenames': ( + 'js/lib/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 = True +COMPRESS_VERSION = True +COMPRESS_VERSIONING = 'compress.versioning.hash.MD5Versioning'