--- a/.hgignore Fri Oct 05 13:44:45 2012 +0200
+++ b/.hgignore Mon Oct 08 17:00:38 2012 +0200
@@ -6,20 +6,17 @@
^web/log$
.*\.pyc$
^web/\.htaccess$
-^web/config\.py$
^web/static/media/ldt$
^web/static/site$
^virtualenv/web/env$
.pydevproject
^virtualenv/web/project-boot\.py$
-^web/theend/\.htaccess$
-^web/theend/config\.py$
+^src/theend/\.htaccess$
+^src/theend/config\.py$
^\.settings/org\.eclipse\.core\.resources\.prefs$
^\.settings/org\.eclipse\.core\.resources\.prefs$
^\.settings/org\.eclipse\.core\.runtime\.prefs$
^virtualenv/sync/env/
-syntax: regexp
^sbin/sync/config\.py$
-syntax: regexp
^virtualenv/sync/project-boot\.py$
^\.gitignore$
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/manage.py Mon Oct 08 17:00:38 2012 +0200
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+import os
+import sys
+
+if __name__ == "__main__":
+ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "theend.settings")
+
+ from django.core.management import execute_from_command_line
+
+ execute_from_command_line(sys.argv)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/theend/.htaccess.mod_python.tmpl Mon Oct 08 17:00:38 2012 +0200
@@ -0,0 +1,11 @@
+SetHandler python-program
+PythonHandler ldt.core.handlers.modpython
+SetEnv DJANGO_SETTINGS_MODULE ldtplatform.settings
+PythonInterpreter platform
+PythonOption django.root </root/url>
+PythonOption virtualenv.activate_path </virtualenv/path/bin/activate>
+PythonDebug on
+PythonPath "['<virtualenv/path>/lib/python2.7/sites-packages'] + sys.path"
+Header set Pragma "no-cache"
+Header set Cache-Control "no-cache"
+Header set Expires "-1"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/theend/.htaccess.mod_wsgi.tmpl Mon Oct 08 17:00:38 2012 +0200
@@ -0,0 +1,19 @@
+
+SetEnv DJANGO_SETTINGS_MODULE theend.settings
+SetEnv PROJECT_PATH </web/folder/path/on/server>
+SetEnv PYTHON_PATH </virtualenv/path>/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 ^(.*)$ <url/root>/modwsgi.wsgi/$1 [QSA,PT,L]
+
+Header set Pragma "no-cache"
+Header set Cache-Control "no-cache"
+Header set Expires "-1"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/theend/__init__.py Mon Oct 08 17:00:38 2012 +0200
@@ -0,0 +1,17 @@
+VERSION = (1, 7, 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()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/theend/config.py.tmpl Mon Oct 08 17:00:38 2012 +0200
@@ -0,0 +1,109 @@
+# -*- coding: utf-8 -*-
+import os, logging
+
+SITE_ID = 1
+
+#BASE_DIR = os.path.dirname(os.path.abspath(__file__)).rstrip("/")+"/"
+BASE_DIR = '%(base_dir)s'
+BASE_URL = '%(base_url)s'
+WEB_URL = '%(web_url)s'
+STATIC_URL = BASE_URL + 'static/site/'
+
+
+STREAM_URL = "%(stream_url)s"
+
+STREAM_SRC_PREFIX = "%(stream_src_prefix)s"
+
+BASE_STATIC_ROOT = os.path.abspath(BASE_DIR + "../../web/static/").rstrip("/")+"/"
+BASE_STATIC_URL = BASE_URL + 'static/'
+
+# Absolute path to the directory that holds media.
+# Example: "/home/media/media.lawrence.com/"
+MEDIA_ROOT = BASE_STATIC_ROOT + "media/"
+
+
+# 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 = "%(ffmpeg_path)s"
+
+
+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.%(db_engine)s', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+ 'NAME': '%(db_name)s', # Or path to database file if using sqlite3.
+ 'USER': '%(db_user)s', # Not used with sqlite3.
+ 'PASSWORD': '%(db_password)s', # Not used with sqlite3.
+ 'HOST': '%(db_host)s', # Set to empty string for localhost. Not used with sqlite3.
+ 'PORT': '%(db_port)d', # Set to empty string for default. Not used with sqlite3.
+ }
+}
+
+CACHES = {
+ 'default': {
+ 'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
+ }
+}
+
+DEBUG = True
+TEMPLATE_DEBUG = DEBUG
+
+#LOG_FILE = os.path.abspath(os.path.join(BASE_DIR,"../log/log.txt"))
+LOG_FILE = '%(log_file)s'
+LOG_LEVEL = logging.DEBUG
+logging.basicConfig(filename=LOG_FILE, level=LOG_LEVEL)
+
+
+ADMINS = (
+ # ('Your Name', 'your_email@domain.com'),
+)
+
+MANAGERS = ADMINS
+
+GOOGLE_ANALYTICS_CODE = '%(google_analytics_code)s'
+
+EMAIL_USE_TLS = %(email_use_tls)s
+EMAIL_HOST = '%(email_host)s'
+EMAIL_HOST_USER = '%(email_host_user)s'
+EMAIL_HOST_PASSWORD = '%(email_host_user)s'
+EMAIL_PORT = %(email_port)d
+
+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
+LDT_MAX_CONTENTS_PER_PAGE = 5
+LDT_MAX_PROJECTS_PER_PAGE = 5
+LDT_FRONT_MEDIA_PER_PAGE = 9
+
+EMPTY_MEDIA_EXTERNALID = None
+
+AUTO_INDEX_AFTER_SAVE = True
+
+FORBIDDEN_STREAM_URL = "%(forbidden_stream_url)s"
+
+FRONT_TAG_LIST = [u"Enmi 2011", u"film", u"conférence"]
+
+HAYSTACK_CONNECTIONS = {
+ 'default': {
+ #for elasticsearch use ldt.indexation.backends.elasticsearch_backend.ElasticsearchSearchEngine
+ 'ENGINE': 'haystack.backends.simple_backend.SimpleEngine',
+ #'URL': 'http://127.0.0.1:9200/',
+ #'INDEX_NAME': 'ldt',
+ },
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/theend/django_wsgi.py Mon Oct 08 17:00:38 2012 +0200
@@ -0,0 +1,11 @@
+import os
+
+os.environ['DJANGO_SETTINGS_MODULE'] = 'theend.settings'
+
+import django.core.handlers.wsgi
+
+application = django.core.handlers.wsgi.WSGIHandler()
+
+if os.environ.get('PYDEV_DEBUG', "False").lower() in ["true", "1", "t"]:
+ import pydevd #@UnresolvedImport
+ pydevd.settrace(suspend=False)
Binary file src/theend/locale/fr/LC_MESSAGES/django.mo has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/theend/locale/fr/LC_MESSAGES/django.po Mon Oct 08 17:00:38 2012 +0200
@@ -0,0 +1,54 @@
+# 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 <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-03-13 12:29+0100\n"
+"PO-Revision-Date: 2010-02-17 02:57+0100\n"
+"Last-Translator: Yves-Marie Haussonne <ymh.work@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: settings.py:41
+msgid "French"
+msgstr "Français"
+
+#: settings.py:42
+msgid "English"
+msgstr "Anglais"
+
+#: templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Administration Django du site"
+
+#: templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Administration Django"
+
+#: templates/registration/login.html:17
+msgid "Log in"
+msgstr "Connexion"
+
+#: templates/registration/login.html:20
+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:31
+msgid "Forget password?"
+msgstr "Mot de passe oublié ?"
+
+#: templates/registration/login.html:34
+msgid "login"
+msgstr "Connexion"
+
+#: templates/registration/login.html:41
+msgid "Or login with your external account"
+msgstr "Ou bien utilisez l'un de vos comptes externes"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/theend/modwsgi.wsgi Mon Oct 08 17:00:38 2012 +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)
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/theend/settings.py Mon Oct 08 17:00:38 2012 +0200
@@ -0,0 +1,275 @@
+# -*- coding: utf-8 -*-
+#@PydevCodeAnalysisIgnore
+import os.path
+import theend
+# 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 = 'UTC'
+
+# 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.cache.UpdateCacheMiddleware',
+ 'django.middleware.common.CommonMiddleware',
+ 'django.middleware.cache.FetchFromCacheMiddleware',
+ 'django.middleware.gzip.GZipMiddleware',
+ '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',
+ 'ldt.security.middleware.SecurityMiddleware',
+ 'ldt.api.middleware.pistonput.PistonPutMiddleware',
+)
+
+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 = 'theend.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',
+ 'haystack',
+ 'theend',
+ 'registration',
+ 'tagging',
+ 'ldt',
+ 'ldt.core',
+ 'ldt.ldt_utils',
+ 'ldt.text',
+ 'ldt.user',
+ 'ldt.management',
+ 'ldt.indexation',
+ 'oauth_provider',
+ 'django_openid_consumer',
+ 'piston',
+ 'social_auth',
+ 'south',
+ 'guardian',
+ 'sorl.thumbnail',
+)
+
+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',
+ 'guardian.backends.ObjectPermissionBackend',
+)
+SOCIAL_AUTH_IMPORT_BACKENDS = (
+ 'myproy.social_auth_extra_services',
+)
+
+ACCOUNT_ACTIVATION_DAYS = 7
+
+LDT_MAX_SEARCH_NUMBER = 50
+LDT_JSON_DEFAULT_INDENT = 0
+LDT_MAX_FRAGMENT_PER_SEARCH = 3
+LDT_RESULTS_PER_PAGE = 10
+LDT_MAX_CONTENTS_PER_PAGE = 10
+LDT_MAX_PROJECTS_PER_PAGE = 10
+LDT_FRONT_MEDIA_PER_PAGE = 9
+
+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'
+
+
+AUTO_INDEX_AFTER_SAVE = True
+
+ANONYMOUS_USER_ID = -1
+
+WEB_VERSION = theend.get_version()
+
+DIVISIONS_FOR_STAT_ANNOTATION = 64
+
+FRONT_TAG_LIST = []
+
+DEFAULT_CONTENT_ICON = "thumbnails/contents/content_default_icon.png"
+DEFAULT_PROJECT_ICON = "thumbnails/projects/project_default_icon.png"
+DEFAULT_USER_ICON = "thumbnails/users/user_default_icon.png"
+DEFAULT_GROUP_ICON = "thumbnails/groups/group_default_icon.png"
+PROFILE_IMG_MAX_SIZE = 1000000
+
+USE_GROUP_PERMISSIONS = ['Project', 'Content', 'Media']
+FORBIDDEN_STREAM_URL = "rtmp://media.iri.centrepompidou.fr/ddc_player/mp4:video/forbidden_stream.mp4?old_path="
+PUBLIC_GROUP_NAME = 'everyone'
+MAX_USERS_SEARCH = 20
+
+SYNTAX = {
+ '++' : 'OK',
+ '--' : 'KO',
+ '==' : 'REF',
+ '??' : 'Q'
+ }
+
+EXTERNAL_STREAM_SRC = ['youtube.com', 'dailymotion.com']
+
+HAYSTACK_CONNECTIONS = {
+ 'default': {
+ 'ENGINE': 'haystack.backends.simple_backend.SimpleEngine',
+ },
+}
+
+from config import *
+
+if not "LOGIN_URL" in locals():
+ LOGIN_URL = BASE_URL + 'theend/accounts/login/'
+if not "LOGOUT_URL" in locals():
+ LOGOUT_URL = BASE_URL + 'theend/accounts/disconnect/'
+if not "LOGIN_REDIRECT_URL" in locals():
+ LOGIN_REDIRECT_URL = BASE_URL + 'theend/ldt/'
+if not "LOGOUT_REDIRECT_URL" in locals():
+ LOGOUT_REDIRECT_URL = BASE_URL + 'theend/accounts/login'
+if not "PROFILE_REDIRECT_URL" in locals():
+ PROFILE_REDIRECT_URL = BASE_URL + 'theend/auth_accounts/create/profile'
+
+if not "LOGIN_ERROR_URL" in locals():
+ LOGIN_ERROR_URL = BASE_URL + 'theend/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/'
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/theend/templates/admin/base_site.html Mon Oct 08 17:00:38 2012 +0200
@@ -0,0 +1,21 @@
+{% extends "admin/base.html" %}
+{% load i18n %}
+
+{% block title %}{{ title }} | {% trans 'Django site admin' %}{% endblock %}
+
+{% block branding %}
+<h1 id="site-name">{% trans 'Django administration' %}</h1>
+{% endblock %}
+
+{% block nav-global %}
+ <style type="text/css">
+ .adminlink {
+ margin:0 10px 10px;
+ display:block;
+ float:left;
+ }
+ </style>
+
+ <a href="{% url admin:index %}" class="adminlink">Admin home</a>
+ <a href="{% url root-view %}" class="adminlink">Website home</a>
+{% endblock %}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/theend/templates/ldt/ldt_utils/workspace.html Mon Oct 08 17:00:38 2012 +0200
@@ -0,0 +1,2 @@
+{% extends "ldt/ldt_utils/workspace_base.html" %}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/theend/templates/registration/login.html Mon Oct 08 17:00:38 2012 +0200
@@ -0,0 +1,56 @@
+{% extends "registration/base.html" %}
+{% load i18n %}
+{% block js_declaration %}
+{{ block.super }}
+{% endblock %}
+
+{% block css_import %}
+ {{ block.super }}
+ <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/ldt.css" />
+ <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/ldtform.css" />
+{% endblock %}
+
+
+{% block login %}
+{% endblock %}
+
+{% block content_title %}{% trans 'Log in' %}{% endblock %}
+{% block iricontent %}
+ {% if form.errors %}
+ <p class="error">{% trans "Sorry, that's not a valid username or password." %}</p>
+ {% endif %}
+ <div class="span-24 last">
+ <form action="" method='post' id="login-form">
+ <div id="loginform_div" class="span-12">
+ {% csrf_token %}
+ <input type="hidden" name="next" value="{{ next }}" />
+ <ul id="login_fields_list">
+ {{form.as_ul}}
+ </ul>
+ <ul>
+ <li><a href="{% url django.contrib.auth.views.password_reset %}" >{% trans "Forget password?" %}</a></li>
+ </ul>
+ <div id="submitcontent-buttons-login" class="span-24 last">
+ <button class="button"type="submit" value="login">{% trans "login" %}</button>
+ </div>
+ </div>
+ </form>
+ <div id="login_links" class="span-12 last">
+ <div id="login_links_list" class="span-12 last">
+ {% if social_list %}
+ <p>{% trans "Or login with your external account" %} :</p>
+ <ul>
+ {% for backend_name in social_list %}
+ <li><a href="{{ backend_name }}"><img src="{{LDT_MEDIA_PREFIX}}img/logo_{{backend_name}}.png" /> {{ backend_name }}</a></li>
+ {% endfor %}
+ {% comment %}{{social_list|safe}}{% endcomment %}
+ </ul>
+ {% endif %}
+ </div>
+ </div>
+ </div>
+
+{% endblock %}
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/theend/urls.py Mon Oct 08 17:00:38 2012 +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<path>.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT}),
+
+ (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict),
+)
--- a/virtualenv/web/res/res_create_env.py Fri Oct 05 13:44:45 2012 +0200
+++ b/virtualenv/web/res/res_create_env.py Mon Oct 08 17:00:38 2012 +0200
@@ -7,7 +7,6 @@
INSTALLS = [ #(key,method, option_str, dict_extra_env)
'LXML',
- 'PSYCOPG2',
'MYSQL',
'SOUTH',
'PIL',
--- a/web/.htaccess.tmpl Fri Oct 05 13:44:45 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-RedirectMatch permanent /theend/?$ /theend/theend
--- a/web/manage.py Fri Oct 05 13:44:45 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-import os
-import sys
-
-if __name__ == "__main__":
- os.environ.setdefault("DJANGO_SETTINGS_MODULE", "theend.settings")
-
- from django.core.management import execute_from_command_line
-
- execute_from_command_line(sys.argv)
--- a/web/theend/.htaccess.mod_python.tmpl Fri Oct 05 13:44:45 2012 +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 </root/url>
-PythonOption virtualenv.activate_path </virtualenv/path/bin/activate>
-PythonDebug on
-PythonPath "['<virtualenv/path>/lib/python2.7/sites-packages'] + sys.path"
-Header set Pragma "no-cache"
-Header set Cache-Control "no-cache"
-Header set Expires "-1"
--- a/web/theend/.htaccess.mod_wsgi.tmpl Fri Oct 05 13:44:45 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-
-SetEnv DJANGO_SETTINGS_MODULE theend.settings
-SetEnv PROJECT_PATH </web/folder/path/on/server>
-SetEnv PYTHON_PATH </virtualenv/path>/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 ^(.*)$ <url/root>/modwsgi.wsgi/$1 [QSA,PT,L]
-
-Header set Pragma "no-cache"
-Header set Cache-Control "no-cache"
-Header set Expires "-1"
--- a/web/theend/__init__.py Fri Oct 05 13:44:45 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-VERSION = (1, 7, 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()
--- a/web/theend/config.py.tmpl Fri Oct 05 13:44:45 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-# -*- coding: utf-8 -*-
-import os, logging
-
-SITE_ID = 1
-
-#BASE_DIR = os.path.dirname(os.path.abspath(__file__)).rstrip("/")+"/"
-BASE_DIR = '%(base_dir)s'
-BASE_URL = '%(base_url)s'
-WEB_URL = '%(web_url)s'
-STATIC_URL = BASE_URL + 'static/site/'
-
-
-STREAM_URL = "%(stream_url)s"
-
-STREAM_SRC_PREFIX = "%(stream_src_prefix)s"
-
-BASE_STATIC_ROOT = os.path.abspath(BASE_DIR + "../static/").rstrip("/")+"/"
-BASE_STATIC_URL = BASE_URL + 'static/'
-
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = BASE_STATIC_ROOT + "media/"
-
-
-# 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 = "%(ffmpeg_path)s"
-
-
-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.%(db_engine)s', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
- 'NAME': '%(db_name)s', # Or path to database file if using sqlite3.
- 'USER': '%(db_user)s', # Not used with sqlite3.
- 'PASSWORD': '%(db_password)s', # Not used with sqlite3.
- 'HOST': '%(db_host)s', # Set to empty string for localhost. Not used with sqlite3.
- 'PORT': '%(db_port)d', # Set to empty string for default. Not used with sqlite3.
- }
-}
-
-CACHES = {
- 'default': {
- 'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
- }
-}
-
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
-#LOG_FILE = os.path.abspath(os.path.join(BASE_DIR,"../log/log.txt"))
-LOG_FILE = '%(log_file)s'
-LOG_LEVEL = logging.DEBUG
-logging.basicConfig(filename=LOG_FILE, level=LOG_LEVEL)
-
-
-ADMINS = (
- # ('Your Name', 'your_email@domain.com'),
-)
-
-MANAGERS = ADMINS
-
-GOOGLE_ANALYTICS_CODE = '%(google_analytics_code)s'
-
-EMAIL_USE_TLS = %(email_use_tls)s
-EMAIL_HOST = '%(email_host)s'
-EMAIL_HOST_USER = '%(email_host_user)s'
-EMAIL_HOST_PASSWORD = '%(email_host_user)s'
-EMAIL_PORT = %(email_port)d
-
-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
-LDT_MAX_CONTENTS_PER_PAGE = 5
-LDT_MAX_PROJECTS_PER_PAGE = 5
-LDT_FRONT_MEDIA_PER_PAGE = 9
-
-EMPTY_MEDIA_EXTERNALID = None
-
-AUTO_INDEX_AFTER_SAVE = True
-
-FORBIDDEN_STREAM_URL = "%(forbidden_stream_url)s"
-
-FRONT_TAG_LIST = [u"Enmi 2011", u"film", u"conférence"]
-
-HAYSTACK_CONNECTIONS = {
- 'default': {
- #for elasticsearch use ldt.indexation.backends.elasticsearch_backend.ElasticsearchSearchEngine
- 'ENGINE': 'haystack.backends.simple_backend.SimpleEngine',
- #'URL': 'http://127.0.0.1:9200/',
- #'INDEX_NAME': 'ldt',
- },
-}
--- a/web/theend/django_wsgi.py Fri Oct 05 13:44:45 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-import os
-
-os.environ['DJANGO_SETTINGS_MODULE'] = 'theend.settings'
-
-import django.core.handlers.wsgi
-
-application = django.core.handlers.wsgi.WSGIHandler()
-
-if os.environ.get('PYDEV_DEBUG', "False").lower() in ["true", "1", "t"]:
- import pydevd #@UnresolvedImport
- pydevd.settrace(suspend=False)
Binary file web/theend/locale/fr/LC_MESSAGES/django.mo has changed
--- a/web/theend/locale/fr/LC_MESSAGES/django.po Fri Oct 05 13:44:45 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +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 <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-13 12:29+0100\n"
-"PO-Revision-Date: 2010-02-17 02:57+0100\n"
-"Last-Translator: Yves-Marie Haussonne <ymh.work@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: settings.py:41
-msgid "French"
-msgstr "Français"
-
-#: settings.py:42
-msgid "English"
-msgstr "Anglais"
-
-#: templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Administration Django du site"
-
-#: templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr "Administration Django"
-
-#: templates/registration/login.html:17
-msgid "Log in"
-msgstr "Connexion"
-
-#: templates/registration/login.html:20
-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:31
-msgid "Forget password?"
-msgstr "Mot de passe oublié ?"
-
-#: templates/registration/login.html:34
-msgid "login"
-msgstr "Connexion"
-
-#: templates/registration/login.html:41
-msgid "Or login with your external account"
-msgstr "Ou bien utilisez l'un de vos comptes externes"
-
--- a/web/theend/modwsgi.wsgi Fri Oct 05 13:44:45 2012 +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)
-
--- a/web/theend/settings.py Fri Oct 05 13:44:45 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,275 +0,0 @@
-# -*- coding: utf-8 -*-
-#@PydevCodeAnalysisIgnore
-import os.path
-import theend
-# 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 = 'UTC'
-
-# 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.cache.UpdateCacheMiddleware',
- 'django.middleware.common.CommonMiddleware',
- 'django.middleware.cache.FetchFromCacheMiddleware',
- 'django.middleware.gzip.GZipMiddleware',
- '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',
- 'ldt.security.middleware.SecurityMiddleware',
- 'ldt.api.middleware.pistonput.PistonPutMiddleware',
-)
-
-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 = 'theend.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',
- 'haystack',
- 'theend',
- 'registration',
- 'tagging',
- 'ldt',
- 'ldt.core',
- 'ldt.ldt_utils',
- 'ldt.text',
- 'ldt.user',
- 'ldt.management',
- 'ldt.indexation',
- 'oauth_provider',
- 'django_openid_consumer',
- 'piston',
- 'social_auth',
- 'south',
- 'guardian',
- 'sorl.thumbnail',
-)
-
-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',
- 'guardian.backends.ObjectPermissionBackend',
-)
-SOCIAL_AUTH_IMPORT_BACKENDS = (
- 'myproy.social_auth_extra_services',
-)
-
-ACCOUNT_ACTIVATION_DAYS = 7
-
-LDT_MAX_SEARCH_NUMBER = 50
-LDT_JSON_DEFAULT_INDENT = 0
-LDT_MAX_FRAGMENT_PER_SEARCH = 3
-LDT_RESULTS_PER_PAGE = 10
-LDT_MAX_CONTENTS_PER_PAGE = 10
-LDT_MAX_PROJECTS_PER_PAGE = 10
-LDT_FRONT_MEDIA_PER_PAGE = 9
-
-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'
-
-
-AUTO_INDEX_AFTER_SAVE = True
-
-ANONYMOUS_USER_ID = -1
-
-WEB_VERSION = theend.get_version()
-
-DIVISIONS_FOR_STAT_ANNOTATION = 64
-
-FRONT_TAG_LIST = []
-
-DEFAULT_CONTENT_ICON = "thumbnails/contents/content_default_icon.png"
-DEFAULT_PROJECT_ICON = "thumbnails/projects/project_default_icon.png"
-DEFAULT_USER_ICON = "thumbnails/users/user_default_icon.png"
-DEFAULT_GROUP_ICON = "thumbnails/groups/group_default_icon.png"
-PROFILE_IMG_MAX_SIZE = 1000000
-
-USE_GROUP_PERMISSIONS = ['Project', 'Content', 'Media']
-FORBIDDEN_STREAM_URL = "rtmp://media.iri.centrepompidou.fr/ddc_player/mp4:video/forbidden_stream.mp4?old_path="
-PUBLIC_GROUP_NAME = 'everyone'
-MAX_USERS_SEARCH = 20
-
-SYNTAX = {
- '++' : 'OK',
- '--' : 'KO',
- '==' : 'REF',
- '??' : 'Q'
- }
-
-EXTERNAL_STREAM_SRC = ['youtube.com', 'dailymotion.com']
-
-HAYSTACK_CONNECTIONS = {
- 'default': {
- 'ENGINE': 'haystack.backends.simple_backend.SimpleEngine',
- },
-}
-
-from config import *
-
-if not "LOGIN_URL" in locals():
- LOGIN_URL = BASE_URL + 'theend/accounts/login/'
-if not "LOGOUT_URL" in locals():
- LOGOUT_URL = BASE_URL + 'theend/accounts/disconnect/'
-if not "LOGIN_REDIRECT_URL" in locals():
- LOGIN_REDIRECT_URL = BASE_URL + 'theend/ldt/'
-if not "LOGOUT_REDIRECT_URL" in locals():
- LOGOUT_REDIRECT_URL = BASE_URL + 'theend/accounts/login'
-if not "PROFILE_REDIRECT_URL" in locals():
- PROFILE_REDIRECT_URL = BASE_URL + 'theend/auth_accounts/create/profile'
-
-if not "LOGIN_ERROR_URL" in locals():
- LOGIN_ERROR_URL = BASE_URL + 'theend/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/'
-
--- a/web/theend/templates/admin/base_site.html Fri Oct 05 13:44:45 2012 +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 %}
-<h1 id="site-name">{% trans 'Django administration' %}</h1>
-{% endblock %}
-
-{% block nav-global %}
- <style type="text/css">
- .adminlink {
- margin:0 10px 10px;
- display:block;
- float:left;
- }
- </style>
-
- <a href="{% url admin:index %}" class="adminlink">Admin home</a>
- <a href="{% url root-view %}" class="adminlink">Website home</a>
-{% endblock %}
\ No newline at end of file
--- a/web/theend/templates/ldt/ldt_utils/workspace.html Fri Oct 05 13:44:45 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-{% extends "ldt/ldt_utils/workspace_base.html" %}
-
--- a/web/theend/templates/registration/login.html Fri Oct 05 13:44:45 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-{% extends "registration/base.html" %}
-{% load i18n %}
-{% block js_declaration %}
-{{ block.super }}
-{% endblock %}
-
-{% block css_import %}
- {{ block.super }}
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/ldt.css" />
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/ldtform.css" />
-{% endblock %}
-
-
-{% block login %}
-{% endblock %}
-
-{% block content_title %}{% trans 'Log in' %}{% endblock %}
-{% block iricontent %}
- {% if form.errors %}
- <p class="error">{% trans "Sorry, that's not a valid username or password." %}</p>
- {% endif %}
- <div class="span-24 last">
- <form action="" method='post' id="login-form">
- <div id="loginform_div" class="span-12">
- {% csrf_token %}
- <input type="hidden" name="next" value="{{ next }}" />
- <ul id="login_fields_list">
- {{form.as_ul}}
- </ul>
- <ul>
- <li><a href="{% url django.contrib.auth.views.password_reset %}" >{% trans "Forget password?" %}</a></li>
- </ul>
- <div id="submitcontent-buttons-login" class="span-24 last">
- <button class="button"type="submit" value="login">{% trans "login" %}</button>
- </div>
- </div>
- </form>
- <div id="login_links" class="span-12 last">
- <div id="login_links_list" class="span-12 last">
- {% if social_list %}
- <p>{% trans "Or login with your external account" %} :</p>
- <ul>
- {% for backend_name in social_list %}
- <li><a href="{{ backend_name }}"><img src="{{LDT_MEDIA_PREFIX}}img/logo_{{backend_name}}.png" /> {{ backend_name }}</a></li>
- {% endfor %}
- {% comment %}{{social_list|safe}}{% endcomment %}
- </ul>
- {% endif %}
- </div>
- </div>
- </div>
-
-{% endblock %}
-
-
-
--- a/web/theend/urls.py Fri Oct 05 13:44:45 2012 +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<path>.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT}),
-
- (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict),
-)