# HG changeset patch # User ymh # Date 1288081199 -7200 # Node ID 3e2968de099414f28d8d220f7cdb4e74100c4456 # Parent eb9188f2ee4fa329f4694b312c3d2fedadad190c initialisation correction diff -r eb9188f2ee4f -r 3e2968de0994 .hgignore --- a/.hgignore Fri Oct 22 18:14:30 2010 +0200 +++ b/.hgignore Tue Oct 26 10:19:59 2010 +0200 @@ -12,7 +12,10 @@ ^.*\.orig$ syntax: regexp -^web/dring93/modwsgi\.wsgi$ +^web/dring93/.*\.wsgi$ syntax: regexp ^web/log/log\.txt$ ^web/index/.*$ + +syntax: regexp +^sbin/virtualenv/venv$ diff -r eb9188f2ee4f -r 3e2968de0994 sbin/virtualenv/create_python_env.py --- a/sbin/virtualenv/create_python_env.py Fri Oct 22 18:14:30 2010 +0200 +++ b/sbin/virtualenv/create_python_env.py Tue Oct 26 10:19:59 2010 +0200 @@ -42,10 +42,8 @@ EXTRA_TEXT += " 'DISTRIBUTE' : { 'setup': 'distribute', 'url': 'http://pypi.python.org/packages/source/d/distribute/distribute-0.6.13.tar.gz', 'local': '"+ os.path.abspath(os.path.join(src_base,"distribute-0.6.13.tar.gz"))+"'},\n" EXTRA_TEXT += " 'PSYCOPG2' : { 'setup': 'psycopg2','url': 'http://initd.org/pub/software/psycopg/psycopg2-2.2.1.tar.gz', 'local': '"+ os.path.abspath(os.path.join(src_base,"psycopg2-2.2.1.tar.gz"))+"'},\n" EXTRA_TEXT += " 'MYSQL' : { 'setup': 'mysql-python', 'url': 'http://sourceforge.net/projects/mysql-python/files/mysql-python-test/1.2.3c1/MySQL-python-1.2.3c1.tar.gz/download', 'local' : '"+ os.path.abspath(os.path.join(src_base,"MySQL-python-1.2.3c1.tar.gz"))+"'},\n" -EXTRA_TEXT += " 'FOURSUITE_XML' : { 'setup': '4Suite-XML', 'url': 'ftp://ftp.4suite.org/pub/4Suite/4Suite-XML-1.0.2.tar.bz2', 'local': '"+ os.path.abspath(os.path.join(src_base,"4Suite-XML-1.0.2.tar.bz2"))+"'},\n" EXTRA_TEXT += " 'PYLUCENE' : { 'setup': 'http://apache.crihan.fr/dist/lucene/pylucene/pylucene-3.0.1-1-src.tar.gz', 'url': 'http://apache.crihan.fr/dist/lucene/pylucene/pylucene-3.0.1-1-src.tar.gz', 'local': '"+ os.path.abspath(os.path.join(src_base,"pylucene-3.0.1-1-src.tar.gz"))+"'},\n" EXTRA_TEXT += " 'PIL' : { 'setup': 'pil', 'url': 'http://effbot.org/downloads/Imaging-1.1.7.tar.gz', 'local': '"+ os.path.abspath(os.path.join(src_base,"Imaging-1.1.7.tar.gz"))+"'},\n" -EXTRA_TEXT += " 'PYXML' : { 'setup': 'http://sourceforge.net/projects/pyxml/files/pyxml/0.8.4/PyXML-0.8.4.tar.gz/download', 'url': 'http://sourceforge.net/projects/pyxml/files/pyxml/0.8.4/PyXML-0.8.4.tar.gz/download', 'local': '"+ os.path.abspath(os.path.join(src_base,"PyXML-0.8.4.tar.gz"))+"', 'patch': '"+os.path.join(patch_path,"pyxml.patch")+"'},\n" EXTRA_TEXT += " 'DJANGO' : { 'setup': 'django', 'url': 'http://www.djangoproject.com/download/1.2.3/tarball/', 'local': '"+ os.path.abspath(os.path.join(src_base,"Django-1.2.3.tar.gz"))+"'},\n" EXTRA_TEXT += " 'JOGGING' : { 'setup': 'jogging', 'url': 'http://github.com/zain/jogging/tarball/v0.2.2', 'local': '"+ os.path.abspath(os.path.join(src_base,"jogging-0.2.2.tar.gz"))+"'},\n" EXTRA_TEXT += " 'DJANGO-EXTENSIONS' : { 'setup': 'django-extensions', 'url':'http://django-command-extensions.googlecode.com/files/django-extensions-0.4.1.tar.gz', 'local':'"+ os.path.abspath(os.path.join(src_base,"django-extensions-0.4.1.tar.gz"))+"' },\n" @@ -201,46 +199,13 @@ if system_str == 'Linux' and 'DISTRIBUTE' not in ignore_packages: normal_install('DISTRIBUTE', 'pip', None, None, res_source_key, home_dir, tmp_dir) - - if 'PYXML' not in ignore_packages: - logger.notify("PyXML install : %s " % URLS['PYXML'][res_source_key]) - if sys.version_info >= (2,6): - logger.notify("PyXML -> python version >= 2.6 : patching") - pyxml_src = os.path.join(src_dir,"pyxml.tar.gz") - urllib.urlretrieve(URLS['PYXML'][res_source_key], pyxml_src) - logger.notify("PyXML -> python version >= 2.6 : extract archive") - tf = tarfile.open(pyxml_src,'r:gz') - pyxml_base_path = os.path.join(src_dir,"pyxml") - tf.extractall(pyxml_base_path) - tf.close() - - #patch - pyxml_version = os.listdir(pyxml_base_path)[0] - pyxml_path = os.path.join(pyxml_base_path, pyxml_version) - olddir = os.getcwd() - os.chdir(pyxml_path) - logger.notify("PyXML -> python version >= 2.6 : do patch %s : %s " % (pyxml_path, URLS['PYXML']['patch'])) - p = patch.fromfile(URLS['PYXML']['patch']) - p.apply() - os.chdir(olddir) - logger.notify("PyXML -> python version >= 2.6 : install") - call_subprocess([os.path.abspath(os.path.join(home_dir, 'bin', 'pip')), 'install', '-E', os.path.abspath(home_dir), '--build='+os.path.abspath(pyxml_base_path), '--no-download', pyxml_version], - cwd=os.path.abspath(tmp_dir), - filter_stdout=filter_python_develop, - show_stdout=True) - else: - call_subprocess([os.path.abspath(os.path.join(home_dir, 'bin', 'pip')), 'install', '-E', os.path.abspath(home_dir), URLS['PYXML'][res_source_key]], - cwd=os.path.abspath(tmp_dir), - filter_stdout=filter_python_develop, - show_stdout=True) NORMAL_INSTALL = [ #(key,method, option_str, extra_env) - #('LXML', 'easy_install', None, {'STATIC_DEPS': 'true'}), +# ('LXML', 'easy_install', None, {'STATIC_DEPS': 'true'}), ('PSYCOPG2', 'pip', None, None), ('MYSQL', 'pip', None, None), ('PIL', 'pip', None, None), - ('FOURSUITE_XML','easy_install', None, None), ('DJANGO','pip', None, None), ('JOGGING','pip', None, None), ('DJANGO-EXTENSIONS', 'pip', None, None), diff -r eb9188f2ee4f -r 3e2968de0994 web/dring93/__init__.py --- a/web/dring93/__init__.py Fri Oct 22 18:14:30 2010 +0200 +++ b/web/dring93/__init__.py Tue Oct 26 10:19:59 2010 +0200 @@ -1,4 +1,4 @@ -VERSION = (0, 25, 0, "final", 0) +VERSION = (0, 1, 0, "final", 0) VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2]))) diff -r eb9188f2ee4f -r 3e2968de0994 web/dring93/config.py.tmpl --- a/web/dring93/config.py.tmpl Fri Oct 22 18:14:30 2010 +0200 +++ b/web/dring93/config.py.tmpl Tue Oct 26 10:19:59 2010 +0200 @@ -2,7 +2,7 @@ SITE_ID = 1 -BASE_DIR = os.path.dirname(os.path.abspath(__file__)).lstrip("/")+"/" +BASE_DIR = os.path.dirname(os.path.abspath(__file__)).rstrip("/")+"/" BASE_URL = '/~ymh/dring93/' WEB_URL = 'http://localhost/' MEDIA_BASE_URL = BASE_URL + 'static/' diff -r eb9188f2ee4f -r 3e2968de0994 web/dring93/locale/fr/LC_MESSAGES/django.mo Binary file web/dring93/locale/fr/LC_MESSAGES/django.mo has changed diff -r eb9188f2ee4f -r 3e2968de0994 web/dring93/locale/fr/LC_MESSAGES/django.po --- a/web/dring93/locale/fr/LC_MESSAGES/django.po Fri Oct 22 18:14:30 2010 +0200 +++ b/web/dring93/locale/fr/LC_MESSAGES/django.po Tue Oct 26 10:19:59 2010 +0200 @@ -37,177 +37,8 @@ msgstr "Mot de passe oublié ?" msgid "header_title" -msgstr "Dring 93;" +msgstr "Dring 93" msgid "page_title" msgstr "Dring 93" -#~ msgid "You can not access this project" -#~ msgstr "Vous n'avez pas accès à ce projet" - -#~ msgid "home" -#~ msgstr "accueil" - -#~ msgid "contents" -#~ msgstr "Liste des contenus" - -#~ msgid "indexation projects" -#~ msgstr "Projets d'indexation" - -#~ msgid "accounts" -#~ msgstr "Liste des comptes" - -#~ msgid "Profiles" -#~ msgstr "Profile" - -#~ msgid "Log out" -#~ msgstr "déconnexion" - -#~ msgid "Langue" -#~ msgstr "Langue" - -#~ msgid "popup_player" -#~ msgstr "Code du lecteur" - -#~ msgid "popup_seo_body" -#~ msgstr "Code SEO" - -#~ msgid "popup_seo_meta" -#~ msgstr "Code balise meta header" - -#~ msgid "popup_links" -#~ msgstr "Liste de liens" - -#~ msgid "clik here to see the project content" -#~ msgstr "cliquer ici pour voir le contenu du projet" - -#~ msgid "content list" -#~ msgstr "Liste des contenus" - -#~ msgid "search" -#~ msgstr "Recherche" - -#~ msgid "project list" -#~ msgstr "Liste des projets" - -#~ msgid "name" -#~ msgstr "Nom" - -#~ msgid "create project" -#~ msgstr "Créer un projet" - -#~ msgid "preview media" -#~ msgstr "preview" - -#~ msgid "Create content" -#~ msgstr "Créer un Contenu" - -#~ msgid "open ldt" -#~ msgstr "Ouvrir sous Lignes de Temps" - -#~ msgid "copy project" -#~ msgstr "Copier projet" - -#~ msgid "link json by id" -#~ msgstr "Ouvrir le lecteur augmenté" - -#~ msgid "Project published, click to unpublish" -#~ msgstr "Projet publié, cliquer pour de-publier" - -#~ msgid "Project not published, click to publish" -#~ msgstr "Projet non publié, cliquer pour publier" - -#~ msgid "Create project" -#~ msgstr "Créer un projet" - -#~ msgid "" -#~ "The operation could not be performed because one or more error(s) " -#~ "occurred.
Please resubmit the content form after making the " -#~ "following changes:" -#~ msgstr "" -#~ "opération impossible à cause d'une ou plusieurs erreurs.
Veuillez " -#~ "resoumettre le formulaire contenu après avoir fait les changements " -#~ "suivants:" - -#~ msgid "" -#~ "The operation could not be performed because one or more error(s) " -#~ "occurred.
Please resubmit the media form after making the following " -#~ "changes:" -#~ msgstr "" -#~ "opération impossible à cause d'une ou plusieurs erreurs.
Veuillez " -#~ "resoumettre le formulaire media après avoir fait les changements suivants:" - -#~ msgid "media file is being processed please wait." -#~ msgstr "Le fichier média est en cours de traitement. Veullez patienter." - -#~ msgid "close_cancel" -#~ msgstr "Annuler" - -#~ msgid "delete" -#~ msgstr "Effacer" - -#~ msgid "write" -#~ msgstr "Enregistrer" - -#~ msgid "Update your project" -#~ msgstr "Mettre à jour un projet" - -#~ msgid "Create your project" -#~ msgstr "Créer un projet" - -#~ msgid "Title" -#~ msgstr "Titre" - -#~ msgid "List of contents" -#~ msgstr "Liste des Médias" - -#~ msgid "delete_project" -#~ msgstr "Effacer" - -#~ msgid "update_project" -#~ msgstr "Mettre à jour" - -#~ msgid "create_project" -#~ msgstr "Créer" - -#~ msgid "error" -#~ msgstr "Erreurs" - -#~ msgid "confirm" -#~ msgstr "Confirmer" - -#~ msgid "close_error" -#~ msgstr "fermer" - -#~ msgid "do_delete" -#~ msgstr "Effacer" - -#~ msgid "create account" -#~ msgstr "Créer un compte" - -#~ msgid "Pseudo" -#~ msgstr "Pseudo" - -#~ msgid "this field is compulsory" -#~ msgstr "Ce champs et obligatoire" - -#~ msgid "Password" -#~ msgstr "Mot de passe" - -#~ msgid "reset password" -#~ msgstr "Réinitialiser le mot de passe" - -#~ msgid "Connection" -#~ msgstr "Connexion" - -#~ msgid "Create" -#~ msgstr "Créer" - -#~ msgid "link json by externalid" -#~ msgstr "ouvrir le lecteur augmenté" - -#~ msgid "Space" -#~ msgstr "Esp. perso." - -#~ msgid "Create an account" -#~ msgstr "Créer un compte" diff -r eb9188f2ee4f -r 3e2968de0994 web/dring93/templates/ldt/ldt_utils/workspace.html --- a/web/dring93/templates/ldt/ldt_utils/workspace.html Fri Oct 22 18:14:30 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -{% extends "ldt/ldt_utils/workspace_base.html" %} - -{% block title %}Dring 93{% endblock %} -{% block base_title %}Dring 93{% endblock %} diff -r eb9188f2ee4f -r 3e2968de0994 web/static/ldt/img/favicon.ico Binary file web/static/ldt/img/favicon.ico has changed