Fix categorization.

Change *.conf to *.py, so that Django tools see it as code.
Minor fixes.

diff --git a/.gitignore b/.gitignore
index 5818dca..8726538 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-*/settings.d/local.conf
+*/settings.d/local.py

 dev.sqlite
 *.db
 *.db-journal
 dev.sqlite
 *.db
 *.db-journal

diff --git a/prawokultury/locale/pl/LC_MESSAGES/django.mo b/prawokultury/locale/pl/LC_MESSAGES/django.mo
index a24b21f..d31f22a 100644 (file)
Binary files a/prawokultury/locale/pl/LC_MESSAGES/django.mo and b/prawokultury/locale/pl/LC_MESSAGES/django.mo differ

diff --git a/prawokultury/locale/pl/LC_MESSAGES/django.po b/prawokultury/locale/pl/LC_MESSAGES/django.po
index 31b4010..fb1d4e2 100644 (file)
--- a/prawokultury/locale/pl/LC_MESSAGES/django.po
+++ b/prawokultury/locale/pl/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: prawokultury\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: prawokultury\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2012-08-30 11:15+0200\n"
-"PO-Revision-Date: 2012-08-30 11:15+0100\n"
+"POT-Creation-Date: 2012-11-12 10:10+0100\n"
+"PO-Revision-Date: 2012-11-12 10:11+0100\n"

 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: FNP <fundacja@nowoczesnapolska.org.pl>\n"
 "Language: \n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: FNP <fundacja@nowoczesnapolska.org.pl>\n"
 "Language: \n"


@@ -17,15 +17,36 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 

-#: urls.py:23
+#: menu_items.py:21
+msgid "Publications"
+msgstr "Publikacje"
+
+#: menu_items.py:23
+msgid "Events"
+msgstr "Wydarzenia"
+
+#: menu_items.py:27
+msgid "Positions"
+msgstr "Stanowiska"
+
+#: urls.py:31

 msgid "events"
 msgstr "wydarzenia"
 
 msgid "events"
 msgstr "wydarzenia"
 

-#: templates/404.html:5
-msgid "Page not found."
-msgstr "Strona nie znaleziona."
+#: settings.d/60-custom.py:5
+msgid "news"
+msgstr "newsy"
+
+#: settings.d/60-custom.py:7
+msgid "publications"
+msgstr "publikacje"
+
+#: settings.d/60-custom.py:8
+msgid "info"
+msgstr "info"

 
 

-#: templates/404.html:10
+#: templates/404.html:5
+#: templates/404.html.py:10

 msgid "Page not found"
 msgstr "Strona nie znaleziona"
 
 msgid "Page not found"
 msgstr "Strona nie znaleziona"
 


@@ -37,7 +58,7 @@ msgstr "Strona, której szukasz, nie istnieje."
 #: templates/base.html.py:13
 #: templates/base.html:14
 #: templates/base.html.py:25
 #: templates/base.html.py:13
 #: templates/base.html:14
 #: templates/base.html.py:25

-#: templates/base.html:73
+#: templates/base.html:74

 msgid "Culture's right"
 msgstr "Prawo kultury"
 
 msgid "Culture's right"
 msgstr "Prawo kultury"
 


@@ -61,58 +82,42 @@ msgstr ""
 msgid "Search"
 msgstr "Szukaj"
 
 msgid "Search"
 msgstr "Szukaj"
 

-#: templates/base.html:62
+#: templates/base.html:63

 msgid "Upcoming events"
 msgstr "Nadchodzące wydarzenia"
 
 msgid "Upcoming events"
 msgstr "Nadchodzące wydarzenia"
 

-#: templates/base.html:77
+#: templates/base.html:78

 msgid "Latest comments"
 msgstr "Ostatnie komentarze"
 
 msgid "Latest comments"
 msgstr "Ostatnie komentarze"
 

