# HG changeset patch # User cavaliet # Date 1318935869 -7200 # Node ID fc82129bcae4ae7c19b0f7832e23f3e094a3c78a # Parent ffdbee7b92ed92d91bf0956cd307df3c629073fc Good regardssignes name, and not ldtplatform anymore. URL are now the same that the older version. diff -r ffdbee7b92ed -r fc82129bcae4 web/.htaccess.tmpl --- a/web/.htaccess.tmpl Tue Oct 18 12:44:00 2011 +0200 +++ b/web/.htaccess.tmpl Tue Oct 18 13:04:29 2011 +0200 @@ -1,1 +1,1 @@ -RedirectMatch permanent /~ymh/regardssignes/?$ /~ymh/regardssignes/ldtplatform +RedirectMatch permanent /~ymh/regardssignes/?$ /~ymh/regardssignes/regardssignes diff -r ffdbee7b92ed -r fc82129bcae4 web/ldtplatform/.htaccess.mod_python.tmpl --- a/web/ldtplatform/.htaccess.mod_python.tmpl Tue Oct 18 12:44:00 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -SetHandler python-program -PythonHandler ldt.core.handlers.modpython -SetEnv DJANGO_SETTINGS_MODULE ldtplatform.settings -PythonInterpreter platform -PythonOption django.root /~wakimd/platform/ldtplatform -PythonOption virtualenv.activate_path /iridata/users/wakimd/Env/Efculture/bin/activate_this.py -PythonDebug on -PythonPath "['/iridata/users/wakimd/Env/Efculture/lib/python2.6/sites-packages'] + sys.path" -Header set Pragma "no-cache" -Header set Cache-Control "no-cache" -Header set Expires "-1" diff -r ffdbee7b92ed -r fc82129bcae4 web/ldtplatform/.htaccess.mod_wsgi.tmpl --- a/web/ldtplatform/.htaccess.mod_wsgi.tmpl Tue Oct 18 12:44:00 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ - -SetEnv DJANGO_SETTINGS_MODULE ldtplatform.settings -SetEnv PROJECT_PATH /Users/ymh/dev/workspace/regardssignes/web -SetEnv PYTHON_PATH /Users/ymh/dev/workspace/regardssignes/virtualenv/web/env/venv_rs/lib/python2.7/site-packages - -Options ExecCGI FollowSymLinks -SetHandler wsgi-script - -#if defined in global definition -#defined with WSGIDaemonProcess -#WSGIProcessGroup platform - -RewriteEngine On -RewriteCond %{REQUEST_FILENAME} !-f -RewriteRule ^(.*)$ /~ymh/regardssignes/ldtplatform/modwsgi.wsgi/$1 [QSA,PT,L] - -Header set Pragma "no-cache" -Header set Cache-Control "no-cache" -Header set Expires "-1" diff -r ffdbee7b92ed -r fc82129bcae4 web/ldtplatform/__init__.py --- a/web/ldtplatform/__init__.py Tue Oct 18 12:44:00 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -VERSION = (0, 6, 0, "final", 0) - -VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2]))) - - -def get_version(): - version = '%s.%s' % (VERSION[0], VERSION[1]) - if VERSION[2]: - version = '%s.%s' % (version, VERSION[2]) - if VERSION[3:] == ('alpha', 0): - version = '%s pre-alpha' % version - else: - if VERSION[3] != 'final': - version = '%s %s %s' % (version, VERSION[3], VERSION[4]) - return version - -__version__ = get_version() diff -r ffdbee7b92ed -r fc82129bcae4 web/ldtplatform/config.py.tmpl --- a/web/ldtplatform/config.py.tmpl Tue Oct 18 12:44:00 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,81 +0,0 @@ -import os, logging - -SITE_ID = 1 - -BASE_DIR = os.path.dirname(os.path.abspath(__file__)).rstrip("/")+"/" -BASE_URL = '/~ymh/platform/' -WEB_URL = 'http://localhost/' - -STREAM_SRC_PREFIX = "" - -BASE_STATIC_ROOT = os.path.abspath(BASE_DIR + "../static/").rstrip("/")+"/" -BASE_STATIC_URL = BASE_URL + 'static/' - -STREAM_URL = BASE_STATIC_URL + "/content/" - - -# Absolute path to the directory that holds media. -# Example: "/home/media/media.lawrence.com/" -MEDIA_ROOT = BASE_STATIC_ROOT + "media/" - -STATIC_URL = BASE_STATIC_URL + 'site/' -# Absolute path to the directory that static files (js, css, swf...) -# DO NOT forget to do command line ./manage.py collectstatic to gather static media into the web/static folder -STATIC_ROOT = BASE_STATIC_ROOT + "site/" - -# PATH to the ffmpeg executable, used to know automatically the media file duration -FFMPEG_PATH = "C:/path/to/ffmpeg.exe" - - -CONTENT_ROOT = BASE_STATIC_ROOT + "content/" - -# PATH where uploaded media are put. -STREAM_PATH = CONTENT_ROOT - -ADMIN_MEDIA_PREFIX = STATIC_URL + 'admin/' -LDT_MEDIA_PREFIX = STATIC_URL + 'ldt/' - - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql_psycopg2', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': 'regardssignes_hg', # Or path to database file if using sqlite3. - 'USER': 'iri', # Not used with sqlite3. - 'PASSWORD': 'iri', # Not used with sqlite3. - 'HOST': 'localhost', # Set to empty string for localhost. Not used with sqlite3. - 'PORT': '5432', # Set to empty string for default. Not used with sqlite3. - } -} - -DEBUG = True -TEMPLATE_DEBUG = DEBUG - -LOG_FILE = os.path.abspath(os.path.join(BASE_DIR,"../log/log.txt")) -LOG_LEVEL = logging.DEBUG - -INDEX_PATH = os.path.abspath(BASE_DIR + "../index/") - - -ADMINS = ( - # ('Your Name', 'your_email@domain.com'), -) - -MANAGERS = ADMINS - -EMAIL_USE_TLS = True -EMAIL_HOST = 'smtp.gmail.com' -EMAIL_HOST_USER = 'iri.ddc@gmail.com' -EMAIL_HOST_PASSWORD = 'ddciripompidou' -EMAIL_PORT = 587 - -ACCOUNT_ACTIVATION_DAYS = 7 -REGISTRATION_OPEN = False - -LDT_MAX_SEARCH_NUMBER = 50 -LDT_MAX_FRAGMENT_PER_SEARCH = 3 -LDT_RESULTS_PER_PAGE = 1 -LDT_JSON_DEFAULT_INDENT = 0 - -EMPTY_MEDIA_EXTERNALID = None - -AUTO_INDEX_AFTER_SAVE = True diff -r ffdbee7b92ed -r fc82129bcae4 web/ldtplatform/locale/fr/LC_MESSAGES/django.mo Binary file web/ldtplatform/locale/fr/LC_MESSAGES/django.mo has changed diff -r ffdbee7b92ed -r fc82129bcae4 web/ldtplatform/locale/fr/LC_MESSAGES/django.po --- a/web/ldtplatform/locale/fr/LC_MESSAGES/django.po Tue Oct 18 12:44:00 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,51 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-14 16:54+0200\n" -"PO-Revision-Date: 2010-02-17 02:57+0100\n" -"Last-Translator: Yves-Marie Haussonne \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: \n" - -#: .\settings.py:40 -msgid "French" -msgstr "Français" - -#: .\settings.py:41 -msgid "English" -msgstr "" - -#: .\templates\registration\login.html.py:21 -msgid "Log in" -msgstr "Connexion" - -#: .\templates\registration\login.html.py:24 -msgid "Sorry, that's not a valid username or password." -msgstr "Désolé, mais ce n'est pas un identifiant ou un mot de passe valide" - -#: .\templates\registration\login.html.py:35 -msgid "Forget password?" -msgstr "Mot de passe oublié ?" - -#: .\templates\registration\login.html.py:38 -msgid "login" -msgstr "Connexion" - -#: .\templates\registration\login.html.py:45 -msgid "Or login with your external account" -msgstr "Ou bien utilisez l'un de vos comptes externes" - -#~ msgid "header_title" -#~ msgstr "Plateforme LDT" - -#~ msgid "page_title" -#~ msgstr "Plateforme LDT" diff -r ffdbee7b92ed -r fc82129bcae4 web/ldtplatform/manage.py --- a/web/ldtplatform/manage.py Tue Oct 18 12:44:00 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -#!/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__": - execute_manager(settings) diff -r ffdbee7b92ed -r fc82129bcae4 web/ldtplatform/modwsgi.wsgi --- a/web/ldtplatform/modwsgi.wsgi Tue Oct 18 12:44:00 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -import os, sys, site - -def application(environ, start_response): - - global g_env_set - - if 'g_env_set' not in globals() or not g_env_set: - os.environ['DJANGO_SETTINGS_MODULE'] = environ['DJANGO_SETTINGS_MODULE'] - - prev_sys_path = list(sys.path) - - sys.path.append(environ['PROJECT_PATH']) - for path in environ.get('PYTHON_PATH',"").split(os.pathsep): - if path: - site.addsitedir(path) - - new_sys_path = [] - for item in list(sys.path): - if item not in prev_sys_path and item not in new_sys_path: - new_sys_path.append(item) - sys.path.remove(item) - sys.path[:0] = new_sys_path - g_env_set = True - - import django.core.handlers.wsgi - - _application = django.core.handlers.wsgi.WSGIHandler() - - if environ.get('PYDEV_DEBUG', "False").lower() in ["true", "1", "t"]: - import pydevd #@UnresolvedImport - pydevd.settrace(suspend=False) - - - return _application(environ, start_response) - diff -r ffdbee7b92ed -r fc82129bcae4 web/ldtplatform/settings.py --- a/web/ldtplatform/settings.py Tue Oct 18 12:44:00 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,239 +0,0 @@ -#@PydevCodeAnalysisIgnore -import os.path -import ldtplatform -# Django settings for project. - -DEBUG = True -TEMPLATE_DEBUG = DEBUG - -ADMINS = ( - # ('Your Name', 'your_email@domain.com'), -) - -MANAGERS = ADMINS - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': '', # 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. - } -} - -# 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. -# If running in a Windows environment this must be set to the same as your -# system time zone. -TIME_ZONE = 'Europe/Paris' - -# Language code for this installation. All choices can be found here: -# http://www.i18nguy.com/unicode/language-identifiers.html -LANGUAGE_CODE = 'fr-fr' - -ugettext = lambda s: s - -LANGUAGES = ( - ('fr', ugettext('French')), - ('en', ugettext('English')), -) - - -SITE_ID = 1 - -# If you set this to False, Django will make some optimizations so as not -# to load the internationalization machinery. -USE_I18N = True - -# Absolute path to the directory that holds media. -# Example: "/home/media/media.lawrence.com/" -#MEDIA_ROOT = '' - -# Root of static files used by each app, generated by code or uploaded by users -#STATIC_URL = '/static/' - -# 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/" -#MEDIA_URL = '' - -# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a -# trailing slash. -# Examples: "http://foo.com/media/", "/media/". -#ADMIN_MEDIA_PREFIX = '/media/' - -#LDT_MEDIA_PREFIX = '/ldt/' - -# Make this unique, and don't share it with anybody. -SECRET_KEY = 't^lii5_z@tho$%6t&b#dm#t9nz$$ylyclxvkdiyqbl+(dnt(ma' - -# 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', -) - -MIDDLEWARE_CLASSES = ( - 'django.middleware.gzip.GZipMiddleware', - 'django.middleware.common.CommonMiddleware', - 'ldt.ldt_utils.middleware.swfupload.SWFUploadMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - #'django.middleware.locale.LocaleMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', - 'django_openid_consumer.middleware.OpenIDMiddleware', - 'ldt.ldt_utils.middleware.userprofile.LanguageMiddleware', -) - -TEMPLATE_CONTEXT_PROCESSORS = ( - "django.core.context_processors.request", - "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", - "ldt.utils.context_processors.ldt_context", -) - - -ROOT_URLCONF = 'ldtplatform.urls' - -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. - os.path.join(os.path.basename(__file__), 'templates'), - os.path.join(os.path.dirname(__file__), 'templates'), -) - -FIXTURES_DIRS = ( - os.path.join(os.path.basename(__file__), 'fixtures'), -) - -INSTALLED_APPS = ( - 'django_extensions', - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.sites', - 'django.contrib.messages', - 'django.contrib.admin', - 'django.contrib.staticfiles', - 'ldtplatform', - 'registration', - 'tagging', - 'ldt', - 'ldt.core', - 'ldt.ldt_utils', - 'ldt.text', - 'ldt.user', - 'ldt.management', - 'oauth_provider', - 'django_openid_consumer', - 'piston', - 'social_auth', - 'south', -) - -AUTH_PROFILE_MODULE = 'user.UserProfile' - -DECOUPAGE_BLACKLIST = ( - "de_PPP", -) - -ZIP_BLACKLIST = ( - "__MACOSX", -) - -AUTHENTICATION_BACKENDS = ( - 'social_auth.backends.twitter.TwitterBackend', - 'social_auth.backends.facebook.FacebookBackend', -# 'social_auth.backends.google.GoogleOAuthBackend', -# 'social_auth.backends.google.GoogleOAuth2Backend', - 'social_auth.backends.google.GoogleBackend', - 'social_auth.backends.yahoo.YahooBackend', -# 'social_auth.backends.contrib.linkedin.LinkedinBackend', -# 'social_auth.backends.contrib.LiveJournalBackend', -# 'social_auth.backends.contrib.orkut.OrkutBackend', - 'social_auth.backends.OpenIDBackend', - 'django.contrib.auth.backends.ModelBackend', -) -SOCIAL_AUTH_IMPORT_BACKENDS = ( - 'myproy.social_auth_extra_services', -) - -ACCOUNT_ACTIVATION_DAYS = 7 - -LDT_MAX_SEARCH_NUMBER = 50 -LDT_JSON_DEFAULT_INDENT = 2 - -OAUTH_PROVIDER_KEY_SIZE = 32 -OAUTH_PROVIDER_SECRET_SIZE = 32 -OAUTH_PROVIDER_VERIFIER_SIZE = 10 -OAUTH_PROVIDER_CONSUMER_KEY_SIZE = 256 -OAUTH_AUTHORIZE_VIEW = 'oauth_provider.views.fake_authorize_view' -OAUTH_CALLBACK_VIEW = 'oauth_provider.views.fake_callback_view' -TEST_WEBSERVER_ADDRPORT = "127.0.0.1:8888" - -TWITTER_CONSUMER_KEY = 'UxAdbOLSo4Mx3CXIwDG9Eg' -TWITTER_CONSUMER_SECRET = '2PcWgdjnJL6Vp8srB40jeAo0fjMEtDnUwmAia6EUww' -FACEBOOK_APP_ID = '163134140411313' -FACEBOOK_API_SECRET = 'f25e0754a44f0d90d3f4d9ea961ff012' - -SOCIAL_AUTH_COMPLETE_URL_NAME = 'complete' -SOCIAL_AUTH_ASSOCIATE_URL_NAME = 'associate_complete' - -# twitter testing -TEST_TWITTER_USER = 'jacquesverrier@gmail.com' -TEST_TWITTER_PASSWORD = '' - -# facebook testing -#TEST_FACEBOOK_USER = 'testing_account' -#TEST_FACEBOOK_PASSWORD = 'password_for_testing_account' - -# google testing -TEST_GOOGLE_USER = 'jacquesverrier@gmail.com' -TEST_GOOGLE_PASSWORD = '' - -AUTO_INDEX_AFTER_SAVE = True - -WEB_VERSION = ldtplatform.get_version() - -from config import * - -if not "LOGIN_URL" in locals(): - LOGIN_URL = BASE_URL + 'ldtplatform/accounts/login/' -if not "LOGOUT_URL" in locals(): - LOGOUT_URL = BASE_URL + 'ldtplatform/accounts/disconnect/' -if not "LOGIN_REDIRECT_URL" in locals(): - LOGIN_REDIRECT_URL = BASE_URL + 'ldtplatform/ldt/' -if not "LOGOUT_REDIRECT_URL" in locals(): - LOGOUT_REDIRECT_URL = BASE_URL + 'ldtplatform/accounts/login' -if not "PROFILE_REDIRECT_URL" in locals(): - PROFILE_REDIRECT_URL = BASE_URL + 'ldtplatform/auth_accounts/create/profile' - -if not "LOGIN_ERROR_URL" in locals(): - LOGIN_ERROR_URL = BASE_URL + 'ldtplatform/accounts/login' - -if not "GLOBAL_LOG_LEVEL" in locals(): - GLOBAL_LOG_LEVEL = LOG_LEVEL -if not "GLOBAL_LOG_HANDLERS" in locals(): - GLOBAL_LOG_HANDLERS = [{'handler':logging.FileHandler(LOG_FILE), 'format':"%(asctime)s - %(levelname)s : %(message)s"}] - -# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a -# trailing slash. -# Examples: "http://foo.com/media/", "/media/". -if not "ADMIN_MEDIA_PREFIX" in locals(): - ADMIN_MEDIA_PREFIX = STATIC_URL + 'admin/' -# Used in a lot of templates -if not "LDT_MEDIA_PREFIX" in locals(): - LDT_MEDIA_PREFIX = STATIC_URL + 'ldt/' -# URL that handles the media served from MEDIA_ROOT. -if not "MEDIA_URL" in locals(): - MEDIA_URL = BASE_URL + 'static/media/' - diff -r ffdbee7b92ed -r fc82129bcae4 web/ldtplatform/templates/admin/base_site.html --- a/web/ldtplatform/templates/admin/base_site.html Tue Oct 18 12:44:00 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -{% extends "admin/base.html" %} -{% load i18n %} - -{% block title %}{{ title }} | {% trans 'Django site admin' %}{% endblock %} - -{% block branding %} -

