From a76f4422488d3017c1b3540afd7f5c44e989e5de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Schneider?= <jschneider@entrouvert.com>
Date: Thu, 16 Jan 2014 13:35:24 +0100
Subject: [PATCH] enable portail citoyen to be standalone

---
 .gitignore                                    |   1 +
 local_settings.py.example                     |   9 +-
 portail-citoyen                               |   2 +-
 portail_citoyen/dashboard.py                  |  91 ++++
 portail_citoyen/menu.py                       |  22 +
 portail_citoyen/settings.py                   | 461 ++++++++++++++++++
 portail_citoyen/templates/base-cms.html       |  20 +
 portail_citoyen/templates/base_auquo2.html    |   6 +-
 portail_citoyen/templates/base_orleans.html   | 106 ++++
 portail_citoyen/templates/block.html          |   3 +
 .../templates/extra-placeholders.html         |  34 ++
 portail_citoyen/wsgi.py                       |   2 +-
 requirements.txt                              |   2 +
 setup.py                                      |   2 +
 14 files changed, 749 insertions(+), 12 deletions(-)
 create mode 100644 portail_citoyen/dashboard.py
 create mode 100644 portail_citoyen/menu.py
 create mode 100644 portail_citoyen/settings.py
 create mode 100644 portail_citoyen/templates/base-cms.html
 create mode 100644 portail_citoyen/templates/base_orleans.html
 create mode 100644 portail_citoyen/templates/block.html
 create mode 100644 portail_citoyen/templates/extra-placeholders.html

diff --git a/.gitignore b/.gitignore
index ed8a0b3..887273c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ portail_citoyen.sqlite
 local_settings.py
 *.pyc
 *.mo
+portail-citoyen.db
diff --git a/local_settings.py.example b/local_settings.py.example
index 3f9d25c..ef804f1 100644
--- a/local_settings.py.example
+++ b/local_settings.py.example
@@ -1,4 +1,5 @@
-import os.path
+
+import os
 
 DEBUG = True
 
@@ -12,9 +13,6 @@ INTERNAL_IPS = ('127.0.0.1',)
 
 SECRET_KEY = 'coin'
 
-from portail_citoyen.settings import INSTALLED_APPS, \
-     MIDDLEWARE_CLASSES, TEMPLATE_DIRS, STATICFILES_DIRS
-
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
@@ -22,6 +20,3 @@ DATABASES = {
     },
 }
 
-if DEBUG:
-	INSTALLED_APPS += ('debug_toolbar',)
-	MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',)
diff --git a/portail-citoyen b/portail-citoyen
index 80a5b0d..8e71e09 100755
--- a/portail-citoyen
+++ b/portail-citoyen
@@ -3,7 +3,7 @@ import os
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "portail_citoyen.settings.prod")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "portail_citoyen.settings")
 
     from django.core.management import execute_from_command_line
 