-#: templates/base.html:105
+#: templates/base.html:106

 msgid "If not explicitly stated otherwise, all texts are licensed under the <a href='http://creativecommons.org/licenses/by-sa/3.0/'>Creative Commons Attribution-Share Alike</a> free license."
 msgstr "Jeśli nie oznaczono inaczej, wszystkie teksty są objęte wolną licencją <a href='http://creativecommons.org/licenses/by-sa/3.0/deed.pl'>Creative Commons Uznanie autorstwa – Na tych samych warunkach</a>."
 
 msgid "If not explicitly stated otherwise, all texts are licensed under the <a href='http://creativecommons.org/licenses/by-sa/3.0/'>Creative Commons Attribution-Share Alike</a> free license."
 msgstr "Jeśli nie oznaczono inaczej, wszystkie teksty są objęte wolną licencją <a href='http://creativecommons.org/licenses/by-sa/3.0/deed.pl'>Creative Commons Uznanie autorstwa – Na tych samych warunkach</a>."
 

-#: templates/share.html:5
-#: templates/share.html.py:7
-msgid "Share on Facebook"
-msgstr "Podziel się na Facebooku"
+#~ msgid "Page not found."
+#~ msgstr "Strona nie znaleziona."
+
+#~ msgid "Share on Facebook"
+#~ msgstr "Podziel się na Facebooku"

 
 

-#: templates/share.html:10
-#: templates/share.html.py:12
-msgid "Share on Google+"
-msgstr "Podziel się na Google+"
+#~ msgid "Share on Google+"
+#~ msgstr "Podziel się na Google+"

 
 

-#: templates/share.html:15
-#: templates/share.html.py:17
-msgid "Share on Twitter"
-msgstr "Podziel się na Twitterze"
+#~ msgid "Share on Twitter"
+#~ msgstr "Podziel się na Twitterze"

 
 

-#: templates/share.html:20
-#: templates/share.html.py:22
-msgid "Share on NK.pl"
-msgstr "Podziel się na NK.pl"
+#~ msgid "Share on NK.pl"
+#~ msgstr "Podziel się na NK.pl"

 
 

-#: templates/prevnext/next.html:13
-msgid "next"
-msgstr "następne"
+#~ msgid "next"
+#~ msgstr "następne"

 
 

-#: templates/prevnext/previous.html:13
-msgid "previous"
-msgstr "poprzednie"
+#~ msgid "previous"
+#~ msgstr "poprzednie"

 
 #~ msgid "About us"
 #~ msgstr "O nas"
 
 
 #~ msgid "About us"
 #~ msgstr "O nas"
 

-#~ msgid "Publications"
-#~ msgstr "Publikacje"
-
-#~ msgid "Events"
-#~ msgstr "Wydarzenia"
-
-#~ msgid "Positions"
-#~ msgstr "Stanowiska"
-

 #~ msgid "First aid"
 #~ msgstr "Pierwsza pomoc"
 
 #~ msgid "First aid"
 #~ msgstr "Pierwsza pomoc"
 