{% trans 'Django administration' %}

-{% endblock %} - -{% block nav-global %} - - - Admin home - Website home -{% endblock %} \ No newline at end of file diff -r ffdbee7b92ed -r fc82129bcae4 web/ldtplatform/templates/ldt/ldt_utils/workspace.html --- a/web/ldtplatform/templates/ldt/ldt_utils/workspace.html Tue Oct 18 12:44:00 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -{% extends "ldt/ldt_utils/workspace_base.html" %} - diff -r ffdbee7b92ed -r fc82129bcae4 web/ldtplatform/templates/registration/login.html --- a/web/ldtplatform/templates/registration/login.html Tue Oct 18 12:44:00 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,60 +0,0 @@ -{% extends "registration/base.html" %} -{% load i18n %} -{% block js_declaration %}{{ block.super }} - -{% endblock %} - -{% block css_import %} - {{ block.super }} - - -{% endblock %} - - -{% block login %} -{% endblock %} - -{% block content_title %}{% trans 'Log in' %}{% endblock %} -{% block iricontent %} - {% if form.errors %} -

{% trans "Sorry, that's not a valid username or password." %}

- {% endif %} -
-
-
- {% csrf_token %} - -
    - {{form.as_ul}} -
- -
- -
-
-
- -
- -{% endblock %} - - - diff -r ffdbee7b92ed -r fc82129bcae4 web/ldtplatform/urls.py --- a/web/ldtplatform/urls.py Tue Oct 18 12:44:00 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -from django.conf.urls.defaults import patterns, include, url -from django.contrib import admin -from ldt.auth.views import login as pf_login -from ldt.text import VERSION_STR - -#from django.conf import settings - -# Uncomment the next two lines to enable the admin: -admin.autodiscover() - -js_info_dict = { - 'packages': ('django.contrib.admin',), -} - -urlpatterns = patterns('', - # Example: - - # Uncomment the admin/doc line below and add 'django.contrib.admindocs' - # to INSTALLED_APPS to enable admin documentation: - # (r'^admin/doc/', include('django.contrib.admindocs.urls')), - - # Uncomment the next line to enable the admin: - (r'^admin/', include(admin.site.urls)), - (r'^i18n/', include('django.conf.urls.i18n')), - - (r'^ldt/', include('ldt.ldt_utils.urls')), - (r'^user/', include('ldt.user.urls')), - (r'^api/', include('ldt.api.urls')), - (r'^api/' + VERSION_STR + '/text/', include('ldt.text.urls')), - - (r'^auth_accounts/', include('registration.backends.simple.urls')), - - #(r'^accounts/', include('socialauth.urls')), - (r'^accounts/', include('social_auth.urls')), - url(r'^accounts/login/$',pf_login,{'template_name': 'registration/login.html'},name='auth_login'), - (r'^oauth/', include('oauth_provider.urls')), - - #(r'^$', 'socialauth.views.signin_complete'), - #(r'^$', 'social_auth.views.complete'), - - (r'^/?$', 'django.views.generic.simple.redirect_to', {'url': 'ldt'}), - #(r'^static/(?P.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT}), - - (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict), -) diff -r ffdbee7b92ed -r fc82129bcae4 web/ldtplatform/utils/__init__.py diff -r ffdbee7b92ed -r fc82129bcae4 web/regardssignes/.htaccess.mod_python.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/regardssignes/.htaccess.mod_python.tmpl Tue Oct 18 13:04:29 2011 +0200 @@ -0,0 +1,11 @@ +SetHandler python-program +PythonHandler ldt.core.handlers.modpython +SetEnv DJANGO_SETTINGS_MODULE ldtplatform.settings +PythonInterpreter platform +PythonOption django.root /~wakimd/platform/ldtplatform +PythonOption virtualenv.activate_path /iridata/users/wakimd/Env/Efculture/bin/activate_this.py +PythonDebug on +PythonPath "['/iridata/users/wakimd/Env/Efculture/lib/python2.6/sites-packages'] + sys.path" +Header set Pragma "no-cache" +Header set Cache-Control "no-cache" +Header set Expires "-1" diff -r ffdbee7b92ed -r fc82129bcae4 web/regardssignes/.htaccess.mod_wsgi.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/regardssignes/.htaccess.mod_wsgi.tmpl Tue Oct 18 13:04:29 2011 +0200 @@ -0,0 +1,19 @@ + +SetEnv DJANGO_SETTINGS_MODULE regardssignes.settings +SetEnv PROJECT_PATH /Users/ymh/dev/workspace/regardssignes/web +SetEnv PYTHON_PATH /Users/ymh/dev/workspace/regardssignes/virtualenv/web/env/venv_rs/lib/python2.7/site-packages + +Options ExecCGI FollowSymLinks +SetHandler wsgi-script + +#if defined in global definition +#defined with WSGIDaemonProcess +#WSGIProcessGroup platform + +RewriteEngine On +RewriteCond %{REQUEST_FILENAME} !-f +RewriteRule ^(.*)$ /~ymh/regardssignes/regardssignes/modwsgi.wsgi/$1 [QSA,PT,L] + +Header set Pragma "no-cache" +Header set Cache-Control "no-cache" +Header set Expires "-1" diff -r ffdbee7b92ed -r fc82129bcae4 web/regardssignes/__init__.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/regardssignes/__init__.py Tue Oct 18 13:04:29 2011 +0200 @@ -0,0 +1,17 @@ +VERSION = (0, 6, 0, "final", 0) + +VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2]))) + + +def get_version(): + version = '%s.%s' % (VERSION[0], VERSION[1]) + if VERSION[2]: + version = '%s.%s' % (version, VERSION[2]) + if VERSION[3:] == ('alpha', 0): + version = '%s pre-alpha' % version + else: + if VERSION[3] != 'final': + version = '%s %s %s' % (version, VERSION[3], VERSION[4]) + return version + +__version__ = get_version() diff -r ffdbee7b92ed -r fc82129bcae4 web/regardssignes/config.py.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/regardssignes/config.py.tmpl Tue Oct 18 13:04:29 2011 +0200 @@ -0,0 +1,81 @@ +import os, logging + +SITE_ID = 1 + +BASE_DIR = os.path.dirname(os.path.abspath(__file__)).rstrip("/")+"/" +BASE_URL = '/~ymh/platform/' +WEB_URL = 'http://localhost/' + +STREAM_SRC_PREFIX = "" + +BASE_STATIC_ROOT = os.path.abspath(BASE_DIR + "../static/").rstrip("/")+"/" +BASE_STATIC_URL = BASE_URL + 'static/' + +STREAM_URL = BASE_STATIC_URL + "/content/" + + +# Absolute path to the directory that holds media. +# Example: "/home/media/media.lawrence.com/" +MEDIA_ROOT = BASE_STATIC_ROOT + "media/" + +STATIC_URL = BASE_STATIC_URL + 'site/' +# Absolute path to the directory that static files (js, css, swf...) +# DO NOT forget to do command line ./manage.py collectstatic to gather static media into the web/static folder +STATIC_ROOT = BASE_STATIC_ROOT + "site/" + +# PATH to the ffmpeg executable, used to know automatically the media file duration +FFMPEG_PATH = "C:/path/to/ffmpeg.exe" + + +CONTENT_ROOT = BASE_STATIC_ROOT + "content/" + +# PATH where uploaded media are put. +STREAM_PATH = CONTENT_ROOT + +ADMIN_MEDIA_PREFIX = STATIC_URL + 'admin/' +LDT_MEDIA_PREFIX = STATIC_URL + 'ldt/' + + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.postgresql_psycopg2', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. + 'NAME': 'regardssignes_hg', # Or path to database file if using sqlite3. + 'USER': 'iri', # Not used with sqlite3. + 'PASSWORD': 'iri', # Not used with sqlite3. + 'HOST': 'localhost', # Set to empty string for localhost. Not used with sqlite3. + 'PORT': '5432', # Set to empty string for default. Not used with sqlite3. + } +} + +DEBUG = True +TEMPLATE_DEBUG = DEBUG + +LOG_FILE = os.path.abspath(os.path.join(BASE_DIR,"../log/log.txt")) +LOG_LEVEL = logging.DEBUG + +INDEX_PATH = os.path.abspath(BASE_DIR + "../index/") + + +ADMINS = ( + # ('Your Name', 'your_email@domain.com'), +) + +MANAGERS = ADMINS + +EMAIL_USE_TLS = True +EMAIL_HOST = 'smtp.gmail.com' +EMAIL_HOST_USER = 'iri.ddc@gmail.com' +EMAIL_HOST_PASSWORD = 'ddciripompidou' +EMAIL_PORT = 587 + +ACCOUNT_ACTIVATION_DAYS = 7 +REGISTRATION_OPEN = False + +LDT_MAX_SEARCH_NUMBER = 50 +LDT_MAX_FRAGMENT_PER_SEARCH = 3 +LDT_RESULTS_PER_PAGE = 1 +LDT_JSON_DEFAULT_INDENT = 0 + +EMPTY_MEDIA_EXTERNALID = None + +AUTO_INDEX_AFTER_SAVE = True diff -r ffdbee7b92ed -r fc82129bcae4 web/regardssignes/locale/fr/LC_MESSAGES/django.mo Binary file web/regardssignes/locale/fr/LC_MESSAGES/django.mo has changed diff -r ffdbee7b92ed -r fc82129bcae4 web/regardssignes/locale/fr/LC_MESSAGES/django.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/regardssignes/locale/fr/LC_MESSAGES/django.po Tue Oct 18 13:04:29 2011 +0200 @@ -0,0 +1,51 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-09-14 16:54+0200\n" +"PO-Revision-Date: 2010-02-17 02:57+0100\n" +"Last-Translator: Yves-Marie Haussonne \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: \n" + +#: .\settings.py:40 +msgid "French" +msgstr "Français" + +#: .\settings.py:41 +msgid "English" +msgstr "" + +#: .\templates\registration\login.html.py:21 +msgid "Log in" +msgstr "Connexion" + +#: .\templates\registration\login.html.py:24 +msgid "Sorry, that's not a valid username or password." +msgstr "Désolé, mais ce n'est pas un identifiant ou un mot de passe valide" + +#: .\templates\registration\login.html.py:35 +msgid "Forget password?" +msgstr "Mot de passe oublié ?" + +#: .\templates\registration\login.html.py:38 +msgid "login" +msgstr "Connexion" + +#: .\templates\registration\login.html.py:45 +msgid "Or login with your external account" +msgstr "Ou bien utilisez l'un de vos comptes externes" + +#~ msgid "header_title" +#~ msgstr "Plateforme LDT" + +#~ msgid "page_title" +#~ msgstr "Plateforme LDT" diff -r ffdbee7b92ed -r fc82129bcae4 web/regardssignes/manage.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/regardssignes/manage.py Tue Oct 18 13:04:29 2011 +0200 @@ -0,0 +1,11 @@ +#!/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__": + execute_manager(settings) diff -r ffdbee7b92ed -r fc82129bcae4 web/regardssignes/modwsgi.wsgi --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/regardssignes/modwsgi.wsgi Tue Oct 18 13:04:29 2011 +0200 @@ -0,0 +1,35 @@ +import os, sys, site + +def application(environ, start_response): + + global g_env_set + + if 'g_env_set' not in globals() or not g_env_set: + os.environ['DJANGO_SETTINGS_MODULE'] = environ['DJANGO_SETTINGS_MODULE'] + + prev_sys_path = list(sys.path) + + sys.path.append(environ['PROJECT_PATH']) + for path in environ.get('PYTHON_PATH',"").split(os.pathsep): + if path: + site.addsitedir(path) + + new_sys_path = [] + for item in list(sys.path): + if item not in prev_sys_path and item not in new_sys_path: + new_sys_path.append(item) + sys.path.remove(item) + sys.path[:0] = new_sys_path + g_env_set = True + + import django.core.handlers.wsgi + + _application = django.core.handlers.wsgi.WSGIHandler() + + if environ.get('PYDEV_DEBUG', "False").lower() in ["true", "1", "t"]: + import pydevd #@UnresolvedImport + pydevd.settrace(suspend=False) + + + return _application(environ, start_response) + diff -r ffdbee7b92ed -r fc82129bcae4 web/regardssignes/settings.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/regardssignes/settings.py Tue Oct 18 13:04:29 2011 +0200 @@ -0,0 +1,239 @@ +#@PydevCodeAnalysisIgnore +import os.path +import regardssignes +# Django settings for project. + +DEBUG = True +TEMPLATE_DEBUG = DEBUG + +ADMINS = ( + # ('Your Name', 'your_email@domain.com'), +) + +MANAGERS = ADMINS + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. + 'NAME': '', # 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. + } +} + +# 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. +# If running in a Windows environment this must be set to the same as your +# system time zone. +TIME_ZONE = 'Europe/Paris' + +# Language code for this installation. All choices can be found here: +# http://www.i18nguy.com/unicode/language-identifiers.html +LANGUAGE_CODE = 'fr-fr' + +ugettext = lambda s: s + +LANGUAGES = ( + ('fr', ugettext('French')), + ('en', ugettext('English')), +) + + +SITE_ID = 1 + +# If you set this to False, Django will make some optimizations so as not +# to load the internationalization machinery. +USE_I18N = True + +# Absolute path to the directory that holds media. +# Example: "/home/media/media.lawrence.com/" +#MEDIA_ROOT = '' + +# Root of static files used by each app, generated by code or uploaded by users +#STATIC_URL = '/static/' + +# 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/" +#MEDIA_URL = '' + +# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a +# trailing slash. +# Examples: "http://foo.com/media/", "/media/". +#ADMIN_MEDIA_PREFIX = '/media/' + +#LDT_MEDIA_PREFIX = '/ldt/' + +# Make this unique, and don't share it with anybody. +SECRET_KEY = 't^lii5_z@tho$%6t&b#dm#t9nz$$ylyclxvkdiyqbl+(dnt(ma' + +# 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', +) + +MIDDLEWARE_CLASSES = ( + 'django.middleware.gzip.GZipMiddleware', + 'django.middleware.common.CommonMiddleware', + 'ldt.ldt_utils.middleware.swfupload.SWFUploadMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + #'django.middleware.locale.LocaleMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django_openid_consumer.middleware.OpenIDMiddleware', + 'ldt.ldt_utils.middleware.userprofile.LanguageMiddleware', +) + +TEMPLATE_CONTEXT_PROCESSORS = ( + "django.core.context_processors.request", + "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", + "ldt.utils.context_processors.ldt_context", +) + + +ROOT_URLCONF = 'regardssignes.urls' + +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. + os.path.join(os.path.basename(__file__), 'templates'), + os.path.join(os.path.dirname(__file__), 'templates'), +) + +FIXTURES_DIRS = ( + os.path.join(os.path.basename(__file__), 'fixtures'), +) + +INSTALLED_APPS = ( + 'django_extensions', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.sites', + 'django.contrib.messages', + 'django.contrib.admin', + 'django.contrib.staticfiles', + 'regardssignes', + 'registration', + 'tagging', + 'ldt', + 'ldt.core', + 'ldt.ldt_utils', + 'ldt.text', + 'ldt.user', + 'ldt.management', + 'oauth_provider', + 'django_openid_consumer', + 'piston', + 'social_auth', + 'south', +) + +AUTH_PROFILE_MODULE = 'user.UserProfile' + +DECOUPAGE_BLACKLIST = ( + "de_PPP", +) + +ZIP_BLACKLIST = ( + "__MACOSX", +) + +AUTHENTICATION_BACKENDS = ( + 'social_auth.backends.twitter.TwitterBackend', + 'social_auth.backends.facebook.FacebookBackend', +# 'social_auth.backends.google.GoogleOAuthBackend', +# 'social_auth.backends.google.GoogleOAuth2Backend', + 'social_auth.backends.google.GoogleBackend', + 'social_auth.backends.yahoo.YahooBackend', +# 'social_auth.backends.contrib.linkedin.LinkedinBackend', +# 'social_auth.backends.contrib.LiveJournalBackend', +# 'social_auth.backends.contrib.orkut.OrkutBackend', + 'social_auth.backends.OpenIDBackend', + 'django.contrib.auth.backends.ModelBackend', +) +SOCIAL_AUTH_IMPORT_BACKENDS = ( + 'myproy.social_auth_extra_services', +) + +ACCOUNT_ACTIVATION_DAYS = 7 + +LDT_MAX_SEARCH_NUMBER = 50 +LDT_JSON_DEFAULT_INDENT = 2 + +OAUTH_PROVIDER_KEY_SIZE = 32 +OAUTH_PROVIDER_SECRET_SIZE = 32 +OAUTH_PROVIDER_VERIFIER_SIZE = 10 +OAUTH_PROVIDER_CONSUMER_KEY_SIZE = 256 +OAUTH_AUTHORIZE_VIEW = 'oauth_provider.views.fake_authorize_view' +OAUTH_CALLBACK_VIEW = 'oauth_provider.views.fake_callback_view' +TEST_WEBSERVER_ADDRPORT = "127.0.0.1:8888" + +TWITTER_CONSUMER_KEY = 'UxAdbOLSo4Mx3CXIwDG9Eg' +TWITTER_CONSUMER_SECRET = '2PcWgdjnJL6Vp8srB40jeAo0fjMEtDnUwmAia6EUww' +FACEBOOK_APP_ID = '163134140411313' +FACEBOOK_API_SECRET = 'f25e0754a44f0d90d3f4d9ea961ff012' + +SOCIAL_AUTH_COMPLETE_URL_NAME = 'complete' +SOCIAL_AUTH_ASSOCIATE_URL_NAME = 'associate_complete' + +# twitter testing +TEST_TWITTER_USER = 'jacquesverrier@gmail.com' +TEST_TWITTER_PASSWORD = '' + +# facebook testing +#TEST_FACEBOOK_USER = 'testing_account' +#TEST_FACEBOOK_PASSWORD = 'password_for_testing_account' + +# google testing +TEST_GOOGLE_USER = 'jacquesverrier@gmail.com' +TEST_GOOGLE_PASSWORD = '' + +AUTO_INDEX_AFTER_SAVE = True + +WEB_VERSION = regardssignes.get_version() + +from config import * + +if not "LOGIN_URL" in locals(): + LOGIN_URL = BASE_URL + 'regardssignes/accounts/login/' +if not "LOGOUT_URL" in locals(): + LOGOUT_URL = BASE_URL + 'regardssignes/accounts/disconnect/' +if not "LOGIN_REDIRECT_URL" in locals(): + LOGIN_REDIRECT_URL = BASE_URL + 'regardssignes/ldt/' +if not "LOGOUT_REDIRECT_URL" in locals(): + LOGOUT_REDIRECT_URL = BASE_URL + 'regardssignes/accounts/login' +if not "PROFILE_REDIRECT_URL" in locals(): + PROFILE_REDIRECT_URL = BASE_URL + 'regardssignes/auth_accounts/create/profile' + +if not "LOGIN_ERROR_URL" in locals(): + LOGIN_ERROR_URL = BASE_URL + 'regardssignes/accounts/login' + +if not "GLOBAL_LOG_LEVEL" in locals(): + GLOBAL_LOG_LEVEL = LOG_LEVEL +if not "GLOBAL_LOG_HANDLERS" in locals(): + GLOBAL_LOG_HANDLERS = [{'handler':logging.FileHandler(LOG_FILE), 'format':"%(asctime)s - %(levelname)s : %(message)s"}] + +# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a +# trailing slash. +# Examples: "http://foo.com/media/", "/media/". +if not "ADMIN_MEDIA_PREFIX" in locals(): + ADMIN_MEDIA_PREFIX = STATIC_URL + 'admin/' +# Used in a lot of templates +if not "LDT_MEDIA_PREFIX" in locals(): + LDT_MEDIA_PREFIX = STATIC_URL + 'ldt/' +# URL that handles the media served from MEDIA_ROOT. +if not "MEDIA_URL" in locals(): + MEDIA_URL = BASE_URL + 'static/media/' + diff -r ffdbee7b92ed -r fc82129bcae4 web/regardssignes/templates/admin/base_site.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/regardssignes/templates/admin/base_site.html Tue Oct 18 13:04:29 2011 +0200 @@ -0,0 +1,21 @@ +{% extends "admin/base.html" %} +{% load i18n %} + +{% block title %}{{ title }} | {% trans 'Django site admin' %}{% endblock %} + +{% block branding %} +