diff --git a/portail_citoyen/dashboard.py b/portail_citoyen/dashboard.py
new file mode 100644
index 0000000..583021c
--- /dev/null
+++ b/portail_citoyen/dashboard.py
@@ -0,0 +1,91 @@
+from django.utils.translation import ugettext_lazy as _
+from admin_tools.dashboard import modules, Dashboard, AppIndexDashboard
+
+
+class CustomIndexDashboard(Dashboard):
+    """
+    Custom index dashboard for Compte Orleans
+    """
+    def init_with_context(self, context):
+        # append an app list module for "Applications"
+        self.children.append(modules.ModelList(
+            _('Users and roles'),
+            models=('compte_orleans.models.User',
+                'portail_citoyen.models.Role'),
+        ))
+        self.children.append(modules.ModelList(
+            _('Services'),
+            models=(
+                'authentic2.saml.models.LibertyProvider',
+                'authentic2.saml.models.LibertyFederation',
+                'authentic2.saml.models.SPOptionsIdPPolicy',
+                'authentic2.saml.models.IdPOptionsSPPolicy',
+                'authentic2.attribute_aggregator.models.AttributeSource',
+                'authentic2.idp.models.AttributePolicy',
+                'authentic2.idp.models.AttributeList',
+                'authentic2.idp.models.AttributeItem',
+            ),
+        ))
+        self.children.append(modules.ModelList(
+            _('Contents'),
+            models=(
+                'cms.models.pagemodel.Page',
+                'data_source_plugin.models.DataSource',
+                'cms.plugins.snippet.models.Snippet',
+            ),
+        ))
+
+        self.children.append(modules.ModelList(
+            _('Announces'),
+            models=(
+                'portail_citoyen_announces.*',
+            ),
+        ))
+
+        # append a recent actions module
+        self.children.append(modules.RecentActions(_('Recent Actions'), 5))
+
+        # append another link list module for "support".
+        self.children.append(modules.LinkList(
+            _('Support'),
+            children=[
+                {
+                    'title': _('Project site'),
+                    'url': 'https://dev.entrouvert.org/projects/portail-citoyen/',
+                    'external': True,
+                },
+                {
+                    'title': _('Report a bug'),
+                    'url': 'https://dev.entrouvert.org/projects/portail-citoyen/issues/new',
+                    'external': True,
+                },
+            ]
+        ))
+
+
+class CustomAppIndexDashboard(AppIndexDashboard):
+    """
+    Custom app index dashboard for Compte Orleans
+    """
+
+    # we disable title because its redundant with the model list module
+    title = ''
+
+    def __init__(self, *args, **kwargs):
+        AppIndexDashboard.__init__(self, *args, **kwargs)
+
+        # append a model list module and a recent actions module
+        self.children += [
+            modules.ModelList(self.app_title, self.models),
+            modules.RecentActions(
+                _('Recent Actions'),
+                include_list=self.get_app_content_types(),
+                limit=5
+            )
+        ]
+
+    def init_with_context(self, context):
+        """
+        Use this method if you need to access the request context.
+        """
+        return super(CustomAppIndexDashboard, self).init_with_context(context)
diff --git a/portail_citoyen/menu.py b/portail_citoyen/menu.py
new file mode 100644
index 0000000..05af1d8
--- /dev/null
+++ b/portail_citoyen/menu.py
@@ -0,0 +1,22 @@
+from django.core.urlresolvers import reverse
+from django.utils.translation import ugettext_lazy as _
+
+from admin_tools.menu import items, Menu
+
+
+class CustomMenu(Menu):
+    """
+    Custom Menu for Portail Citoyen
+    """
+    def __init__(self, **kwargs):
+        Menu.__init__(self, **kwargs)
+        self.children += [
+            items.MenuItem(_('Dashboard'), reverse('admin:index')),
+            items.Bookmarks(),
+        ]
+
+    def init_with_context(self, context):
+        """
+        Use this method if you need to access the request context.
+        """
+        return super(CustomMenu, self).init_with_context(context)
diff --git a/portail_citoyen/settings.py b/portail_citoyen/settings.py
new file mode 100644
index 0000000..dc7202a
--- /dev/null
+++ b/portail_citoyen/settings.py
@@ -0,0 +1,461 @@
+import os
+import logging.handlers
+from django.conf.global_settings import PASSWORD_HASHERS
+
+gettext_noop = lambda s: s
+# Python dotted path to the WSGI application used by Django's runserver.
+WSGI_APPLICATION = 'portail_citoyen.wsgi.application'
+DEBUG = 'DEBUG' in os.environ
+DEBUG_PROPAGATE_EXCEPTIONS = 'DEBUG_PROPAGATE_EXCEPTIONS' in os.environ
+USE_DEBUG_TOOLBAR = 'USE_DEBUG_TOOLBAR' in os.environ
+TEMPLATE_DEBUG = DEBUG
+
+PROJECT_PATH = os.path.join(os.path.dirname(__file__))
+PROJECT_NAME = 'portail-citoyen'
+
+ADMINS = ()
+if 'ADMINS' in os.environ:
+    ADMINS = filter(None, os.environ.get('ADMINS').split(':'))
+    ADMINS = [ admin.split(';') for admin in ADMINS ]
+    for admin in ADMINS:
+        assert len(admin) == 2, 'ADMINS setting must be a colon separated list of name and emails separated by a semi-colon'
+        assert '@' in admin[1], 'ADMINS setting pairs second value must be emails'
+
+MANAGERS = ADMINS
+
+DATABASES = {
+    'default': {
+        'ENGINE': os.environ.get('DATABASE_ENGINE', 'django.db.backends.sqlite3'),
+        'NAME': os.environ.get('DATABASE_NAME', os.path.join(PROJECT_PATH, '..', PROJECT_NAME + '.db')),
+    }
+}
+
+# Hey Entr'ouvert is in France !!
+TIME_ZONE = 'Europe/Paris'
+LANGUAGE_CODE = 'fr'
+SITE_ID = 1
+USE_I18N = True
+USE_TZ = True
+
+LANGUAGES = (
+    ('fr', gettext_noop('French')),
+)
+USE_L10N = True
+
+# Static files
+
+STATIC_ROOT = os.environ.get('STATIC_ROOT', '/var/lib/%s/static' % PROJECT_NAME)
+STATIC_URL = os.environ.get('STATIC_URL', '/static/')
+MEDIA_ROOT = os.environ.get('MEDIA_ROOT', '/var/lib/%s/media' % PROJECT_NAME)
+MEDIA_URL = os.environ.get('MEDIA_URL', '/media/')
+
+# passerelle address & apikey
+PASSERELLE_URL = os.environ.get('PASSERELLE_URL', '')
+PASSERELLE_APIKEY = os.environ.get('PASSERELLE_APIKEY', '')
+
+if 'STATICFILES_DIRS' in os.environ:
+    STATICFILES_DIRS = os.environ['STATICFILES_DIRS'].split(':')
+
+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',
+    'django.core.context_processors.media',
+    'django.core.context_processors.request',
+    'django.contrib.messages.context_processors.messages',
+    'django.core.context_processors.static',
+    'authentic2.context_processors.federations_processor',
+    'cms.context_processors.media',
+    'sekizai.context_processors.sekizai',
+)
+
+MIDDLEWARE_CLASSES = (
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.http.ConditionalGetMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.middleware.locale.LocaleMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.transaction.TransactionMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'authentic2.idp.middleware.DebugMiddleware',
+    'cms.middleware.page.CurrentPageMiddleware',
+    'cms.middleware.user.CurrentUserMiddleware',
+    'cms.middleware.toolbar.ToolbarMiddleware',
+    'entrouvert.djommon.middleware.VersionMiddleware',
+)
+
+PORTAIL_CITOYEN_FAVICON_URL = ''
+
+ROOT_URLCONF = 'portail_citoyen.urls'
+
+if os.environ.get('TEMPLATE_DIRS'):
+    TEMPLATE_DIRS = os.environ['TEMPLATE_DIRS'].split(':')
+else:
+    TEMPLATE_DIRS = ('/var/lib/%s/templates' % PROJECT_NAME,)
+
+import portail_citoyen
+
+INSTALLED_APPS = (
+    'cms',
+    'login_plugin',
+    'data_source_plugin',
+    'a2_service_list_plugin',
+    'portail_citoyen',
+    'authentic2',
+    'authentic2.nonce',
+    'authentic2.saml',
+    'authentic2.idp',
+    'authentic2.idp.saml',
+    'authentic2.auth2_auth',
+    'authentic2.attribute_aggregator',
+    'authentic2.disco_service',
+    'menus',
+    'cms.plugins.file',
+    'cms.plugins.googlemap',
+    'cms.plugins.link',
+    'cms.plugins.picture',
+    'cms.plugins.snippet',
+    'cms.plugins.teaser',
+    'cms.plugins.video',
+    'cmsplugin_text_wrapper',
+    'admin_tools',
+    'admin_tools.theming',
+    'admin_tools.menu',
+    'admin_tools.dashboard',
+    'registration',
+    'south',
+    'mptt',
+    'sekizai',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.sites',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+    'django.contrib.admin',
+)
+
+MESSAGE_STORAGE = 'django.contrib.messages.storage.session.SessionStorage'
+
+
+# Registration settings
+ACCOUNT_ACTIVATION_DAYS = int(os.environ.get('ACCOUNT_ACTIVATION_DAYS', 3))
+PASSWORD_RESET_TIMEOUT_DAYS = int(os.environ.get('PASSWORD_RESET_TIMEOUT_DAYS', 3))
+#A2_REGISTRATION_FORM_CLASS = 'compte_orleans.registration_backend.forms.RegistrationForm'
+
+# authentication
+AUTHENTICATION_BACKENDS = (
+    'django.contrib.auth.backends.ModelBackend',
+)
+AUTH_USER_MODEL = 'portail_citoyen.Citoyen'
+PASSWORD_HASHERS += (
+    'authentic2.hashers.SHA256PasswordHasher',
+)
+
+# sessions
+SESSION_EXPIRE_AT_BROWSER_CLOSE =  'SESSION_EXPIRE_AT_BROWSER_CLOSE' in os.environ
+SESSION_COOKIE_AGE = int(os.environ.get('SESSION_COOKIE_AGE', 36000)) # one day of work
+SESSION_COOKIE_NAME = os.environ.get('SESSION_COOKIE_NAME', 'sessionid')
+SESSION_COOKIE_PATH = os.environ.get('SESSION_COOKIE_PATH', '/')
+SESSION_COOKIE_SECURE = 'SESSION_COOKIE_SECURE' in os.environ
+
+# email settings
+EMAIL_HOST = os.environ.get('EMAIL_HOST', 'localhost')
+EMAIL_HOST_USER = os.environ.get('EMAIL_HOST_USER', '')
+EMAIL_HOST_PASSWORD = os.environ.get('EMAIL_HOST_PASSWORD', '')
+EMAIL_PORT = int(os.environ.get('EMAIL_PORT', 25))
+EMAIL_SUBJECT_PREFIX = os.environ.get('EMAIL_SUBJECT_PREFIX', '[Portail citoyen]')
+EMAIL_USE_TLS = 'EMAIL_USE_TLS' in os.environ
+SERVER_EMAIL = os.environ.get('SERVER_EMAIL', 'root@localhost')
+DEFAULT_FROM_EMAIL = os.environ.get('DEFAULT_FROM_EMAIL', 'ne-pas-repondre@portail-citoyen.fr')
+
+# web & network settings
+if 'ALLOWED_HOSTS' in os.environ:
+    ALLOWED_HOSTS = os.environ['ALLOWED_HOSTS'].split(':')
+else:
+    ALLOWED_HOSTS = ('127.0.0.1', 'localhost')
+USE_X_FORWARDED_HOST = 'USE_X_FORWARDED_HOST' in os.environ
+LOGIN_REDIRECT_URL = os.environ.get('LOGIN_REDIRECT_URL', '/')
+LOGIN_URL = os.environ.get('LOGIN_URL', '/login')
+LOGOUT_URL = os.environ.get('LOGOUT_URL', '/accounts/logout')
+
+if 'INTERNAL_IPS' in os.environ:
+    INTERNAL_IPS = os.environ['INTERNAL_IPS'].split(':')
+else:
+    INTERNAL_IPS = ('127.0.0.1')
+
+# misc
+SECRET_KEY = os.environ.get('SECRET_KEY', '0!=(1kc6kri-ui+tmj@mr+*0bvj!(p*r0duu2n=)7@!p=pvf9n')
+DEBUG_TOOLBAR_CONFIG = {'INTERCEPT_REDIRECTS': False}
+
+# Authentic2 settings
+
+DISCO_SERVICE = 'DISCO_SERVICE' in os.environ
+DISCO_USE_OF_METADATA = 'DISCO_USE_OF_METADATA' in os.environ
+
+DISCO_SERVICE_NAME = os.environ.get('DISCO_SERVICE_NAME', "http://www.identity-hub.com/disco_service/disco")
+DISCO_RETURN_ID_PARAM = "entityID"
+SHOW_DISCO_IN_MD = 'SHOW_DISCO_IN_MD' in os.environ
+USE_DISCO_SERVICE = 'USE_DISCO_SERVICE' in os.environ
+
+###########################
+# Authentication settings
+###########################
+
+# Only RSA private keys are currently supported
+AUTH_FRONTENDS = ( 'authentic2.auth2_auth.backend.LoginPasswordBackend',)
+
+
+# expiration in seconds of authentication events.
+# default: 1 week
+# AUTHENTICATION_EVENT_EXPIRATION = 3600*24*7
+
+# SSL Authentication
+AUTH_SSL = False
+SSLAUTH_CREATE_USER = True
+
+# SAML2 Authentication
+AUTH_SAML2 = True
+
+# OpenID Authentication
+AUTH_OPENID = False
+
+# OATH Authentication
+AUTH_OATH = False
+
+#############################
+# Identity Provider settings
+#############################
+
+# List of IdP backends, mainly used to show available services in the homepage
+# of user, and to handle SLO for each protocols
+IDP_BACKENDS = [ ]
+
+# You MUST changes these keys, they are just for testing !
+LOCAL_METADATA_CACHE_TIMEOUT = int(os.environ.get('LOCAL_METADATA_CACHE_TIMEOUT', 600))
+SAML_SIGNATURE_PUBLIC_KEY = os.environ.get('SAML_SIGNATURE_PUBLIC_KEY', '''-----BEGIN CERTIFICATE-----
+MIIDIzCCAgugAwIBAgIJANUBoick1pDpMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
+BAoTCkVudHJvdXZlcnQwHhcNMTAxMjE0MTUzMzAyWhcNMTEwMTEzMTUzMzAyWjAV
+MRMwEQYDVQQKEwpFbnRyb3V2ZXJ0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAvxFkfPdndlGgQPDZgFGXbrNAc/79PULZBuNdWFHDD9P5hNhZn9Kqm4Cp
+06Pe/A6u+g5wLnYvbZQcFCgfQAEzziJtb3J55OOlB7iMEI/T2AX2WzrUH8QT8NGh
+ABONKU2Gg4XiyeXNhH5R7zdHlUwcWq3ZwNbtbY0TVc+n665EbrfV/59xihSqsoFr
+kmBLH0CoepUXtAzA7WDYn8AzusIuMx3n8844pJwgxhTB7Gjuboptlz9Hri8JRdXi
+VT9OS9Wt69ubcNoM6zuKASmtm48UuGnhj8v6XwvbjKZrL9kA+xf8ziazZfvvw/VG
+Tm+IVFYB7d1x457jY5zjjXJvNysoowIDAQABo3YwdDAdBgNVHQ4EFgQUeF8ePnu0
+fcAK50iBQDgAhHkOu8kwRQYDVR0jBD4wPIAUeF8ePnu0fcAK50iBQDgAhHkOu8mh
+GaQXMBUxEzARBgNVBAoTCkVudHJvdXZlcnSCCQDVAaInJNaQ6TAMBgNVHRMEBTAD
+AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAy8l3GhUtpPHx0FxzbRHVaaUSgMwYKGPhE
+IdGhqekKUJIx8et4xpEMFBl5XQjBNq/mp5vO3SPb2h2PVSks7xWnG3cvEkqJSOeo
+fEEhkqnM45b2MH1S5uxp4i8UilPG6kmQiXU2rEUBdRk9xnRWos7epVivTSIv1Ncp
+lG6l41SXp6YgIb2ToT+rOKdIGIQuGDlzeR88fDxWEU0vEujZv/v1PE1YOV0xKjTT
+JumlBc6IViKhJeo1wiBBrVRIIkKKevHKQzteK8pWm9CYWculxT26TZ4VWzGbo06j
+o2zbumirrLLqnt1gmBDvDvlOwC/zAAyL4chbz66eQHTiIYZZvYgy
+-----END CERTIFICATE-----''')
+
+SAML_SIGNATURE_PRIVATE_KEY = os.environ.get('SAML_SIGNATURE_PRIVATE_KEY', '''-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAvxFkfPdndlGgQPDZgFGXbrNAc/79PULZBuNdWFHDD9P5hNhZ
+n9Kqm4Cp06Pe/A6u+g5wLnYvbZQcFCgfQAEzziJtb3J55OOlB7iMEI/T2AX2WzrU
+H8QT8NGhABONKU2Gg4XiyeXNhH5R7zdHlUwcWq3ZwNbtbY0TVc+n665EbrfV/59x
+ihSqsoFrkmBLH0CoepUXtAzA7WDYn8AzusIuMx3n8844pJwgxhTB7Gjuboptlz9H
+ri8JRdXiVT9OS9Wt69ubcNoM6zuKASmtm48UuGnhj8v6XwvbjKZrL9kA+xf8ziaz
+Zfvvw/VGTm+IVFYB7d1x457jY5zjjXJvNysoowIDAQABAoIBAQCj8t2iKXya10HG
+V6Saaeih8aftoLBV38VwFqqjPU0+iKqDpk2JSXBhjI6s7uFIsaTNJpR2Ga1qvns1
+hJQEDMQSLhJvXfBgSkHylRWCpJentr4E3D7mnw5pRsd61Ev9U+uHcdv/WHP4K5hM
+xsdiwXNXD/RYd1Q1+6bKrCuvnNJVmWe0/RV+r3T8Ni5xdMVFbRWt/VEoE620XX6c
+a9TQPiA5i/LRVyie+js7Yv+hVjGOlArtuLs6ECQsivfPrqKLOBRWcofKdcf+4N2e
+3cieUqwzC15C31vcMliD9Hax9c1iuTt9Q3Xzo20fOSazAnQ5YBEExyTtrFBwbfQu
+ku6hp81pAoGBAN6bc6iJtk5ipYpsaY4ZlbqdjjG9KEXB6G1MExPU7SHXOhOF0cDH
+/pgMsv9hF2my863MowsOj3OryVhdQhwA6RrV263LRh+JU8NyHV71BwAIfI0BuVfj
+6r24KudwtUcvMr9pJIrJyMAMaw5ZyNoX7YqFpS6fcisSJYdSBSoxzrzVAoGBANu6
+xVeMqGavA/EHSOQP3ipDZ3mnWbkDUDxpNhgJG8Q6lZiwKwLoSceJ8z0PNY3VetGA
+RbqtqBGfR2mcxHyzeqVBpLnXZC4vs/Vy7lrzTiHDRZk2SG5EkHMSKFA53jN6S/nJ
+JWpYZC8lG8w4OHaUfDHFWbptxdGYCgY4//sjeiuXAoGBANuhurJ99R5PnA8AOgEW
+4zD1hLc0b4ir8fvshCIcAj9SUB20+afgayRv2ye3Dted1WkUL4WYPxccVhLWKITi
+rRtqB03o8m3pG3kJnUr0LIzu0px5J/o8iH3ZOJOTE3iBa+uI/KHmxygc2H+XPGFa
+HGeAxuJCNO2kAN0Losbnz5dlAoGAVsCn94gGWPxSjxA0PC7zpTYVnZdwOjbPr/pO
+LDE0cEY9GBq98JjrwEd77KibmVMm+Z4uaaT0jXiYhl8pyJ5IFwUS13juCbo1z/u/
+ldMoDvZ8/R/MexTA/1204u/mBecMJiO/jPw3GdIJ5phv2omHe1MSuSNsDfN8Sbap
+gmsgaiMCgYB/nrTk89Fp7050VKCNnIt1mHAcO9cBwDV8qrJ5O3rIVmrg1T6vn0aY
+wRiVcNacaP+BivkrMjr4BlsUM6yH4MOBsNhLURiiCL+tLJV7U0DWlCse/doWij4U
+TKX6tp6oI+7MIJE6ySZ0cBqOiydAkBePZhu57j6ToBkTa0dbHjn1WA==
+-----END RSA PRIVATE KEY-----''')
+
+SAML_METADATA_ROOT = 'metadata'
+# Whether to autoload SAML 2.0 identity providers and services metadata
+# Only https URLS are accepted.
+# Can be none, sp, idp or both
+SAML_METADATA_AUTOLOAD = os.environ.get('SAML_METADATA_AUTOLOAD', 'none')
+
+PUSH_PROFILE_UPDATES = 'PUSH_PROFILE_UPDATES' in os.environ
+
+# Logging settings
+
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': True,
+    'filters': {
+        'cleaning': {
+            '()':  'authentic2.utils.CleanLogMessage',
+        },
+    },
+    'formatters': {
+        'syslog': {
+            'format': 'portail-citoyen(pid=%(process)d) %(levelname)s %(name)s: %(message)s',
+        },
+        'syslog_debug': {
+            'format': 'portail-citoyen(pid=%(process)d) %(levelname)s %(asctime)s t_%(thread)s %(name)s: %(message)s',
+        },
+    },
+    'handlers': {
+        'syslog': {
+            'level': 'DEBUG',
+            'class': 'entrouvert.logging.handlers.SysLogHandler', 
+            'formatter': 'syslog_debug' if DEBUG else 'syslog',
+            'facility': logging.handlers.SysLogHandler.LOG_LOCAL0,
+            'address': '/dev/log',
+            'max_length': 999,
+            'filters': ['cleaning'],
+        },
+        'mail_admins': {
+            'level': 'ERROR',
+            'class': 'django.utils.log.AdminEmailHandler',
+            'filters': ['cleaning'],
+        },
+        'console': {
+            'class': 'logging.StreamHandler',
+            'formatter': 'syslog_debug',
+            'level': 'DEBUG',
+        },
+    },
+    'loggers': {
+        'authentic2': {
+            'handlers': ['mail_admins','syslog'],
+            'level': 'DEBUG' if DEBUG else 'INFO',
+            'propagate': False,
+        },
+        'requests': {
+            'handlers': ['mail_admins','syslog'],
+            'level': 'ERROR',
+            'propagate': False,
+        },
+        'portail_citoyen': {
+            'handlers': ['mail_admins','syslog'],
+            'level': 'DEBUG' if DEBUG else 'INFO',
+            'propagate': False,
+        },
+        'django': {
+            'handlers': ['mail_admins','syslog'],
+            'level': 'DEBUG' if DEBUG else 'INFO',
+            'propagate': False,
+        },
+        'django.db': {
+            'handlers': ['mail_admins','syslog'],
+            'level': 'INFO',
+            'propagate': False,
+        },
+        '': {
+            'handlers': ['mail_admins','syslog'],
+            'level': 'DEBUG' if DEBUG else 'INFO',
+            'propagate': True,
+        },
+    }
+}
+SOUTH_TESTS_MIGRATE = False
+
+# Admin tools
+ADMIN_TOOLS_INDEX_DASHBOARD = 'portail_citoyen.dashboard.CustomIndexDashboard'
+ADMIN_TOOLS_APP_INDEX_DASHBOARD = 'portail_citoyen.dashboard.CustomAppIndexDashboard'
+ADMIN_TOOLS_MENU = 'portail_citoyen.menu.CustomMenu'
+ADMIN_TOOLS_THEMING_CSS = 'portail_citoyen/css/admin.css'
+
+AUTH_SAML2 = 'AUTH_SAML2' in os.environ
+AUTH_OPENID = 'AUTH_OPENID' in os.environ
+AUTH_SSL = 'AUTH_SSL' in os.environ
+AUTH_OATH = 'AUTH_OATH' in os.environ
+IDP_SAML2 = True
+IDP_OPENID = 'IDP_OPENID' in os.environ
+IDP_CAS = 'IDP_CAS' in os.environ
+
+
+# cms settings
+CMS_TEMPLATES = (
+    ('base-cms.html', 'Modele de base'),
+    ('extra-placeholders.html', 'Pour la page extra-placeholders'),
+)
+CMS_REDIRECTS = True
+CMS_TEXT_WRAPPERS = (
+    ('block', {
+        'render_template': 'block.html',
+        'extra_context':  {},
+    }),
+)
+CMS_TEXT_WRAPPER_CLASSES = ()
+ANNOUNCES_FEED_HOMEPAGE_LIMIT = int(os.environ.get('ANNOUNCES_FEED_HOMEPAGE_LIMIT', 3))
+
+# Do we use memcached ?
+if 'USE_MEMCACHED' in os.environ:
+    CACHES = {
+            'default': {
+                'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+                'LOCATION': '127.0.0.1:11211',
+                'KEY_PREFIX': 'portail-citoyen',
+                }
+            }
+    SESSION_ENGINE = 'django.contrib.sessions.backends.cached_db'
+
+# try to import local_settings.py (useless, in theory)
+try:
+    from portail_citoyen.local_settings import *
+except ImportError, e:
+    if 'local_settings' in e.args[0]:
+        pass
+
+if USE_DEBUG_TOOLBAR:
+    try:
+        import debug_toolbar
+        MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',)
+        INSTALLED_APPS += ('debug_toolbar',)
+    except ImportError:
+        print "Debug toolbar missing, not loaded"
+
+if AUTH_SAML2:
+    INSTALLED_APPS += ('authentic2.authsaml2',)
+    AUTHENTICATION_BACKENDS += (
+            'authentic2.authsaml2.backends.AuthSAML2PersistentBackend',
+            'authentic2.authsaml2.backends.AuthSAML2TransientBackend')
+    AUTH_FRONTENDS += ('authentic2.authsaml2.frontend.AuthSAML2Frontend',)
+    IDP_BACKENDS += ('authentic2.authsaml2.backends.AuthSAML2Backend',)
+    DISPLAY_MESSAGE_ERROR_PAGE = True
+
+if AUTH_OPENID:
+    INSTALLED_APPS += ('authentic2.auth2_auth.auth2_openid', 'django_authopenid',)
+    AUTH_FRONTENDS += ('authentic2.auth2_auth.auth2_openid.backend.OpenIDFrontend',)
+
+if AUTH_SSL:
+    AUTHENTICATION_BACKENDS += ('authentic2.auth2_auth.auth2_ssl.backend.SSLBackend',)
+    AUTH_FRONTENDS += ('authentic2.auth2_auth.auth2_ssl.frontend.SSLFrontend',)
+    INSTALLED_APPS += ('authentic2.auth2_auth.auth2_ssl',)
+
+if AUTH_OATH:
+    INSTALLED_APPS += ('authentic2.auth2_auth.auth2_oath',)
+    AUTHENTICATION_BACKENDS += ('authentic2.auth2_auth.auth2_oath.backend.OATHTOTPBackend',)
+    AUTH_FRONTENDS += ('authentic2.auth2_auth.auth2_oath.frontend.OATHOTPFrontend',)
+
+if IDP_SAML2:
+    IDP_BACKENDS += ('authentic2.idp.saml.backend.SamlBackend',)
+
+if IDP_OPENID:
+    INSTALLED_APPS += ('authentic2.idp.idp_openid',)
+    TEMPLATE_CONTEXT_PROCESSORS += ('authentic2.idp.idp_openid.context_processors.openid_meta',)
+
+if IDP_CAS:
+    INSTALLED_APPS += ('authentic2.idp.idp_cas',)
+
diff --git a/portail_citoyen/templates/base-cms.html b/portail_citoyen/templates/base-cms.html
new file mode 100644
index 0000000..1325147
--- /dev/null
+++ b/portail_citoyen/templates/base-cms.html
@@ -0,0 +1,20 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% load menu_tags cms_tags sekizai_tags %}
+
+{% block breadcrumbs %}
+<li class="last">{% page_attribute "page_title" %}</li>
+{% endblock %}
+
+{% block content %}
+  {% placeholder "content" %}
+{% endblock %}
+
+{% block sidebar %}
+  {% placeholder "sidebar-top" inherit %}
+  {% placeholder "sidebar" %}
+{% endblock %}
+
+{% block footer %}
+  {% placeholder "footer" inherit or %}{% show_uncached_placeholder "footer" "extra-placeholders" %}{% endplaceholder %}
+{% endblock %}
diff --git a/portail_citoyen/templates/base_auquo2.html b/portail_citoyen/templates/base_auquo2.html
index d379513..59727ea 100644
--- a/portail_citoyen/templates/base_auquo2.html
+++ b/portail_citoyen/templates/base_auquo2.html
@@ -1,4 +1,4 @@
-{% load menu_tags cms_tags sekizai_tags %}
+{% load menu_tags cms_tags sekizai_tags staticfiles %}
 <!DOCTYPE html>
 <html>
   <head>