diff --git a/prawokultury/settings.d/10-paths.conf b/prawokultury/settings.d/10-paths.conf
deleted file mode 100644 (file)
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 (file)
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 100644 (file)
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 (file)
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 100644 (file)
index 1d0e9b9..0000000
--- a/prawokultury/settings.d/30-apps.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-INSTALLED_APPS = (
-    'prawokultury',
-    'fnpdjango',
-    'menu',
-    'events',
-    'migdal',
-
-    '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 (file)
index 0000000..1d0e9b9
--- /dev/null
+++ b/prawokultury/settings.d/30-apps.py
@@ -0,0 +1,27 @@
+INSTALLED_APPS = (
+    'prawokultury',
+    'fnpdjango',
+    'menu',
+    'events',
+    'migdal',
+
+    '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 100644 (file)
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 (file)
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 (file)
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 (file)
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 100644 (file)
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 (file)
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 100644 (file)
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 (file)
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 100644 (file)
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 (file)
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 100644 (file)
index 47a889e..0000000
--- a/prawokultury/settings.d/40-middleware.conf
+++ /dev/null
@@ -1,25 +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 (file)
index 0000000..47a889e
--- /dev/null
+++ b/prawokultury/settings.d/40-middleware.py
@@ -0,0 +1,25 @@
+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 100644 (file)
index 55c9811..0000000
--- a/prawokultury/settings.d/50-contrib.conf
+++ /dev/null
@@ -1,17 +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'

diff --git a/prawokultury/settings.d/50-contrib.py b/prawokultury/settings.d/50-contrib.py
new file mode 100644 (file)
index 0000000..55c9811
--- /dev/null
+++ b/prawokultury/settings.d/50-contrib.py
@@ -0,0 +1,17 @@
+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'

diff --git a/prawokultury/settings.d/50-static.conf b/prawokultury/settings.d/50-static.conf
deleted file mode 100644 (file)
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 (file)
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 100644 (file)
index 0f84054..0000000
--- a/prawokultury/settings.d/60-custom.conf
+++ /dev/null
@@ -1 +0,0 @@
-MENU_MODULE = 'prawokultury.menu_items'

diff --git a/prawokultury/settings.d/60-custom.py b/prawokultury/settings.d/60-custom.py
new file mode 100644 (file)
index 0000000..984a852
--- /dev/null
+++ b/prawokultury/settings.d/60-custom.py
@@ -0,0 +1,11 @@
+from fnpdjango.utils.settings import LazyUGettextLazy as _
+from migdal.helpers import EntryType
+
+MIGDAL_TYPES = (
+    EntryType('news', _('news'), commentable=True, on_main=True,
+        promotable=True, categorized=True),
+    EntryType('publications', _('publications')),
+    EntryType('info', _('info')),
+)
+
+MENU_MODULE = 'prawokultury.menu_items'

diff --git a/prawokultury/settings.py b/prawokultury/settings.py
index fc41cb4..74b17be 100644 (file)
--- a/prawokultury/settings.py
+++ b/prawokultury/settings.py
@@ -1,7 +1,7 @@
 import os.path
 import glob
 
 import os.path
 import glob
 

-conffiles = glob.glob(os.path.join(os.path.dirname(__file__), 'settings.d', '*.conf'))
+conffiles = glob.glob(os.path.join(os.path.dirname(__file__), 'settings.d', '*.py'))

 conffiles.sort()
 for f in conffiles:
     execfile(os.path.abspath(f))
 conffiles.sort()
 for f in conffiles:
     execfile(os.path.abspath(f))

diff --git a/prawokultury/templates/base.html b/prawokultury/templates/base.html
index cae698b..1430cf9 100755 (executable)
--- a/prawokultury/templates/base.html
+++ b/prawokultury/templates/base.html
@@ -9,6 +9,7 @@
        <link rel="shortcut icon" type="image/png" href="{% static "img/favicon.png" %}" />
         {% compressed_css 'base' %}
 
        <link rel="shortcut icon" type="image/png" href="{% static "img/favicon.png" %}" />
         {% compressed_css 'base' %}
 

+        <meta charset="UTF-8" />

         <meta property='og:url' content='{% block "ogurl" %}{% url 'migdal_main' %}{% endblock %}' />
         <meta property='og:title' content='{% block "ogtitle" %}{% trans "Culture's right" %}{% endblock %}' />
         <meta property='og:site_name' content='{% trans "Culture's right" %}' />
         <meta property='og:url' content='{% block "ogurl" %}{% url 'migdal_main' %}{% endblock %}' />
         <meta property='og:title' content='{% block "ogtitle" %}{% trans "Culture's right" %}{% endblock %}' />
         <meta property='og:site_name' content='{% trans "Culture's right" %}' />

diff --git a/requirements.txt b/requirements.txt
index 5915d22..c9045f2 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ sorl-thumbnail>=11.09,<12
 django-pagination
 
 -e git+git://github.com/fnp/fnpdjango.git@9a5b05c52311da4f726fec29d8be7d173f695352#egg=fnpdjango
 django-pagination
 
 -e git+git://github.com/fnp/fnpdjango.git@9a5b05c52311da4f726fec29d8be7d173f695352#egg=fnpdjango

--e git+git://github.com/fnp/django-migdal.git@734cd58d3f12c5397b42c1ae122c947500386014#egg=django-migdal
+-e git+git://github.com/fnp/django-migdal.git@fe16cac52a33bd593bc8916415dc939d32dfb8f3#egg=django-migdal

 
 textile
 django-markupfield
 
 textile
 django-markupfield