{% trans 'Django administration' %}

+{% endblock %} + +{% block nav-global %} + + + Admin home + Website home +{% endblock %} \ No newline at end of file diff -r ffdbee7b92ed -r fc82129bcae4 web/regardssignes/templates/ldt/ldt_utils/workspace.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/regardssignes/templates/ldt/ldt_utils/workspace.html Tue Oct 18 13:04:29 2011 +0200 @@ -0,0 +1,2 @@ +{% extends "ldt/ldt_utils/workspace_base.html" %} + diff -r ffdbee7b92ed -r fc82129bcae4 web/regardssignes/templates/registration/login.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/regardssignes/templates/registration/login.html Tue Oct 18 13:04:29 2011 +0200 @@ -0,0 +1,60 @@ +{% extends "registration/base.html" %} +{% load i18n %} +{% block js_declaration %}{{ block.super }} + +{% endblock %} + +{% block css_import %} + {{ block.super }} + + +{% endblock %} + + +{% block login %} +{% endblock %} + +{% block content_title %}{% trans 'Log in' %}{% endblock %} +{% block iricontent %} + {% if form.errors %} +

{% trans "Sorry, that's not a valid username or password." %}

+ {% endif %} +
+
+
+ {% csrf_token %} + +
    + {{form.as_ul}} +
