better ordering for tags

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

diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py
index 2fe69a1..69d9334 100644 (file)
--- a/redakcja/settings/common.py
+++ b/redakcja/settings/common.py
@@ -5,12 +5,11 @@ import os.path
 PROJECT_ROOT = os.path.realpath(os.path.dirname(os.path.dirname(__file__)))
 
 DEBUG = False
 PROJECT_ROOT = os.path.realpath(os.path.dirname(os.path.dirname(__file__)))
 
 DEBUG = False

-TEMPLATE_DEBUG = DEBUG

 
 MAINTENANCE_MODE = False
 
 ADMINS = (
 
 MAINTENANCE_MODE = False
 
 ADMINS = (

-    (u'Radek Czajka', 'radoslaw.czajka@nowoczesnapolska.org.pl'),
+    (u'Jan Szejko', 'jan.szejko@nowoczesnapolska.org.pl'),

 )
 
 MANAGERS = ADMINS
 )
 
 MANAGERS = ADMINS


@@ -24,10 +23,10 @@ TIME_ZONE = 'Europe/Warsaw'
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html

-LANGUAGE_CODE = 'pl'
+LANGUAGE_CODE = 'en'

 
 

-#import locale
-#locale.setlocale(locale.LC_ALL, '')
+# import locale
+# locale.setlocale(locale.LC_ALL, '')

 
 SITE_ID = 1
 
 
 SITE_ID = 1
 


@@ -35,7 +34,10 @@ SITE_ID = 1
 # to load the internationalization machinery.
 USE_I18N = True
 USE_L10N = True
 # to load the internationalization machinery.
 USE_I18N = True
 USE_L10N = True

-
+LANGUAGES = [
+    ('en', 'English'),
+    ('pl', 'polski'),
+]

 
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"
 
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"


@@ -46,6 +48,10 @@ STATICFILES_DIRS = [
     PROJECT_ROOT + '/static/'
 ]
 
     PROJECT_ROOT + '/static/'
 ]
 

+LOCALE_PATHS = [
+    PROJECT_ROOT + '/locale/',
+]
+

 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).
 # Examples: "http://media.lawrence.com", "http://example.com/media/"
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).
 # Examples: "http://media.lawrence.com", "http://example.com/media/"


@@ -54,47 +60,49 @@ STATIC_URL = '/media/static/'
 
 SESSION_COOKIE_NAME = "redakcja_sessionid"
 
 
 SESSION_COOKIE_NAME = "redakcja_sessionid"
 

-# 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',
-)
-
-TEMPLATE_CONTEXT_PROCESSORS = (
-    "django.contrib.auth.context_processors.auth",
-    "django.core.context_processors.debug",
-    "django.core.context_processors.i18n",
-    "redakcja.context_processors.settings", # this is instead of media
-    'django.core.context_processors.csrf',
-    "django.core.context_processors.request",
-)
-
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [
+            os.path.join(PROJECT_ROOT, 'templates'),
+        ],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                "django.contrib.auth.context_processors.auth",
+                "django.template.context_processors.debug",
+                "django.template.context_processors.i18n",
+                "redakcja.context_processors.settings",  # this is instead of media
+                'django.template.context_processors.csrf',
+                "django.template.context_processors.request",
+            ],
+        },
+    },
+]

 
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
 
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',

+    'django.middleware.locale.LocaleMiddleware',

 
     'django.contrib.auth.middleware.AuthenticationMiddleware',
 
     'django.contrib.auth.middleware.AuthenticationMiddleware',

-    'django_cas.middleware.CASMiddleware',
+    # 'django_cas.middleware.CASMiddleware',

 
 

-    'django.middleware.doc.XViewMiddleware',
-    'pagination.middleware.PaginationMiddleware',
-    'maintenancemode.middleware.MaintenanceModeMiddleware',
+    'django.contrib.admindocs.middleware.XViewMiddleware',
+    'fnp_django_pagination.middleware.PaginationMiddleware',
+    # 'maintenancemode.middleware.MaintenanceModeMiddleware',
+    'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',

 )
 
 )
 

