--- a/sbin/virtualenv/create_python_env.py Sat Sep 11 01:18:28 2010 +0200
+++ b/sbin/virtualenv/create_python_env.py Mon Sep 13 10:32:10 2010 +0200
@@ -234,7 +234,7 @@
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),
@@ -243,6 +243,11 @@
('DJANGO-EXTENSIONS', 'pip', None, None),
('DJANGO-REGISTRATION', 'easy_install', '-Z', None),
]
+
+ if system_str == "Darwin":
+ NORMAL_INSTALL.append(('LXML', 'easy_install', None, {'STATIC_DEPS': 'true'}))
+ else:
+ NORMAL_INSTALL.append(('LXML', 'easy_install', None, None))
for key, method, option_str, extra_env in NORMAL_INSTALL:
--- a/sql/update_db_0_10_to_0_11.sql Sat Sep 11 01:18:28 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-ALTER TABLE ldt_utils_content ALTER COLUMN src DROP NOT NULL;
-ALTER TABLE ldt_utils_content ADD COLUMN content_creation_date timestamp with time zone;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/update_db_0_10_to_0_13.sql Mon Sep 13 10:32:10 2010 +0200
@@ -0,0 +1,2 @@
+ALTER TABLE ldt_utils_content ALTER COLUMN src DROP NOT NULL;
+ALTER TABLE ldt_utils_content ADD COLUMN content_creation_date timestamp with time zone;
--- a/web/franceculture/.htaccess.mod_wsgi.tmpl Sat Sep 11 01:18:28 2010 +0200
+++ b/web/franceculture/.htaccess.mod_wsgi.tmpl Mon Sep 13 10:32:10 2010 +0200
@@ -7,6 +7,10 @@
Options ExecCGI FollowSymLinks
SetHandler wsgi-script
+#if defined in global definition
+#defined with WSGIDaemonProcess
+#WSGIProcessGroup franceculture
+
RewriteEngine On
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule ^(.*)$ /dev/~wakimd/franceculture/franceculture/modwsgi.wsgi/$1 [QSA,PT,L]
--- a/web/franceculture/__init__.py Sat Sep 11 01:18:28 2010 +0200
+++ b/web/franceculture/__init__.py Mon Sep 13 10:32:10 2010 +0200
@@ -1,4 +1,4 @@
-VERSION = (0,12)
+VERSION = (0,13)
VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION)))
--- a/web/franceculture/locale/fr/LC_MESSAGES/django.po Sat Sep 11 01:18:28 2010 +0200
+++ b/web/franceculture/locale/fr/LC_MESSAGES/django.po Mon Sep 13 10:32:10 2010 +0200
@@ -7,10 +7,11 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-12 01:49+0200\n"
+"POT-Creation-Date: 2010-09-12 22:52+0200\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"
@@ -19,84 +20,145 @@
msgid "French"
msgstr "Français"
+#: templates/base.html:44
+msgid "home"
+msgstr ""
+
+#: templates/base.html:45
+#, fuzzy
+msgid "contents"
+msgstr "Liste des contenus"
+
+#: templates/base.html:46
+#, fuzzy
+msgid "indexation projects"
+msgstr "Créer un projet"
+
+#: templates/base.html:47
+#, fuzzy
+msgid "accounts"
+msgstr "Créer un compte"
+
+#: templates/base.html:48
+msgid "Profiles"
+msgstr "Profile"
+
#: templates/base.html:54
+msgid "Log out"
+msgstr "déconnexion"
+
+#: templates/base.html:62
msgid "Langue"
msgstr "Langue"
-#: templates/franceculture/embed_popup.html:54
+#: templates/franceculture/embed_popup.html:56
msgid "clik here to see the project content"
msgstr "cliquer ici pour voir le contenu du projet"
-#: templates/franceculture/workspace.html:76
+#: templates/franceculture/workspace.html:49
+#: templates/ldt/ldt_utils/content_list.html:50
msgid "content list"
msgstr "Liste des contenus"
-#: templates/franceculture/workspace.html:81 templates/franceculture/workspace.html:97
+#: templates/franceculture/workspace.html:51
+#: templates/franceculture/workspace.html:62
+#: templates/ldt/ldt_utils/content_list.html:52
+#: templates/ldt/ldt_utils/ldt_list.html:79
+msgid "search"
+msgstr ""
+
+#: templates/franceculture/workspace.html:60
+#: templates/ldt/ldt_utils/ldt_list.html:77
+msgid "project list"
+msgstr "Liste des projets"
+
+#: templates/franceculture/partial/contentslist.html:3
+#: templates/franceculture/partial/projectslist.html:3
+#: templates/ldt/ldt_utils/create_ldt.html:30
+msgid "name"
+msgstr ""
+
+#: templates/franceculture/partial/contentslist.html:11
+msgid "create project"
+msgstr "Créer un projet"
+
+#: templates/franceculture/partial/contentslist.html:12
+msgid "preview media"
+msgstr ""
+
+#: templates/franceculture/partial/contentslist.html:21
+#: templates/ldt/ldt_utils/create_content.html:31
+#, fuzzy
+msgid "Create content"
+msgstr "Créer un compte"
+
+#: templates/franceculture/partial/projectslist.html:14
+msgid "Project published, click to unpublish"
+msgstr ""
+
+#: templates/franceculture/partial/projectslist.html:16
+msgid "Project not published, click to publish"
+msgstr ""
+
+#: templates/franceculture/partial/projectslist.html:20
msgid "open ldt"
msgstr "Ouvrir sous Lignes de Temps"
-#: templates/franceculture/workspace.html:82
-msgid "create project"
-msgstr "Créer un projet"
-
-#: templates/franceculture/workspace.html:84
-msgid "link json by externalid"
-msgstr "ouvrir le lecteur augmenté"
-
-#: templates/franceculture/workspace.html:92
-msgid "project list"
-msgstr "Liste des projets"
-
-#: templates/franceculture/workspace.html:98
+#: templates/franceculture/partial/projectslist.html:21
msgid "copy project"
msgstr "Copier projet"
-#: templates/franceculture/workspace.html:100
+#: templates/franceculture/partial/projectslist.html:22
msgid "link json by id"
msgstr "Ouvrir le lecteur augmenté"
-#: templates/ldt/user/login_form.html:32
-msgid "Profiles"
-msgstr "Profile"
+#: templates/franceculture/partial/projectslist.html:31
+#, fuzzy
+msgid "Create project"
+msgstr "Créer un projet"
-#: templates/ldt/user/login_form.html:33
-msgid "Space"
-msgstr "Esp. perso."
+#: templates/ldt/ldt_utils/create_ldt.html:23
+#, fuzzy
+msgid "Create your project"
+msgstr "Créer un projet"
-#: templates/ldt/user/login_form.html:35
-msgid "Create an account"
-msgstr "Créer un compte"
+#: templates/ldt/ldt_utils/create_ldt.html:26
+msgid "Title"
+msgstr ""
-#: templates/ldt/user/login_form.html:37
-msgid "Log out"
-msgstr "déconnexion"
+#: templates/ldt/ldt_utils/create_ldt.html:28
+msgid "List of contents"
+msgstr ""
-#: templates/ldt/user/login_form.html:40 templates/ldt/user/login_form.html:48
-#: templates/registration/login.html:14
+#: templates/ldt/ldt_utils/create_ldt.html:47
+msgid "Create"
+msgstr ""
+
+#: templates/ldt/user/login_form.html:33 templates/registration/login.html:14
msgid "Log in"
msgstr "Connexion"
-#: templates/ldt/user/login_form.html:53
+#: templates/ldt/user/login_form.html:38
msgid "create account"
msgstr "Créer un compte"
-#: templates/ldt/user/login_form.html:57
+#: templates/ldt/user/login_form.html:42
msgid "Pseudo"
msgstr "Pseudo"
-#: templates/ldt/user/login_form.html:60 templates/ldt/user/login_form.html:67
+#: templates/ldt/user/login_form.html:45 templates/ldt/user/login_form.html:52
msgid "this field is compulsory"
msgstr "Ce champs et obligatoire"
-#: templates/ldt/user/login_form.html:64
+#: templates/ldt/user/login_form.html:49
msgid "Password"
msgstr "Mot de passe"
-#: templates/ldt/user/login_form.html:71
+#: templates/ldt/user/login_form.html:56
msgid "reset password"
msgstr "Réinitialiser le mot de passe"
-#: templates/ldt/user/login_form.html:74
+#: templates/ldt/user/login_form.html:59
msgid "Connection"
msgstr "Connexion"
@@ -111,3 +173,12 @@
#: templates/registration/login.html:29
msgid "Forget password?"
msgstr "Mot de passe oublié ?"
+
+#~ msgid "link json by externalid"
+#~ msgstr "ouvrir le lecteur augmenté"
+
+#~ msgid "Space"
+#~ msgstr "Esp. perso."
+
+#~ msgid "Create an account"
+#~ msgstr "Créer un compte"
--- a/web/franceculture/templates/ldt/ldt_utils/create_content.html Sat Sep 11 01:18:28 2010 +0200
+++ b/web/franceculture/templates/ldt/ldt_utils/create_content.html Mon Sep 13 10:32:10 2010 +0200
@@ -36,6 +36,7 @@
{% for hidden in form.hidden_fields %}
{{ hidden }}
{% endfor %}
+ {{content_form.iri_id}}
</div>
<div id="contentformfields" class="span-18 last">
<div id="contentleft" class="span-9">
--- a/web/franceculture/templates/registration/login.html Sat Sep 11 01:18:28 2010 +0200
+++ b/web/franceculture/templates/registration/login.html Mon Sep 13 10:32:10 2010 +0200
@@ -19,7 +19,7 @@
<form action="" method='post' id="login-form">
{% csrf_token %}
- <input type="hidden" name="next" value="{% url ldt.user.views.profile%}" />
+ <input type="hidden" name="next" value="{{ next }}" />
<ul id="login_fields_list">
{{form.as_ul}}
<li><input class="button"type="submit" value="{% trans "login" %}" /></li>
--- a/web/ldt/locale/en/LC_MESSAGES/django.po Sat Sep 11 01:18:28 2010 +0200
+++ b/web/ldt/locale/en/LC_MESSAGES/django.po Mon Sep 13 10:32:10 2010 +0200
@@ -7,23 +7,82 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-09 08:48-0600\n"
+"POT-Creation-Date: 2010-09-12 23:04+0200\n"
"PO-Revision-Date: 2010-02-17 03:53+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"
-#: ldt/models.py:43
+#: forms/widgets.py:17
+msgid "Date"
+msgstr ""
+
+#: forms/widgets.py:17
+msgid "Time"
+msgstr ""
+
+#: ldt_utils/models.py:22
+msgid "content.iri_id"
+msgstr ""
+
+#: ldt_utils/models.py:23
+msgid "content.iriurl"
+msgstr ""
+
+#: ldt_utils/models.py:24
+msgid "content.src"
+msgstr ""
+
+#: ldt_utils/models.py:25
+msgid "content.videopath"
+msgstr ""
+
+#: ldt_utils/models.py:26
+msgid "content.creation_date"
+msgstr ""
+
+#: ldt_utils/models.py:27
+msgid "content.update_date"
+msgstr ""
+
+#: ldt_utils/models.py:28
+msgid "content.title"
+msgstr ""
+
+#: ldt_utils/models.py:29
+#, fuzzy
+msgid "content.description"
+msgstr "Login"
+
+#: ldt_utils/models.py:30
+msgid "content.external_id"
+msgstr ""
+
+#: ldt_utils/models.py:31
+msgid "content.authors"
+msgstr ""
+
+#: ldt_utils/models.py:32
+#, fuzzy
+msgid "content.duration"
+msgstr "Documentation"
+
+#: ldt_utils/models.py:33
+msgid "content.content_creation_date"
+msgstr ""
+
+#: ldt_utils/models.py:106
msgid "created by"
msgstr "created by"
-#: ldt/models.py:44
+#: ldt_utils/models.py:107
msgid "changed by"
msgstr "changed by"
-#: ldt/templates/admin/ldt/app_action.html:6
+#: ldt_utils/templates/admin/ldt_utils/app_action.html:4
#: templates/admin/cms_change_list.html:7
#: templates/admin/page_app_index.html:8
#: templates/admin/page_change_form.html:17
@@ -32,57 +91,83 @@
msgid "Home"
msgstr "Home"
-#: ldt/templates/iriuser/ldt/copy_ldt.html:12
+#: ldt_utils/templates/ldt/ldt_utils/content_list.html:55
+#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:51
+#: templates/admin/page_base.html:19
+#: user/templates/ldt/user/login_form.html:33
+#: user/templates/ldt/user/space.html:6 user/templates/ldt/user/space.html:9
+msgid "Space"
+msgstr "Space"
+
+#: ldt_utils/templates/ldt/ldt_utils/content_list.html:56
+#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:52
+#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:55
+msgid "Ldt Project"
+msgstr "Ldt Project"
+
+#: ldt_utils/templates/ldt/ldt_utils/content_list.html:59
+msgid "Contents"
+msgstr ""
+
+#: ldt_utils/templates/ldt/ldt_utils/content_list.html:63
+#, fuzzy
+msgid "Create new content"
+msgstr "Create new project"
+
+#: ldt_utils/templates/ldt/ldt_utils/content_list.html:66
+msgid "Content"
+msgstr ""
+
+#: ldt_utils/templates/ldt/ldt_utils/content_list.html:69
+#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:64
+msgid "title"
+msgstr "Title"
+
+#: ldt_utils/templates/ldt/ldt_utils/content_list.html:70
+#: ldt_utils/templates/ldt/ldt_utils/content_list.html:77
+#, fuzzy
+msgid "create project"
+msgstr "Create new project"
+
+#: ldt_utils/templates/ldt/ldt_utils/copy_ldt.html:11
msgid "Copy your project"
msgstr "Copy your project"
-#: ldt/templates/iriuser/ldt/copy_ldt.html:15
-#: ldt/templates/iriuser/ldt/create_ldt.html:15
+#: ldt_utils/templates/ldt/ldt_utils/copy_ldt.html:14
+#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:14
msgid "Title"
msgstr "Title"
-#: ldt/templates/iriuser/ldt/copy_ldt.html:18
+#: ldt_utils/templates/ldt/ldt_utils/copy_ldt.html:16
msgid "Copy"
msgstr "Copy"
-#: ldt/templates/iriuser/ldt/create_ldt.html:12
+#: ldt_utils/templates/ldt/ldt_utils/create_content.html:22
+#, fuzzy
+msgid "Create content"
+msgstr "create account"
+
+#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:11
msgid "Create your project"
msgstr "Create your project"
-#: ldt/templates/iriuser/ldt/create_ldt.html:18
+#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:16
msgid "List of contents"
msgstr "List of contents"
-#: ldt/templates/iriuser/ldt/create_ldt.html:25
+#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:23
msgid "Create"
msgstr "Create"
-#: ldt/templates/iriuser/ldt/ldt_list.html:50
-#: templates/admin/page_base.html:19
-#: user/templates/iriuser/user/login_form.html:33
-#: user/templates/iriuser/user/space.html:6
-#: user/templates/iriuser/user/space.html:9
-msgid "Space"
-msgstr "Space"
-
-#: ldt/templates/iriuser/ldt/ldt_list.html:51
-#: ldt/templates/iriuser/ldt/ldt_list.html:53
-msgid "Ldt Project"
-msgstr "Ldt Project"
-
-#: ldt/templates/iriuser/ldt/ldt_list.html:57
+#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:59
msgid "Create new project"
msgstr "Create new project"
-#: ldt/templates/iriuser/ldt/ldt_list.html:59
+#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:61
msgid "Project"
msgstr "Project"
-#: ldt/templates/iriuser/ldt/ldt_list.html:62
-msgid "title"
-msgstr "Title"
-
-#: ldt/templates/iriuser/ldt/ldt_list.html:63
+#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:65
msgid " published"
msgstr " published"
@@ -277,8 +362,8 @@
msgstr "Forget password?"
#: templates/admin/page_login.html:32
-#: user/templates/iriuser/user/login_form.html:37
-#: user/templates/iriuser/user/login_form.html:45
+#: user/templates/ldt/user/login_form.html:37
+#: user/templates/ldt/user/login_form.html:45
#: user/templates/registration/login.html:14
#: user/templates/registration/password_reset_complete.html:14
msgid "Log in"
@@ -293,7 +378,7 @@
msgstr "Change password"
#: templates/cms/admin/cms/page/change_form.html:11
-#: user/templates/iriuser/user/login_form.html:34
+#: user/templates/ldt/user/login_form.html:34
msgid "Log out"
msgstr "Log out"
@@ -317,7 +402,7 @@
msgid "Permissions"
msgstr "Permissions"
-#: user/admin.py:27 user/templates/iriuser/user/login_form.html:61
+#: user/admin.py:27 user/templates/ldt/user/login_form.html:61
msgid "Password"
msgstr "Password"
@@ -341,20 +426,20 @@
msgid "Sorry, that's not a valid username or password."
msgstr "Sorry, that's not a valid username or password."
-#: user/templates/iriuser/user/change_email.html:6
-#: user/templates/iriuser/user/change_email_done.html:6
-#: user/templates/iriuser/user/login_form.html:32
+#: user/templates/ldt/user/change_email.html:6
+#: user/templates/ldt/user/change_email_done.html:6
+#: user/templates/ldt/user/login_form.html:32
#: user/templates/registration/password_change_done.html:7
#: user/templates/registration/password_change_form.html:13
msgid "Profiles"
msgstr "Profiles"
-#: user/templates/iriuser/user/change_email.html:7
-#: user/templates/iriuser/user/change_email.html:10
+#: user/templates/ldt/user/change_email.html:7
+#: user/templates/ldt/user/change_email.html:10
msgid "Modification de l'adresse émail"
msgstr "E-mail change"
-#: user/templates/iriuser/user/change_email.html:26
+#: user/templates/ldt/user/change_email.html:26
msgid ""
"Please enter your new e-mail twice so we can verify you typed it in "
"correctly."
@@ -362,79 +447,79 @@
"Please enter your new e-mail twice so we can verify you typed it in "
"correctly."
-#: user/templates/iriuser/user/change_email.html:32
+#: user/templates/ldt/user/change_email.html:32
msgid "email"
msgstr "email"
-#: user/templates/iriuser/user/change_email.html:41
+#: user/templates/ldt/user/change_email.html:41
msgid "Confirmation de l'adresse émail"
msgstr "E-mail confirmation"
-#: user/templates/iriuser/user/change_email.html:48
+#: user/templates/ldt/user/change_email.html:48
msgid "change my e-mail"
msgstr "Change my e-mail"
-#: user/templates/iriuser/user/change_email_done.html:7
-#: user/templates/iriuser/user/change_email_done.html:10
+#: user/templates/ldt/user/change_email_done.html:7
+#: user/templates/ldt/user/change_email_done.html:10
msgid "email change"
msgstr "email change"
-#: user/templates/iriuser/user/change_email_done.html:12
+#: user/templates/ldt/user/change_email_done.html:12
msgid "email changed"
msgstr "changed by"
-#: user/templates/iriuser/user/change_email_done.html:13
+#: user/templates/ldt/user/change_email_done.html:13
msgid "back to profile"
msgstr "back to profile"
-#: user/templates/iriuser/user/home.html:9
+#: user/templates/ldt/user/home.html:9
msgid "Se connecter"
msgstr "Login"
-#: user/templates/iriuser/user/home.html:10
+#: user/templates/ldt/user/home.html:10
msgid "Créer un compte"
msgstr "Create an account"
-#: user/templates/iriuser/user/home.html:11
+#: user/templates/ldt/user/home.html:11
msgid "récupérer mot de passe"
msgstr "Forget password?"
-#: user/templates/iriuser/user/login_form.html:50
+#: user/templates/ldt/user/login_form.html:50
msgid "create account"
msgstr "create account"
-#: user/templates/iriuser/user/login_form.html:54
+#: user/templates/ldt/user/login_form.html:54
msgid "Pseudo"
msgstr "Username"
-#: user/templates/iriuser/user/login_form.html:57
-#: user/templates/iriuser/user/login_form.html:64
+#: user/templates/ldt/user/login_form.html:57
+#: user/templates/ldt/user/login_form.html:64
msgid "this field is compulsory"
msgstr "this field is compulsory"
-#: user/templates/iriuser/user/login_form.html:68
+#: user/templates/ldt/user/login_form.html:68
msgid "reset password"
msgstr "reset password"
-#: user/templates/iriuser/user/login_form.html:71
+#: user/templates/ldt/user/login_form.html:71
msgid "Connection"
msgstr "Login"
-#: user/templates/iriuser/user/profile.html:6
+#: user/templates/ldt/user/profile.html:6
#: user/templates/registration/password_change_form.html:14
#: user/templates/registration/password_change_form.html:17
msgid "Password change"
msgstr "Password change"
-#: user/templates/iriuser/user/profile.html:7
+#: user/templates/ldt/user/profile.html:7
msgid "Mail change"
msgstr "Mail change"
-#: user/templates/iriuser/user/space.html:13
+#: user/templates/ldt/user/space.html:13
msgid "Page"
msgstr "Pages"
-#: user/templates/iriuser/user/space.html:16
+#: user/templates/ldt/user/space.html:16
msgid "Projets Lignes de temps"
msgstr "Lignes de temps projects"
--- a/web/ldt/locale/fr/LC_MESSAGES/django.po Sat Sep 11 01:18:28 2010 +0200
+++ b/web/ldt/locale/fr/LC_MESSAGES/django.po Mon Sep 13 10:32:10 2010 +0200
@@ -7,23 +7,82 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-09 08:48-0600\n"
+"POT-Creation-Date: 2010-09-12 23:04+0200\n"
"PO-Revision-Date: 2010-03-09 15:52+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"
-#: ldt/models.py:43
+#: forms/widgets.py:17
+msgid "Date"
+msgstr ""
+
+#: forms/widgets.py:17
+msgid "Time"
+msgstr ""
+
+#: ldt_utils/models.py:22
+msgid "content.iri_id"
+msgstr ""
+
+#: ldt_utils/models.py:23
+msgid "content.iriurl"
+msgstr ""
+
+#: ldt_utils/models.py:24
+msgid "content.src"
+msgstr ""
+
+#: ldt_utils/models.py:25
+msgid "content.videopath"
+msgstr ""
+
+#: ldt_utils/models.py:26
+msgid "content.creation_date"
+msgstr ""
+
+#: ldt_utils/models.py:27
+msgid "content.update_date"
+msgstr ""
+
+#: ldt_utils/models.py:28
+msgid "content.title"
+msgstr ""
+
+#: ldt_utils/models.py:29
+#, fuzzy
+msgid "content.description"
+msgstr "Connexion"
+
+#: ldt_utils/models.py:30
+msgid "content.external_id"
+msgstr ""
+
+#: ldt_utils/models.py:31
+msgid "content.authors"
+msgstr ""
+
+#: ldt_utils/models.py:32
+#, fuzzy
+msgid "content.duration"
+msgstr "Documentation"
+
+#: ldt_utils/models.py:33
+msgid "content.content_creation_date"
+msgstr ""
+
+#: ldt_utils/models.py:106
msgid "created by"
msgstr "créé par"
-#: ldt/models.py:44
+#: ldt_utils/models.py:107
msgid "changed by"
msgstr "modifié par"
-#: ldt/templates/admin/ldt/app_action.html:6
+#: ldt_utils/templates/admin/ldt_utils/app_action.html:4
#: templates/admin/cms_change_list.html:7
#: templates/admin/page_app_index.html:8
#: templates/admin/page_change_form.html:17
@@ -32,57 +91,83 @@
msgid "Home"
msgstr "Accueil"
-#: ldt/templates/iriuser/ldt/copy_ldt.html:12
+#: ldt_utils/templates/ldt/ldt_utils/content_list.html:55
+#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:51
+#: templates/admin/page_base.html:19
+#: user/templates/ldt/user/login_form.html:33
+#: user/templates/ldt/user/space.html:6 user/templates/ldt/user/space.html:9
+msgid "Space"
+msgstr "Esp. perso"
+
+#: ldt_utils/templates/ldt/ldt_utils/content_list.html:56
+#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:52
+#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:55
+msgid "Ldt Project"
+msgstr "Projet lignes de temps"
+
+#: ldt_utils/templates/ldt/ldt_utils/content_list.html:59
+msgid "Contents"
+msgstr ""
+
+#: ldt_utils/templates/ldt/ldt_utils/content_list.html:63
+#, fuzzy
+msgid "Create new content"
+msgstr "Créer un nouveau projet Ligne de Temps"
+
+#: ldt_utils/templates/ldt/ldt_utils/content_list.html:66
+msgid "Content"
+msgstr ""
+
+#: ldt_utils/templates/ldt/ldt_utils/content_list.html:69
+#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:64
+msgid "title"
+msgstr "Titre"
+
+#: ldt_utils/templates/ldt/ldt_utils/content_list.html:70
+#: ldt_utils/templates/ldt/ldt_utils/content_list.html:77
+#, fuzzy
+msgid "create project"
+msgstr "Créer un nouveau projet Ligne de Temps"
+
+#: ldt_utils/templates/ldt/ldt_utils/copy_ldt.html:11
msgid "Copy your project"
msgstr "Copier votre projet"
-#: ldt/templates/iriuser/ldt/copy_ldt.html:15
-#: ldt/templates/iriuser/ldt/create_ldt.html:15
+#: ldt_utils/templates/ldt/ldt_utils/copy_ldt.html:14
+#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:14
msgid "Title"
msgstr "Titre"
-#: ldt/templates/iriuser/ldt/copy_ldt.html:18
+#: ldt_utils/templates/ldt/ldt_utils/copy_ldt.html:16
msgid "Copy"
msgstr "Copier"
-#: ldt/templates/iriuser/ldt/create_ldt.html:12
+#: ldt_utils/templates/ldt/ldt_utils/create_content.html:22
+#, fuzzy
+msgid "Create content"
+msgstr "Créer un compte"
+
+#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:11
msgid "Create your project"
msgstr "Créer votre projet Lignes de Temps"
-#: ldt/templates/iriuser/ldt/create_ldt.html:18
+#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:16
msgid "List of contents"
msgstr "Liste de contenus"
-#: ldt/templates/iriuser/ldt/create_ldt.html:25
+#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:23
msgid "Create"
msgstr "Créer"
-#: ldt/templates/iriuser/ldt/ldt_list.html:50
-#: templates/admin/page_base.html:19
-#: user/templates/iriuser/user/login_form.html:33
-#: user/templates/iriuser/user/space.html:6
-#: user/templates/iriuser/user/space.html:9
-msgid "Space"
-msgstr "Esp. perso"
-
-#: ldt/templates/iriuser/ldt/ldt_list.html:51
-#: ldt/templates/iriuser/ldt/ldt_list.html:53
-msgid "Ldt Project"
-msgstr "Projet lignes de temps"
-
-#: ldt/templates/iriuser/ldt/ldt_list.html:57
+#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:59
msgid "Create new project"
msgstr "Créer un nouveau projet Ligne de Temps"
-#: ldt/templates/iriuser/ldt/ldt_list.html:59
+#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:61
msgid "Project"
msgstr "Projet"
-#: ldt/templates/iriuser/ldt/ldt_list.html:62
-msgid "title"
-msgstr "Titre"
-
-#: ldt/templates/iriuser/ldt/ldt_list.html:63
+#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:65
msgid " published"
msgstr "Publié"
@@ -154,8 +239,12 @@
#: templates/admin/cms_change_form.html:142
#, python-format
-msgid "This page must be moderated at level %(moderation_level)s, post a message for moderator."
-msgstr "Le niveau nécessaire pour modérer cette page est le niveau %(moderation_level)s, laisser un message pour le modérateur"
+msgid ""
+"This page must be moderated at level %(moderation_level)s, post a message "
+"for moderator."
+msgstr ""
+"Le niveau nécessaire pour modérer cette page est le niveau "
+"%(moderation_level)s, laisser un message pour le modérateur"
#: templates/admin/cms_change_form.html:144
msgid "Request approvemet"
@@ -202,57 +291,47 @@
msgid "Filter"
msgstr "Filtre"
-#: templates/admin/index.html:18
-#: templates/admin/page_index.html:18
+#: templates/admin/index.html:18 templates/admin/page_index.html:18
#, python-format
msgid "Models available in the %(name)s application."
msgstr "Le modèle disponible dans l'application %(name)s."
-#: templates/admin/index.html:19
-#: templates/admin/page_app_index.html:10
+#: templates/admin/index.html:19 templates/admin/page_app_index.html:10
#: templates/admin/page_index.html:19
#, python-format
msgid "%(name)s"
msgstr "%(name)s"
-#: templates/admin/index.html:29
-#: templates/admin/page_change_form.html:20
+#: templates/admin/index.html:29 templates/admin/page_change_form.html:20
#: templates/admin/page_index.html:29
msgid "Add"
msgstr "Ajouter"
-#: templates/admin/index.html:35
-#: templates/admin/page_index.html:35
+#: templates/admin/index.html:35 templates/admin/page_index.html:35
msgid "Change"
msgstr "modifié par"
-#: templates/admin/index.html:64
-#: templates/admin/page_index.html:45
+#: templates/admin/index.html:64 templates/admin/page_index.html:45
msgid "You don't have permission to edit anything."
msgstr "Vous n'aver pas l'autorisation d'éditer quoi que ce soit."
-#: templates/admin/index.html:72
-#: templates/admin/page_index.html:53
+#: templates/admin/index.html:72 templates/admin/page_index.html:53
msgid "Recent Actions"
msgstr "Actions récentes"
-#: templates/admin/index.html:73
-#: templates/admin/page_index.html:54
+#: templates/admin/index.html:73 templates/admin/page_index.html:54
msgid "My Actions"
msgstr "Mes actions"
-#: templates/admin/index.html:77
-#: templates/admin/page_index.html:58
+#: templates/admin/index.html:77 templates/admin/page_index.html:58
msgid "None available"
msgstr "Aucune disponible"
-#: templates/admin/index.html:91
-#: templates/admin/page_index.html:72
+#: templates/admin/index.html:91 templates/admin/page_index.html:72
msgid "Unknown content"
msgstr "Contenu inconnu"
-#: templates/admin/page_base.html:20
-#: templates/admin/page_index.html:11
+#: templates/admin/page_base.html:20 templates/admin/page_index.html:11
msgid "Pages"
msgstr "Pages"
@@ -283,8 +362,8 @@
msgstr "Oubliez le mot de passe?"
#: templates/admin/page_login.html:32
-#: user/templates/iriuser/user/login_form.html:37
-#: user/templates/iriuser/user/login_form.html:45
+#: user/templates/ldt/user/login_form.html:37
+#: user/templates/ldt/user/login_form.html:45
#: user/templates/registration/login.html:14
#: user/templates/registration/password_reset_complete.html:14
msgid "Log in"
@@ -299,7 +378,7 @@
msgstr "Modifier le mot de passe"
#: templates/cms/admin/cms/page/change_form.html:11
-#: user/templates/iriuser/user/login_form.html:34
+#: user/templates/ldt/user/login_form.html:34
msgid "Log out"
msgstr "Déconnexion"
@@ -323,8 +402,7 @@
msgid "Permissions"
msgstr "Permissions"
-#: user/admin.py:27
-#: user/templates/iriuser/user/login_form.html:61
+#: user/admin.py:27 user/templates/ldt/user/login_form.html:61
msgid "Password"
msgstr "Mot de passe"
@@ -336,8 +414,7 @@
msgid "New password confirmation"
msgstr "Confirmation du nouveau mot de passe"
-#: user/forms.py:78
-#: user/forms.py:79
+#: user/forms.py:78 user/forms.py:79
msgid "E-mail"
msgstr "E-mail"
@@ -345,101 +422,104 @@
msgid "The two emails didn't match."
msgstr "les deux emails ne correspondent pas"
-#: user/views.py:45
-#: user/templates/registration/login.html:17
+#: user/views.py:45 user/templates/registration/login.html:17
msgid "Sorry, that's not a valid username or password."
msgstr "Saisissez un nom d'utilisateur et un mot de passe valide."
-#: user/templates/iriuser/user/change_email.html:6
-#: user/templates/iriuser/user/change_email_done.html:6
-#: user/templates/iriuser/user/login_form.html:32
+#: user/templates/ldt/user/change_email.html:6
+#: user/templates/ldt/user/change_email_done.html:6
+#: user/templates/ldt/user/login_form.html:32
#: user/templates/registration/password_change_done.html:7
#: user/templates/registration/password_change_form.html:13
msgid "Profiles"
msgstr "Mon profil"
-#: user/templates/iriuser/user/change_email.html:7
-#: user/templates/iriuser/user/change_email.html:10
+#: user/templates/ldt/user/change_email.html:7
+#: user/templates/ldt/user/change_email.html:10
msgid "Modification de l'adresse émail"
msgstr "Modification de l'adresse email"
-#: user/templates/iriuser/user/change_email.html:26
-msgid "Please enter your new e-mail twice so we can verify you typed it in correctly."
-msgstr "Saisissez deux fois votre nouvelle adresse émail afin de vérifier qu'il est correctment"
+#: user/templates/ldt/user/change_email.html:26
+msgid ""
+"Please enter your new e-mail twice so we can verify you typed it in "
+"correctly."
+msgstr ""
+"Saisissez deux fois votre nouvelle adresse émail afin de vérifier qu'il est "
+"correctment"
-#: user/templates/iriuser/user/change_email.html:32
+#: user/templates/ldt/user/change_email.html:32
msgid "email"
msgstr "adresse émail"
-#: user/templates/iriuser/user/change_email.html:41
+#: user/templates/ldt/user/change_email.html:41
msgid "Confirmation de l'adresse émail"
msgstr "Confirmation de l'adresse email"
-#: user/templates/iriuser/user/change_email.html:48
+#: user/templates/ldt/user/change_email.html:48
msgid "change my e-mail"
msgstr "Changer l'adresse émail"
-#: user/templates/iriuser/user/change_email_done.html:7
-#: user/templates/iriuser/user/change_email_done.html:10
+#: user/templates/ldt/user/change_email_done.html:7
+#: user/templates/ldt/user/change_email_done.html:10
msgid "email change"
msgstr "Modification de l'adresse émail"
-#: user/templates/iriuser/user/change_email_done.html:12
+#: user/templates/ldt/user/change_email_done.html:12
msgid "email changed"
msgstr "email modifié"
-#: user/templates/iriuser/user/change_email_done.html:13
+#: user/templates/ldt/user/change_email_done.html:13
msgid "back to profile"
msgstr "Retourner à mon profil"
-#: user/templates/iriuser/user/home.html:9
+#: user/templates/ldt/user/home.html:9
msgid "Se connecter"
msgstr "Se connecter"
-#: user/templates/iriuser/user/home.html:10
+#: user/templates/ldt/user/home.html:10
msgid "Créer un compte"
msgstr "Créere un compte"
-#: user/templates/iriuser/user/home.html:11
+#: user/templates/ldt/user/home.html:11
msgid "récupérer mot de passe"
msgstr "Récupérer le mot de passe"
-#: user/templates/iriuser/user/login_form.html:50
+#: user/templates/ldt/user/login_form.html:50
msgid "create account"
msgstr "Créer un compte"
-#: user/templates/iriuser/user/login_form.html:54
+#: user/templates/ldt/user/login_form.html:54
msgid "Pseudo"
msgstr "Pseudo"
-#: user/templates/iriuser/user/login_form.html:57
-#: user/templates/iriuser/user/login_form.html:64
+#: user/templates/ldt/user/login_form.html:57
+#: user/templates/ldt/user/login_form.html:64
msgid "this field is compulsory"
msgstr "Ce champs est obligatoire"
-#: user/templates/iriuser/user/login_form.html:68
+#: user/templates/ldt/user/login_form.html:68
msgid "reset password"
msgstr "Réinitialiser le mot de passe"
-#: user/templates/iriuser/user/login_form.html:71
+#: user/templates/ldt/user/login_form.html:71
msgid "Connection"
msgstr "Connexion"
-#: user/templates/iriuser/user/profile.html:6
+#: user/templates/ldt/user/profile.html:6
#: user/templates/registration/password_change_form.html:14
#: user/templates/registration/password_change_form.html:17
msgid "Password change"
msgstr "Modification du mot de passe"
-#: user/templates/iriuser/user/profile.html:7
+#: user/templates/ldt/user/profile.html:7
msgid "Mail change"
msgstr "Modification de l'adresse émail"
-#: user/templates/iriuser/user/space.html:13
+#: user/templates/ldt/user/space.html:13
msgid "Page"
msgstr "Pages"
-#: user/templates/iriuser/user/space.html:16
+#: user/templates/ldt/user/space.html:16
msgid "Projets Lignes de temps"
msgstr "Projets Lignes de temps"
@@ -495,8 +575,12 @@
msgstr "Retourner à la page de mon profil"
#: user/templates/registration/password_change_form.html:20
-msgid "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly."
-msgstr "Par sécurité, veuillez enter votre ancien mot de passe puis le nouveau a deux reprise afin de savoir si vous l'avez taper correctement "
+msgid ""
+"Please enter your old password, for security's sake, and then enter your new "
+"password twice so we can verify you typed it in correctly."
+msgstr ""
+"Par sécurité, veuillez enter votre ancien mot de passe puis le nouveau a "
+"deux reprise afin de savoir si vous l'avez taper correctement "
#: user/templates/registration/password_change_form.html:26
msgid "Old password:"
@@ -536,28 +620,42 @@
msgstr "Votre mot de passe a été fixé. vous pouvez vous connecter maintenant."
#: user/templates/registration/password_reset_confirm.html:15
-msgid "Please enter your new password twice so we can verify you typed it in correctly."
-msgstr "veuillez enter votre nouveau mot de pass deux fois afin de le vérifier."
+msgid ""
+"Please enter your new password twice so we can verify you typed it in "
+"correctly."
+msgstr ""
+"veuillez enter votre nouveau mot de pass deux fois afin de le vérifier."
#: user/templates/registration/password_reset_confirm.html:27
msgid "Password reset unsuccessful"
msgstr "Reinitialisation du mot de pass a échoué"
#: user/templates/registration/password_reset_confirm.html:29
-msgid "The password reset link was invalid, possibly because it has already been used. Please request a new password reset."
-msgstr "Le lien de réinitialisation du mot de passe n'est pas valide, certainement car il a déjà été utilisé. veuiller demander une nouvelle réinitialisation."
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used. Please request a new password reset."
+msgstr ""
+"Le lien de réinitialisation du mot de passe n'est pas valide, certainement "
+"car il a déjà été utilisé. veuiller demander une nouvelle réinitialisation."
#: user/templates/registration/password_reset_done.html:8
msgid "Password reset successful"
msgstr "Réinitialisation du mot de passe réussie"
#: user/templates/registration/password_reset_done.html:12
-msgid "We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly."
-msgstr "Nous vous avons envoyer les instructions de reinitialisation de votre mot de passe à l'adresse email que vous nous avez fournie. vous devriez les recevoir bientôt."
+msgid ""
+"We've e-mailed you instructions for setting your password to the e-mail "
+"address you submitted. You should be receiving it shortly."
+msgstr ""
+"Nous vous avons envoyer les instructions de reinitialisation de votre mot de "
+"passe à l'adresse email que vous nous avez fournie. vous devriez les "
+"recevoir bientôt."
#: user/templates/registration/password_reset_email.html:2
msgid "You're receiving this e-mail because you requested a password reset"
-msgstr "Vous recevez ce mail car vous avez damender la réinitialisation du mot de passe"
+msgstr ""
+"Vous recevez ce mail car vous avez damender la réinitialisation du mot de "
+"passe"
#: user/templates/registration/password_reset_email.html:3
#, python-format
@@ -566,7 +664,8 @@
#: user/templates/registration/password_reset_email.html:5
msgid "Please go to the following page and choose a new password:"
-msgstr "veuillez aller à la page suivante et choisissez un nouveau mot de passe :"
+msgstr ""
+"veuillez aller à la page suivante et choisissez un nouveau mot de passe :"
#: user/templates/registration/password_reset_email.html:9
msgid "Your username, in case you've forgotten:"
@@ -582,8 +681,12 @@
msgstr "L'équipe du site %(site_name)s"
#: user/templates/registration/password_reset_form.html:22
-msgid "Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one."
-msgstr "Mot de passe oublié ? Entrez votre adresse email ci-dessous pour recevoir les instructions pour en entrer un nouveau."
+msgid ""
+"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"instructions for setting a new one."
+msgstr ""
+"Mot de passe oublié ? Entrez votre adresse email ci-dessous pour recevoir "
+"les instructions pour en entrer un nouveau."
#: user/templates/registration/password_reset_form.html:27
msgid "Adresse émail"
@@ -599,8 +702,12 @@
msgstr "Activer le compte"
#: user/templates/registration/registration_active.html:9
-msgid "Vous avez bien activé votre compte, vous pouvez accedez à votre espace personnel."
-msgstr "Vous avez bien activé votre compte, vous pouvez accedez à votre espace personnel."
+msgid ""
+"Vous avez bien activé votre compte, vous pouvez accedez à votre espace "
+"personnel."
+msgstr ""
+"Vous avez bien activé votre compte, vous pouvez accedez à votre espace "
+"personnel."
#: user/templates/registration/registration_active.html:10
msgid "retourner à la page de connexion"
@@ -612,8 +719,12 @@
msgstr "Création d'un compte"
#: user/templates/registration/registration_complete.html:10
-msgid "We've e-mailed you instructions for activate your account to the e-mail address you submitted. You should be receiving it shortly."
-msgstr "Nous vous avons envoyé par courriel les instructions pour activer le compte à l'adresse que vous avez indiquée. Vous devriez le recevoir rapidement."
+msgid ""
+"We've e-mailed you instructions for activate your account to the e-mail "
+"address you submitted. You should be receiving it shortly."
+msgstr ""
+"Nous vous avons envoyé par courriel les instructions pour activer le compte "
+"à l'adresse que vous avez indiquée. Vous devriez le recevoir rapidement."
#~ msgid "Password (Verification)"
#~ msgstr "Mot de passe (Vérification)"
--- a/web/static/css/ldtform.css Sat Sep 11 01:18:28 2010 +0200
+++ b/web/static/css/ldtform.css Mon Sep 13 10:32:10 2010 +0200
@@ -1,5 +1,9 @@
@charset "UTF-8";
+body {
+ min-width: 0;
+}
+
#add_content, #add_contribution {
padding: 10px;
}
@@ -42,7 +46,7 @@
#submitcontent {
border-top: 1px solid black;
- padding : 10px;
+ padding-top : 10px;
text-align: right;
}
--- a/web/static/js/projectscontents.js Sat Sep 11 01:18:28 2010 +0200
+++ b/web/static/js/projectscontents.js Mon Sep 13 10:32:10 2010 +0200
@@ -18,6 +18,7 @@
$('.ldt_link',base_node).nyroModal({
type: 'iframe',
forceType: 'iframe',
+ windowResize: false,
height:662,
width:1022,
bgColor: 'rgb(239, 239, 239)',
@@ -28,6 +29,7 @@
$('.ldt_link_create',base_node).nyroModal({
type: 'iframe',
forceType: 'iframe',
+ windowResize: false,
height:680,
width:500,
bgColor: 'rgb(239, 239, 239)',
@@ -46,6 +48,18 @@
// do nothing
}
callback();
+ },
+ endShowContent: function(elts, settings){
+ var iframe = $('#nyroModalIframe', elts.content);
+ iframe.load(function(){
+ var swfobject = $(this).contents().find("#ldtInitSwf");
+ if (swfobject.length) {
+ $.nyroModalSettings({
+ height: swfobject.height() + 31,
+ width: swfobject.width() + 21
+ });
+ }
+ });
}
});
@@ -58,14 +72,14 @@
ajax: { data: ({ json_url:json_url, player_id:player_id }) }
});*/
$.nyroModalManual({
- type: 'iframe',
- forceType: 'iframe',
- titleFromIframe: false,
- height:662,
- width:650,
- bgColor: 'rgb(239, 239, 239)',
- padding: 5,
- url: '{% url franceculture.views.popup_embed %}?json_url='+escape(json_url)+'&player_id='+escape(player_id),
+ type: 'iframe',
+ forceType: 'iframe',
+ titleFromIframe: false,
+ height:662,
+ width:650,
+ bgColor: 'rgb(239, 239, 239)',
+ padding: 5,
+ url: '{% url franceculture.views.popup_embed %}?json_url='+escape(json_url)+'&player_id='+escape(player_id),
});
return false;
});