+ +
+ +
+
+
+ +
+ +{% endblock %} + + + diff -r ffdbee7b92ed -r fc82129bcae4 web/regardssignes/urls.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/regardssignes/urls.py Tue Oct 18 13:04:29 2011 +0200 @@ -0,0 +1,45 @@ +from django.conf.urls.defaults import patterns, include, url +from django.contrib import admin +from ldt.auth.views import login as pf_login +from ldt.text import VERSION_STR + +#from django.conf import settings + +# Uncomment the next two lines to enable the admin: +admin.autodiscover() + +js_info_dict = { + 'packages': ('django.contrib.admin',), +} + +urlpatterns = patterns('', + # Example: + + # Uncomment the admin/doc line below and add 'django.contrib.admindocs' + # to INSTALLED_APPS to enable admin documentation: + # (r'^admin/doc/', include('django.contrib.admindocs.urls')), + + # Uncomment the next line to enable the admin: + (r'^admin/', include(admin.site.urls)), + (r'^i18n/', include('django.conf.urls.i18n')), + + (r'^ldt/', include('ldt.ldt_utils.urls')), + (r'^user/', include('ldt.user.urls')), + (r'^api/', include('ldt.api.urls')), + (r'^api/' + VERSION_STR + '/text/', include('ldt.text.urls')), + + (r'^auth_accounts/', include('registration.backends.simple.urls')), + + #(r'^accounts/', include('socialauth.urls')), + (r'^accounts/', include('social_auth.urls')), + url(r'^accounts/login/$',pf_login,{'template_name': 'registration/login.html'},name='auth_login'), + (r'^oauth/', include('oauth_provider.urls')), + + #(r'^$', 'socialauth.views.signin_complete'), + #(r'^$', 'social_auth.views.complete'), + + (r'^/?$', 'django.views.generic.simple.redirect_to', {'url': 'ldt'}), + #(r'^static/(?P.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT}), + + (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict), +) diff -r ffdbee7b92ed -r fc82129bcae4 web/regardssignes/utils/__init__.py