-AUTHENTICATION_BACKENDS = (
-    'django.contrib.auth.backends.ModelBackend',
-    'fnpdjango.auth_backends.AttrCASBackend',
-)
+# AUTHENTICATION_BACKENDS = (
+#     'django.contrib.auth.backends.ModelBackend',
+#     'fnpdjango.auth_backends.AttrCASBackend',
+# )

 
 ROOT_URLCONF = 'redakcja.urls'
 
 
 ROOT_URLCONF = 'redakcja.urls'
 

-TEMPLATE_DIRS = (
-    PROJECT_ROOT + '/templates',
-)
-

 FIREPYTHON_LOGGER_NAME = "fnp"
 
 INSTALLED_APPS = (
 FIREPYTHON_LOGGER_NAME = "fnp"
 
 INSTALLED_APPS = (


@@ -106,39 +114,50 @@ INSTALLED_APPS = (
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.admindocs',
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.admindocs',

-    'django.contrib.comments',
+    'django.contrib.flatpages',
+    # 'django.contrib.comments',

 
 

-    'south',
+    # 'south',

     'sorl.thumbnail',
     'sorl.thumbnail',

-    'pagination',
-    'gravatar',
-    'djcelery',
-    'djkombu',
+    'fnp_django_pagination',
+    # 'gravatar',
+    # 'kombu.transport.django',

     'fileupload',
     'pipeline',
     'fileupload',
     'pipeline',

+    'modeltranslation',
+    'constance',
+    'constance.backends.database',
+    'honeypot',
+    'django_filters',

 
     'catalogue',
 
     'catalogue',

-    'cover',
+    # 'cover',

     'dvcs',
     'dvcs',

+    'organizations',

     'wiki',
     'wiki',

-    'toolbar',
-    'apiclient',
+    # 'toolbar',
+    # 'apiclient',

     'email_mangler',
     'email_mangler',

-    'build'
+    'build',
+    'attachments',
+
+    'django_forms_bootstrap',
+    'forms_builder.forms',
+    'fnpdjango',

 )
 
 )
 

-LOGIN_REDIRECT_URL = '/documents/user'
+LOGIN_REDIRECT_URL = '/'

 
 

-CAS_USER_ATTRS_MAP = {
-    'email': 'email', 'firstname': 'first_name', 'lastname': 'last_name'}
+# CAS_USER_ATTRS_MAP = {
+#     'email': 'email', 'firstname': 'first_name', 'lastname': 'last_name'}

 
 # REPOSITORY_PATH = '/Users/zuber/Projekty/platforma/files/books'
 
 IMAGE_DIR = 'images/'
 
 
 
 # REPOSITORY_PATH = '/Users/zuber/Projekty/platforma/files/books'
 
 IMAGE_DIR = 'images/'
 
 

-import djcelery
-djcelery.setup_loader()
+# import djcelery
+# djcelery.setup_loader()

 
 BROKER_BACKEND = "djkombu.transport.DatabaseTransport"
 BROKER_HOST = "localhost"
 
 BROKER_BACKEND = "djkombu.transport.DatabaseTransport"
 BROKER_HOST = "localhost"


@@ -149,8 +168,13 @@ BROKER_VHOST = "/"
 
 SHOW_APP_VERSION = False
 
 
 SHOW_APP_VERSION = False
 

+
+FORMS_BUILDER_EDITABLE_SLUGS = True
+FORMS_BUILDER_LABEL_MAX_LENGTH = 2048
+
+HONEYPOT_FIELD_NAME = 'miut'
+

 try:
     from redakcja.settings.compress import *
 except ImportError:
     pass
 try:
     from redakcja.settings.compress import *
 except ImportError:
     pass

-