@@ -6,8 +6,8 @@
     <meta http-equiv="content-language" content="fr" />
     <title>Ma ville au quotidien :: {% page_attribute "page_title" %}</title>
     <meta name="description" content="Ma ville au quotidien :: {% page_attribute "page_title" %}" />
-    <link rel="shortcut icon" href="{{ STATIC_URL }}/themes/auquo2/favicon.png">
-    <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}/themes/auquo2/style.css">
+    <link rel="shortcut icon" href="{% static "themes/auquo2/favicon.png" %}">
+    <link rel="stylesheet" type="text/css" href="{% static "themes/auquo2/style.css" %}">
     {% render_block "css" %}
   </head>
   <body {% block bodyargs %}{% endblock %}>
diff --git a/portail_citoyen/templates/base_orleans.html b/portail_citoyen/templates/base_orleans.html
new file mode 100644
index 0000000..46e19cb
--- /dev/null
+++ b/portail_citoyen/templates/base_orleans.html
@@ -0,0 +1,106 @@
+{% load menu_tags cms_tags sekizai_tags i18n %}
+<!DOCTYPE HTML>
+<html lang="fr">
+	<head>
+		<meta charset="UTF-8"><!-- ♥ -->
+		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+		<title>Compte Citoyen Orléans :: {% page_attribute "page_title" %}</title>
+		<meta name="keywords" content="compte citoyen orleans" />
+		<meta name="viewport" content="width=device-width" />
+		<meta name="generator" content="Portail Citoyen Entr'ouvert -- Django CMS" />
+		<meta name="author" content="Entr'ouvert, borrowed from ARTIFICA" />
+		{% render_block "css" %}
+		{% render_block "js" %}
+		<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}themes/orleans/css/all.css">
+		<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}themes/orleans/css/local.css">
+		<!--[if lt IE 9]>
+		<script src="{{ STATIC_URL }}themes/orleans/js/html5shiv.js"></script>
+		<![endif]-->
+		{% block extra_scripts %}
+		{% endblock %}
+	</head>
+
+	<body class="home" role="document" {% block bodyargs %}{% endblock %}>
+		{% cms_toolbar %}
+
+		<!--[if lte IE 7]>
+		<p class="oldBrowser">Votre navigateur est trop ancien ! <a
+		href="http://browsehappy.com/" target="_blank">Effectuez une
+		mise à jour ou utilisez un navigateur plus récent.</a></p>
+		<![endif]-->
+
+		<noscript><div class="noscript">
+				<p>Merci d'activer javascript dans votre
+				navigateur afin de profiter<br />pleinement de
+				toutes les fontionnalités offertes par le
+				site.</p>
+		</div></noscript>
+
+		<div id="wrap">
+
+			<nav>
+				<ul>
+					<li class="skip"><a class="skiplink" href="/" accesskey="1" tabindex="1">Accueil du site</a></li>
+					<li class="skip"><a class="skiplink" href="#accesContent" accesskey="2" tabindex="2">Aller au contenu</a></li>
+				</ul>
+			</nav>
+
+			<div class="container">
+
+				<header class="header">
+					<hgroup>
+						<h1 class="logo" role="banner">
+							<a href="http://www.orleans.fr/" title="Site de la ville d'Orléans">
+								<img src="{{ STATIC_URL }}themes/orleans/img/logo.png" height="112" width="355" alt="Logo du site officiel de la ville d'Orléans" />
+                            	<span>Le site officiel de la mairie d'Orléans</span>
+                            </a>
+                        </h1>
+			<span class="slogan"><img src="{{ STATIC_URL }}themes/orleans/img/slogan.png" height="17" width="389" alt="Le site de la mairie d'Orléans" /></span>
+					</hgroup>
+
+				</header>
+				<div class="main overflow">
+					<div class="breadcrumbs">
+						<p>Vous êtes ici :</p>
+						<ul>
+							<li><a href="/">Compte Citoyen</a></li>
+							<li class="separ">&nbsp;/&nbsp;</li>
+                                                        {% block breadcrumbs %}{% endblock %}
+						</ul>
+					</div>
+
+					<section class="content" id="accesContent" role="main">
+						<article>
+
+						{% if messages %}
+						  <div class="wrapSpecial">
+						    <div class="rteContent">
+						      <ul class="messages">
+							{% for message in messages %}
+							<li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
+							{% endfor %}
+						      </ul>
+						    </div>
+						  </div>
+						{% endif %}
+
+						{% block content %}{% endblock %}
+
+						</article>
+					</section>
+
+					<aside class="sidebarRight">
+						{% block sidebar %}{% endblock %}
+					</aside>
+				</div>
+
+			</div>
+
+			<footer class="footer">
+				{% block footer %}{% endblock %}
+			</footer>
+
+		</div>
+
+	</body>
+</html>
diff --git a/portail_citoyen/templates/block.html b/portail_citoyen/templates/block.html
new file mode 100644
index 0000000..68ade7f
--- /dev/null
+++ b/portail_citoyen/templates/block.html
@@ -0,0 +1,3 @@
+<div class="block">
+  {{ body|safe }}
+</div>
diff --git a/portail_citoyen/templates/extra-placeholders.html b/portail_citoyen/templates/extra-placeholders.html
new file mode 100644
index 0000000..d91a9eb
--- /dev/null
+++ b/portail_citoyen/templates/extra-placeholders.html
@@ -0,0 +1,34 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% load menu_tags cms_tags sekizai_tags %}
+
+{% block content %}
+<h1>Textes supplémentaires pour les pages «systèmes»</h1>
+
+  <h2>Connexion</h2>
+  {% placeholder "login" %}
+  {% placeholder "login-sidebar" %}
+  {% placeholder "logout" %}
+
+  <h2>Gestion mot de passe</h2>
+  {% placeholder "password_change_form" %}
+  {% placeholder "password_reset_complete" %}
+  {% placeholder "password_reset_confirm" %}
+  {% placeholder "password_reset_done" %}
+  {% placeholder "password_reset_form" %}
+
+  <h2>Création d'un compte</h2>
+  {% placeholder "registration_form" %}
+  {% placeholder "registration_complete" %}
+  {% placeholder "activation_complete" %}
+
+  <h2>Modification d'un compte</h2>
+  {% placeholder "edit_profile" %}
+  {% placeholder "email_change" %}
+
+{% endblock %}
+
+{% block footer %}
+  {% placeholder "footer" %}
+{% endblock %}
+
diff --git a/portail_citoyen/wsgi.py b/portail_citoyen/wsgi.py
index d95d7cf..6297b40 100644
--- a/portail_citoyen/wsgi.py
+++ b/portail_citoyen/wsgi.py
@@ -15,7 +15,7 @@ framework.
 """
 import os
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "portail_citoyen.settings.prod")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "portail_citoyen.settings")
 
 # This application object is used by any WSGI server configured to use this
 # file. This includes Django's development server, if the WSGI_APPLICATION
diff --git a/requirements.txt b/requirements.txt
index 9230a05..a93b701 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,9 @@
 requests>=1.0.0
+cmsplugin-text-wrapper>=0.5
 feedparser
 django>=1.5.1,<1.6
 git+git://repos.entrouvert.org/authentic.git/#egg=authentic2-9999
 git+git://repos.entrouvert.org/django-cms.git/@develop#egg=django-cms-2.4.1.9999
 git+git://repos.entrouvert.org/python-entrouvert.git/#egg=python-entrouvert-9999
 south>=0.8.4
+Pillow
diff --git a/setup.py b/setup.py
index 9d02bdd..d70d34b 100755
--- a/setup.py
+++ b/setup.py
@@ -119,9 +119,11 @@ setup(name="portail_citoyen",
             'feedparser',
             'django>=1.5.1,<1.6',
             'authentic2>2.0.2',
+            'cmsplugin-text-wrapper>=0.5',
             'django-cms>2.4.1,<2.4.2',
             'python-entrouvert',
             'south>=0.8.4',
+            'Pillow',
       ],
       dependency_links = [
           'git+git://repos.entrouvert.org/authentic.git/#egg=authentic2-9999.0',