From: Radek Czajka Date: Mon, 12 Nov 2012 11:03:48 +0000 (+0100) Subject: Add charset. X-Git-Url: https://git.mdrn.pl/prawokultury.git/commitdiff_plain/df7591ba8d0b16c2faf45c0064a86a6f31a3733b?ds=inline Add charset. Move .conf to .py, so that Django tools know it's code. --- diff --git a/.gitignore b/.gitignore index 5818dca..8726538 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -*/settings.d/local.conf +*/settings.d/local.py dev.sqlite *.db *.db-journal diff --git a/prawokultury/settings.d/10-paths.conf b/prawokultury/settings.d/10-paths.conf deleted file mode 100755 index b3ef304..0000000 --- a/prawokultury/settings.d/10-paths.conf +++ /dev/null @@ -1,3 +0,0 @@ -from os import path - -PROJECT_DIR = path.dirname(path.abspath(path.dirname(__file__))) diff --git a/prawokultury/settings.d/10-paths.py b/prawokultury/settings.d/10-paths.py new file mode 100644 index 0000000..b3ef304 --- /dev/null +++ b/prawokultury/settings.d/10-paths.py @@ -0,0 +1,3 @@ +from os import path + +PROJECT_DIR = path.dirname(path.abspath(path.dirname(__file__))) diff --git a/prawokultury/settings.d/20-basic.conf b/prawokultury/settings.d/20-basic.conf deleted file mode 100755 index 0d126cc..0000000 --- a/prawokultury/settings.d/20-basic.conf +++ /dev/null @@ -1,33 +0,0 @@ -DEBUG = False -TEMPLATE_DEBUG = DEBUG - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': path.join(PROJECT_DIR, 'dev.db'), # Or path to database file if using sqlite3. - 'USER': '', # Not used with sqlite3. - 'PASSWORD': '', # Not used with sqlite3. - 'HOST': '', # Set to empty string for localhost. Not used with sqlite3. - 'PORT': '', # Set to empty string for default. Not used with sqlite3. - } -} - -SITE_ID = 1 - -# List of callables that know how to import templates from various sources. -TEMPLATE_LOADERS = ( - 'django.template.loaders.filesystem.Loader', - 'django.template.loaders.app_directories.Loader', -# 'django.template.loaders.eggs.Loader', -) - -ROOT_URLCONF = 'prawokultury.urls' - -# Python dotted path to the WSGI application used by Django's runserver. -WSGI_APPLICATION = 'prawokultury.wsgi.application' - -TEMPLATE_DIRS = ( - # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". - # Always use forward slashes, even on Windows. - # Don't forget to use absolute paths, not relative paths. -) diff --git a/prawokultury/settings.d/20-basic.py b/prawokultury/settings.d/20-basic.py new file mode 100644 index 0000000..0d126cc --- /dev/null +++ b/prawokultury/settings.d/20-basic.py @@ -0,0 +1,33 @@ +DEBUG = False +TEMPLATE_DEBUG = DEBUG + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. + 'NAME': path.join(PROJECT_DIR, 'dev.db'), # Or path to database file if using sqlite3. + 'USER': '', # Not used with sqlite3. + 'PASSWORD': '', # Not used with sqlite3. + 'HOST': '', # Set to empty string for localhost. Not used with sqlite3. + 'PORT': '', # Set to empty string for default. Not used with sqlite3. + } +} + +SITE_ID = 1 + +# List of callables that know how to import templates from various sources. +TEMPLATE_LOADERS = ( + 'django.template.loaders.filesystem.Loader', + 'django.template.loaders.app_directories.Loader', +# 'django.template.loaders.eggs.Loader', +) + +ROOT_URLCONF = 'prawokultury.urls' + +# Python dotted path to the WSGI application used by Django's runserver. +WSGI_APPLICATION = 'prawokultury.wsgi.application' + +TEMPLATE_DIRS = ( + # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". + # Always use forward slashes, even on Windows. + # Don't forget to use absolute paths, not relative paths. +) diff --git a/prawokultury/settings.d/30-apps.conf b/prawokultury/settings.d/30-apps.conf deleted file mode 100755 index 374cd3c..0000000 --- a/prawokultury/settings.d/30-apps.conf +++ /dev/null @@ -1,31 +0,0 @@ -INSTALLED_APPS = ( - 'prawokultury', - 'fnpdjango', - - #'events', - 'menu', - 'migdal', - 'contact', - 'chunks', - - 'sponsors', - 'gravatar', - 'south', - 'django.contrib.comments', - 'django_comments_xtd', - 'pipeline', - 'haystack', - 'pagination', - 'sorl.thumbnail', - 'piwik.django', - 'django_cas', - - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.sites', - 'django.contrib.messages', - 'django.contrib.staticfiles', - 'django.contrib.admin', - 'django.contrib.admindocs', -) diff --git a/prawokultury/settings.d/30-apps.py b/prawokultury/settings.d/30-apps.py new file mode 100644 index 0000000..374cd3c --- /dev/null +++ b/prawokultury/settings.d/30-apps.py @@ -0,0 +1,31 @@ +INSTALLED_APPS = ( + 'prawokultury', + 'fnpdjango', + + #'events', + 'menu', + 'migdal', + 'contact', + 'chunks', + + 'sponsors', + 'gravatar', + 'south', + 'django.contrib.comments', + 'django_comments_xtd', + 'pipeline', + 'haystack', + 'pagination', + 'sorl.thumbnail', + 'piwik.django', + 'django_cas', + + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.sites', + 'django.contrib.messages', + 'django.contrib.staticfiles', + 'django.contrib.admin', + 'django.contrib.admindocs', +) diff --git a/prawokultury/settings.d/30-locale.conf b/prawokultury/settings.d/30-locale.conf deleted file mode 100755 index cafb273..0000000 --- a/prawokultury/settings.d/30-locale.conf +++ /dev/null @@ -1,36 +0,0 @@ -# -*- coding: utf-8 -*- - -LANGUAGES = ( - ('pl', u'polski'), - ('en', u'English'), -) - -LOCALE_PATHS = [ - path.join(PROJECT_DIR, 'prawokultury/locale-contrib') -] - -# Local time zone for this installation. Choices can be found here: -# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name -# although not all choices may be available on all operating systems. -# On Unix systems, a value of None will cause Django to use the same -# timezone as the operating system. -# If running in a Windows environment this must be set to the same as your -# system time zone. -TIME_ZONE = None - -# Language code for this installation. All choices can be found here: -# http://www.i18nguy.com/unicode/language-identifiers.html -LANGUAGE_CODE = 'pl' - -# If you set this to False, Django will make some optimizations so as not -# to load the internationalization machinery. -USE_I18N = True - -# If you set this to False, Django will not format dates, numbers and -# calendars according to the current locale. -USE_L10N = True - -# If you set this to False, Django will not use timezone-aware datetimes. -USE_TZ = True - -FORMAT_MODULE_PATH = "prawokultury.formats" diff --git a/prawokultury/settings.d/30-locale.py b/prawokultury/settings.d/30-locale.py new file mode 100644 index 0000000..cafb273 --- /dev/null +++ b/prawokultury/settings.d/30-locale.py @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- + +LANGUAGES = ( + ('pl', u'polski'), + ('en', u'English'), +) + +LOCALE_PATHS = [ + path.join(PROJECT_DIR, 'prawokultury/locale-contrib') +] + +# Local time zone for this installation. Choices can be found here: +# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name +# although not all choices may be available on all operating systems. +# On Unix systems, a value of None will cause Django to use the same +# timezone as the operating system. +# If running in a Windows environment this must be set to the same as your +# system time zone. +TIME_ZONE = None + +# Language code for this installation. All choices can be found here: +# http://www.i18nguy.com/unicode/language-identifiers.html +LANGUAGE_CODE = 'pl' + +# If you set this to False, Django will make some optimizations so as not +# to load the internationalization machinery. +USE_I18N = True + +# If you set this to False, Django will not format dates, numbers and +# calendars according to the current locale. +USE_L10N = True + +# If you set this to False, Django will not use timezone-aware datetimes. +USE_TZ = True + +FORMAT_MODULE_PATH = "prawokultury.formats" diff --git a/prawokultury/settings.d/35-search.conf b/prawokultury/settings.d/35-search.conf deleted file mode 100644 index 15667a3..0000000 --- a/prawokultury/settings.d/35-search.conf +++ /dev/null @@ -1,8 +0,0 @@ -HAYSTACK_CONNECTIONS = { - 'default': { - 'ENGINE': 'haystack.backends.solr_backend.SolrEngine', - 'URL': 'http://127.0.0.1:8983/solr/prawokultury' - }, -} - -HAYSTACK_DOCUMENT_FIELD = "body_%s" % LANGUAGE_CODE diff --git a/prawokultury/settings.d/35-search.py b/prawokultury/settings.d/35-search.py new file mode 100644 index 0000000..15667a3 --- /dev/null +++ b/prawokultury/settings.d/35-search.py @@ -0,0 +1,8 @@ +HAYSTACK_CONNECTIONS = { + 'default': { + 'ENGINE': 'haystack.backends.solr_backend.SolrEngine', + 'URL': 'http://127.0.0.1:8983/solr/prawokultury' + }, +} + +HAYSTACK_DOCUMENT_FIELD = "body_%s" % LANGUAGE_CODE diff --git a/prawokultury/settings.d/40-auth.conf b/prawokultury/settings.d/40-auth.conf deleted file mode 100755 index 675db9d..0000000 --- a/prawokultury/settings.d/40-auth.conf +++ /dev/null @@ -1,5 +0,0 @@ -if 'django_cas' in INSTALLED_APPS: - AUTHENTICATION_BACKENDS = ( - 'django.contrib.auth.backends.ModelBackend', - 'django_cas.backends.CASBackend', - ) diff --git a/prawokultury/settings.d/40-auth.py b/prawokultury/settings.d/40-auth.py new file mode 100644 index 0000000..675db9d --- /dev/null +++ b/prawokultury/settings.d/40-auth.py @@ -0,0 +1,5 @@ +if 'django_cas' in INSTALLED_APPS: + AUTHENTICATION_BACKENDS = ( + 'django.contrib.auth.backends.ModelBackend', + 'django_cas.backends.CASBackend', + ) diff --git a/prawokultury/settings.d/40-context.conf b/prawokultury/settings.d/40-context.conf deleted file mode 100755 index fe0dd19..0000000 --- a/prawokultury/settings.d/40-context.conf +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE_CONTEXT_PROCESSORS = ( - "django.contrib.auth.context_processors.auth", - "django.core.context_processors.debug", - "django.core.context_processors.i18n", - "django.core.context_processors.media", - "django.core.context_processors.static", - "django.core.context_processors.tz", - "django.contrib.messages.context_processors.messages", - 'django.core.context_processors.request', -) diff --git a/prawokultury/settings.d/40-context.py b/prawokultury/settings.d/40-context.py new file mode 100644 index 0000000..fe0dd19 --- /dev/null +++ b/prawokultury/settings.d/40-context.py @@ -0,0 +1,10 @@ +TEMPLATE_CONTEXT_PROCESSORS = ( + "django.contrib.auth.context_processors.auth", + "django.core.context_processors.debug", + "django.core.context_processors.i18n", + "django.core.context_processors.media", + "django.core.context_processors.static", + "django.core.context_processors.tz", + "django.contrib.messages.context_processors.messages", + 'django.core.context_processors.request', +) diff --git a/prawokultury/settings.d/40-logging.conf b/prawokultury/settings.d/40-logging.conf deleted file mode 100755 index 3d91c9c..0000000 --- a/prawokultury/settings.d/40-logging.conf +++ /dev/null @@ -1,28 +0,0 @@ -# A sample logging configuration. The only tangible logging -# performed by this configuration is to send an email to -# the site admins on every HTTP 500 error when DEBUG=False. -# See http://docs.djangoproject.com/en/dev/topics/logging for -# more details on how to customize your logging configuration. -LOGGING = { - 'version': 1, - 'disable_existing_loggers': False, - 'filters': { - 'require_debug_false': { - '()': 'django.utils.log.RequireDebugFalse' - } - }, - 'handlers': { - 'mail_admins': { - 'level': 'ERROR', - 'filters': ['require_debug_false'], - 'class': 'django.utils.log.AdminEmailHandler' - } - }, - 'loggers': { - 'django.request': { - 'handlers': ['mail_admins'], - 'level': 'ERROR', - 'propagate': True, - }, - } -} diff --git a/prawokultury/settings.d/40-logging.py b/prawokultury/settings.d/40-logging.py new file mode 100644 index 0000000..3d91c9c --- /dev/null +++ b/prawokultury/settings.d/40-logging.py @@ -0,0 +1,28 @@ +# A sample logging configuration. The only tangible logging +# performed by this configuration is to send an email to +# the site admins on every HTTP 500 error when DEBUG=False. +# See http://docs.djangoproject.com/en/dev/topics/logging for +# more details on how to customize your logging configuration. +LOGGING = { + 'version': 1, + 'disable_existing_loggers': False, + 'filters': { + 'require_debug_false': { + '()': 'django.utils.log.RequireDebugFalse' + } + }, + 'handlers': { + 'mail_admins': { + 'level': 'ERROR', + 'filters': ['require_debug_false'], + 'class': 'django.utils.log.AdminEmailHandler' + } + }, + 'loggers': { + 'django.request': { + 'handlers': ['mail_admins'], + 'level': 'ERROR', + 'propagate': True, + }, + } +} diff --git a/prawokultury/settings.d/40-middleware.conf b/prawokultury/settings.d/40-middleware.conf deleted file mode 100755 index 530e34a..0000000 --- a/prawokultury/settings.d/40-middleware.conf +++ /dev/null @@ -1,23 +0,0 @@ -MIDDLEWARE_CLASSES = ( - 'django.contrib.sessions.middleware.SessionMiddleware', - #'django.middleware.locale.LocaleMiddleware', - 'fnpdjango.middleware.URLLocaleMiddleware', - - 'django.middleware.common.CommonMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', -) - -if 'django_cas' in INSTALLED_APPS: - MIDDLEWARE_CLASSES += ( - 'django_cas.middleware.CASMiddleware', - ) - -MIDDLEWARE_CLASSES += ( - 'django.contrib.messages.middleware.MessageMiddleware', - 'piwik.django.middleware.PiwikMiddleware', - # Uncomment the next line for simple clickjacking protection: - # 'django.middleware.clickjacking.XFrameOptionsMiddleware', - 'pagination.middleware.PaginationMiddleware', - 'fnpdjango.middleware.SetRemoteAddrFromXRealIP', -) diff --git a/prawokultury/settings.d/40-middleware.py b/prawokultury/settings.d/40-middleware.py new file mode 100644 index 0000000..530e34a --- /dev/null +++ b/prawokultury/settings.d/40-middleware.py @@ -0,0 +1,23 @@ +MIDDLEWARE_CLASSES = ( + 'django.contrib.sessions.middleware.SessionMiddleware', + #'django.middleware.locale.LocaleMiddleware', + 'fnpdjango.middleware.URLLocaleMiddleware', + + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', +) + +if 'django_cas' in INSTALLED_APPS: + MIDDLEWARE_CLASSES += ( + 'django_cas.middleware.CASMiddleware', + ) + +MIDDLEWARE_CLASSES += ( + 'django.contrib.messages.middleware.MessageMiddleware', + 'piwik.django.middleware.PiwikMiddleware', + # Uncomment the next line for simple clickjacking protection: + # 'django.middleware.clickjacking.XFrameOptionsMiddleware', + 'pagination.middleware.PaginationMiddleware', + 'fnpdjango.middleware.SetRemoteAddrFromXRealIP', +) diff --git a/prawokultury/settings.d/50-contrib.conf b/prawokultury/settings.d/50-contrib.conf deleted file mode 100755 index 97aa2f3..0000000 --- a/prawokultury/settings.d/50-contrib.conf +++ /dev/null @@ -1,20 +0,0 @@ -from fnpdjango.utils.text.textilepl import textile_pl - -COMMENTS_APP = "django_comments_xtd" -COMMENTS_XTD_CONFIRM_EMAIL = False - -MARKUP_FIELD_TYPES = ( - ('textile_pl', textile_pl), -) -COMMENTS_XTD_LIST_URL_ACTIVE = True -#COMMENTS_XTD_LIST_PAGINATE_BY = 10 - -THUMBNAIL_QUALITY = 95 - -GRAVATAR_DEFAULT_IMAGE = 'http://localhost:8000/static/img/avatar.png' - -CAS_SERVER_URL = 'http://logowanie.nowoczesnapolska.org.pl/cas/' -CAS_VERSION = '1' - - -SPONSORS_THUMB_HEIGHT = None diff --git a/prawokultury/settings.d/50-contrib.py b/prawokultury/settings.d/50-contrib.py new file mode 100644 index 0000000..97aa2f3 --- /dev/null +++ b/prawokultury/settings.d/50-contrib.py @@ -0,0 +1,20 @@ +from fnpdjango.utils.text.textilepl import textile_pl + +COMMENTS_APP = "django_comments_xtd" +COMMENTS_XTD_CONFIRM_EMAIL = False + +MARKUP_FIELD_TYPES = ( + ('textile_pl', textile_pl), +) +COMMENTS_XTD_LIST_URL_ACTIVE = True +#COMMENTS_XTD_LIST_PAGINATE_BY = 10 + +THUMBNAIL_QUALITY = 95 + +GRAVATAR_DEFAULT_IMAGE = 'http://localhost:8000/static/img/avatar.png' + +CAS_SERVER_URL = 'http://logowanie.nowoczesnapolska.org.pl/cas/' +CAS_VERSION = '1' + + +SPONSORS_THUMB_HEIGHT = None diff --git a/prawokultury/settings.d/50-static.conf b/prawokultury/settings.d/50-static.conf deleted file mode 100755 index 3f5f951..0000000 --- a/prawokultury/settings.d/50-static.conf +++ /dev/null @@ -1,47 +0,0 @@ -MEDIA_ROOT = path.join(PROJECT_DIR, 'media/') -MEDIA_URL = '/media/' -STATIC_ROOT = path.join(PROJECT_DIR, 'static/') -STATIC_URL = '/static/' - -STATICFILES_FINDERS = ( - 'django.contrib.staticfiles.finders.FileSystemFinder', - 'django.contrib.staticfiles.finders.AppDirectoriesFinder', -# 'django.contrib.staticfiles.finders.DefaultStorageFinder', -) - -STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage' -PIPELINE_CSS_COMPRESSOR = None -PIPELINE_JS_COMPRESSOR = None -PIPELINE_CSS = { - 'base': { - 'source_filenames': ( - 'css/base.scss', - 'css/layout.scss', - 'css/header.scss', - 'css/menu.scss', - 'css/search.scss', - 'css/sidebar.scss', - 'css/promobox.scss', - 'css/entry.scss', - 'css/footer.scss', - 'css/prevnext.scss', - 'css/forms.scss', - 'events/events.scss', - ), - 'output_filename': 'compressed/base.css', - }, -} -PIPELINE_JS = { - 'base': { - 'source_filenames': ( - 'js/promobox.js', - ), - 'output_filename': 'compressed/base.js', - }, -} - -PIPELINE_COMPILERS = ( - 'pipeline.compilers.sass.SASSCompiler', -) - -PIPELINE_STORAGE = 'pipeline.storage.PipelineFinderStorage' diff --git a/prawokultury/settings.d/50-static.py b/prawokultury/settings.d/50-static.py new file mode 100644 index 0000000..3f5f951 --- /dev/null +++ b/prawokultury/settings.d/50-static.py @@ -0,0 +1,47 @@ +MEDIA_ROOT = path.join(PROJECT_DIR, 'media/') +MEDIA_URL = '/media/' +STATIC_ROOT = path.join(PROJECT_DIR, 'static/') +STATIC_URL = '/static/' + +STATICFILES_FINDERS = ( + 'django.contrib.staticfiles.finders.FileSystemFinder', + 'django.contrib.staticfiles.finders.AppDirectoriesFinder', +# 'django.contrib.staticfiles.finders.DefaultStorageFinder', +) + +STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage' +PIPELINE_CSS_COMPRESSOR = None +PIPELINE_JS_COMPRESSOR = None +PIPELINE_CSS = { + 'base': { + 'source_filenames': ( + 'css/base.scss', + 'css/layout.scss', + 'css/header.scss', + 'css/menu.scss', + 'css/search.scss', + 'css/sidebar.scss', + 'css/promobox.scss', + 'css/entry.scss', + 'css/footer.scss', + 'css/prevnext.scss', + 'css/forms.scss', + 'events/events.scss', + ), + 'output_filename': 'compressed/base.css', + }, +} +PIPELINE_JS = { + 'base': { + 'source_filenames': ( + 'js/promobox.js', + ), + 'output_filename': 'compressed/base.js', + }, +} + +PIPELINE_COMPILERS = ( + 'pipeline.compilers.sass.SASSCompiler', +) + +PIPELINE_STORAGE = 'pipeline.storage.PipelineFinderStorage' diff --git a/prawokultury/settings.d/60-custom.conf b/prawokultury/settings.d/60-custom.conf deleted file mode 100755 index 87e1d91..0000000 --- a/prawokultury/settings.d/60-custom.conf +++ /dev/null @@ -1,19 +0,0 @@ -from fnpdjango.utils.settings import LazyUGettextLazy as gettext -from migdal.helpers import EntryType - -MIGDAL_TYPES = ( - EntryType('info', gettext('info'), commentable=False, on_main=False), -) - -MIGDAL_TAXONOMIES = () -MIGDAL_MAIN_PAGE_ENTRY = {'slug_pl': 'co'} - -CONTACT_FORMS_MODULE = 'prawokultury.contact_forms' - -MENU_MODULE = 'prawokultury.menu_items' - -# Use Nginx's X-accel when serving files with helpers.serve_file(). -# See http://wiki.nginx.org/X-accel -X_ACCEL_REDIRECT = False - -REGISTRATION_LIMIT = 100 diff --git a/prawokultury/settings.d/60-custom.py b/prawokultury/settings.d/60-custom.py new file mode 100644 index 0000000..87e1d91 --- /dev/null +++ b/prawokultury/settings.d/60-custom.py @@ -0,0 +1,19 @@ +from fnpdjango.utils.settings import LazyUGettextLazy as gettext +from migdal.helpers import EntryType + +MIGDAL_TYPES = ( + EntryType('info', gettext('info'), commentable=False, on_main=False), +) + +MIGDAL_TAXONOMIES = () +MIGDAL_MAIN_PAGE_ENTRY = {'slug_pl': 'co'} + +CONTACT_FORMS_MODULE = 'prawokultury.contact_forms' + +MENU_MODULE = 'prawokultury.menu_items' + +# Use Nginx's X-accel when serving files with helpers.serve_file(). +# See http://wiki.nginx.org/X-accel +X_ACCEL_REDIRECT = False + +REGISTRATION_LIMIT = 100 diff --git a/prawokultury/templates/base.html b/prawokultury/templates/base.html index 4d0a8b4..19eefc4 100755 --- a/prawokultury/templates/base.html +++ b/prawokultury/templates/base.html @@ -10,6 +10,7 @@ {% compressed_css 'base' %} +