# HG changeset patch # User ymh # Date 1284464327 -7200 # Node ID 652969ce19d679c862e0e3a066c207edb958590d # Parent 28d21b2123baa47badbfbf8189867e76f067b562# Parent 06d158b5d24b11a2c91f16148dd0d0fa5685f13b Merge with 06d158b5d24b11a2c91f16148dd0d0fa5685f13b diff -r 28d21b2123ba -r 652969ce19d6 .hgignore --- a/.hgignore Tue Sep 14 13:15:28 2010 +0200 +++ b/.hgignore Tue Sep 14 13:38:47 2010 +0200 @@ -6,4 +6,7 @@ ^web/franceculture/\.htaccess$ ^web/franceculture/config\.py$ ^web/static/media/ +^sbin/virtualenv/distribute.*\.tar\.gz$ +syntax: regexp +^web/franceculture/modwsgi\.wsgi$ \ No newline at end of file diff -r 28d21b2123ba -r 652969ce19d6 .hgtags --- a/.hgtags Tue Sep 14 13:15:28 2010 +0200 +++ b/.hgtags Tue Sep 14 13:38:47 2010 +0200 @@ -10,3 +10,7 @@ 98798bbf6194b373d5582035439bc26b7c66daf9 V00.08 1296cc9b23d51f8090e2b593ca519ec7b877b8a2 V00.09 5442e8569ff0a98c066a759982a70bb31ce3fa07 V00.10 +433d84e3bca68f90e1c9cb3c15ae4cedaffc5425 V00.11 +cec4b9fc89972f9104b71d03c3db101eae171184 V00.12 +699be5c7b4acc7d514f4db3a7d7737f0de8d22aa V00.13 +55f91a1f9df88c0d2d18834e22168c8b753695eb V00.14 diff -r 28d21b2123ba -r 652969ce19d6 .pydevproject --- a/.pydevproject Tue Sep 14 13:15:28 2010 +0200 +++ b/.pydevproject Tue Sep 14 13:38:47 2010 +0200 @@ -2,6 +2,6 @@ -Default +python_franceculture python 2.6 diff -r 28d21b2123ba -r 652969ce19d6 sbin/sync/sync_ldt_platform --- a/sbin/sync/sync_ldt_platform Tue Sep 14 13:15:28 2010 +0200 +++ b/sbin/sync/sync_ldt_platform Tue Sep 14 13:38:47 2010 +0200 @@ -9,12 +9,13 @@ #text2unix ~/tmp/franceculture_V$1 if [ -d ~/tmp/franceculture_V$1 ]; then - cat <\n" "Language-Team: LANGUAGE \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" diff -r 28d21b2123ba -r 652969ce19d6 web/franceculture/settings.py --- a/web/franceculture/settings.py Tue Sep 14 13:15:28 2010 +0200 +++ b/web/franceculture/settings.py Tue Sep 14 13:38:47 2010 +0200 @@ -82,6 +82,7 @@ ) TEMPLATE_CONTEXT_PROCESSORS = ( + "django.core.context_processors.request", "django.core.context_processors.auth", "django.core.context_processors.debug", "django.core.context_processors.i18n", @@ -137,5 +138,6 @@ LOGIN_URL = BASE_URL + 'franceculture/accounts/login/' LOGOUT_URL = BASE_URL + 'franceculture' +LOGIN_REDIRECT_URL = BASE_URL + 'franceculture' diff -r 28d21b2123ba -r 652969ce19d6 web/franceculture/templates/base.html --- a/web/franceculture/templates/base.html Tue Sep 14 13:15:28 2010 +0200 +++ b/web/franceculture/templates/base.html Tue Sep 14 13:38:47 2010 +0200 @@ -1,39 +1,29 @@ +{% extends "raw_base.html" %} {% load i18n %} {% load logintag %} - - - - - - {% block title %}France Culture{% endblock %} - {% block js_import %} - - - - {% endblock %} - {% block css_import %} - - - - - - - - {% endblock %} +{% load navigation %} + +{% block js_import %} + {{ block.super }} + + + +{% endblock %} + +{% block css_import %} + {{ block.super }} + + + +{% endblock %} - {% block js_declaration %} - {% endblock %} - - - +{% block body %} + {{ block.super }}
- - +{% endblock %} diff -r 28d21b2123ba -r 652969ce19d6 web/franceculture/templates/franceculture/partial/contentslist.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/franceculture/templates/franceculture/partial/contentslist.html Tue Sep 14 13:38:47 2010 +0200 @@ -0,0 +1,23 @@ +{% load i18n %} +
+{% trans "name" %} +
+
+
+ + + {% for content in contents %} + + + + + + {% endfor %} + +
{% trans 'create project' %}
{% trans 'preview media'%}
{{ content.title }}
+
+
+ + diff -r 28d21b2123ba -r 652969ce19d6 web/franceculture/templates/franceculture/partial/projectslist.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/franceculture/templates/franceculture/partial/projectslist.html Tue Sep 14 13:38:47 2010 +0200 @@ -0,0 +1,32 @@ +{% load i18n %} +
+{% trans "name" %} +
+
+
+ + +{% for project in projects %} + + {% url ldt.ldt_utils.views.project_json_id project.ldt_id as json_url_id %} + + + + + + +{% endfor %} + +
+ {% ifequal project.state 2 %} + {% trans 'Project published, click to unpublish' %} + {% else %} + {% trans 'Project not published, click to publish' %} + {% endifequal %} +
+
{% trans 'open ldt' %}
{% trans 'copy project' %}
{% trans 'link json by id' %}
{{ project.title }}
+
+
+ diff -r 28d21b2123ba -r 652969ce19d6 web/franceculture/templates/franceculture/workspace.html --- a/web/franceculture/templates/franceculture/workspace.html Tue Sep 14 13:15:28 2010 +0200 +++ b/web/franceculture/templates/franceculture/workspace.html Tue Sep 14 13:38:47 2010 +0200 @@ -1,65 +1,37 @@ {% extends "base.html" %} {% load i18n %} +{% block js_import %} +{{block.super}} + +{% endblock %} + + {% block js_declaration %} {{block.super}} @@ -71,36 +43,28 @@ {% endblock %} {% block content %} - -
-

{% trans "content list" %}

- -{% for content in contents %} - - - - - {% url ldt.ldt_utils.views.project_json_externalid content.external_id as json_url_externalid %} - - -{% endfor %} -
{{ content.title }}{% trans "open ldt" %}{% trans "create project" %}{% trans "link json by externalid" %} -
+
+
+
+
{% trans "content list" %}
+
+
loader
+
+
+
+ {% include "franceculture/partial/contentslist.html" %} +
+
+
+
+
{% trans "project list" %}
+
+
loader
+
+
+
+ {% include "franceculture/partial/projectslist.html" %} +
+
- -
-

{% trans "project list" %}

- -{% for project in projects %} - - - - - {% url ldt.ldt_utils.views.project_json_id project.ldt_id as json_url_id %} - -{% endfor %} -
{{ project.title }}{% trans "open ldt" %}{% trans "copy project" %}{% trans "link json by id" %} -
-
- {% endblock %} diff -r 28d21b2123ba -r 652969ce19d6 web/franceculture/templates/ldt/ldt_utils/content_list.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/franceculture/templates/ldt/ldt_utils/content_list.html Tue Sep 14 13:38:47 2010 +0200 @@ -0,0 +1,62 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block js_import %} +{{block.super}} + +{% endblock %} + +{% block js_declaration %} +{{block.super}} + + +{% endblock %} + +{% block css_import %} +{{block.super}} + +{% endblock %} + +{% block content %} +
+
+
+
{% trans "content list" %}
+
+
loader
+
+
+
+ {% include "franceculture/partial/contentslist.html" %} +
+
+
+
+
+{% endblock %} diff -r 28d21b2123ba -r 652969ce19d6 web/franceculture/templates/ldt/ldt_utils/create_content.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/franceculture/templates/ldt/ldt_utils/create_content.html Tue Sep 14 13:38:47 2010 +0200 @@ -0,0 +1,59 @@ +{% extends "raw_base.html" %} + +{% load i18n %} {# form of creation of content #} +{% load adminmedia %} + +{% block js_import %} + {{ block.super }} + + + + {{ content_form.media.js }} +{% endblock %} + +{% block css_import %} + {{ block.super }} + {{ content_form.media.css }} + + +{% endblock %} + + +{% block js_declaration %} + +{% endblock %} + +{% block body %} +
+
{% trans "Create content" %}
+
+
+ {% csrf_token %} + + {% for hidden in form.hidden_fields %} + {{ hidden }} + {% endfor %} + {{content_form.iri_id}} +
+
+
+
{{ content_form.src.errors }}{{ content_form.src.label_tag }}{{content_form.src}}
+
{{ content_form.videopath.errors }}{{ content_form.videopath.label_tag }}{{content_form.videopath}}
+
{{ content_form.title.errors }}{{ content_form.title.label_tag }}{{content_form.title}}
+
{{ content_form.description.errors }}{{ content_form.description.label_tag }}{{content_form.description}}
+
+
+
{{ content_form.external_id.errors }}{{ content_form.external_id.label_tag }}{{content_form.external_id}}
+
{{ content_form.duration.errors }}{{ content_form.duration.label_tag }}{{content_form.duration}}
+
{{ content_form.content_creation_date.errors }}{{ content_form.content_creation_date.label_tag }}{{content_form.content_creation_date}}
+
+
+
+ +
+
+
+{% endblock %} diff -r 28d21b2123ba -r 652969ce19d6 web/franceculture/templates/ldt/ldt_utils/create_ldt.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/franceculture/templates/ldt/ldt_utils/create_ldt.html Tue Sep 14 13:38:47 2010 +0200 @@ -0,0 +1,53 @@ +{% extends "raw_base.html" %} + +{% load i18n %} {# form of creation of content #} +{% load adminmedia %} + +{% block js_import %} + {{ block.super }} + + {{ content_form.media.js }} +{% endblock %} + +{% block css_import %} + {{ block.super }} + {{ content_form.media.css }} + + + +{% endblock %} + + +{% block body %} +
+
{% trans "Create your project" %}
+
+ {% csrf_token %} + + + +
+
{% trans "name" %}
+
+
+ + + {% for content in contents %} + + + + + {% endfor %} + +
{{ content.title }}
+
+
+
+
+ +
+
+
+ +{% endblock %} + diff -r 28d21b2123ba -r 652969ce19d6 web/franceculture/templates/ldt/ldt_utils/ldt_list.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/franceculture/templates/ldt/ldt_utils/ldt_list.html Tue Sep 14 13:38:47 2010 +0200 @@ -0,0 +1,89 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block js_import %} +{{block.super}} + +{% endblock %} + + +{% block js_declaration %} +{{block.super}} + + +{% endblock %} + +{% block css_import %} +{{block.super}} + +{% endblock %} + +{% block content %} +
+
+
+
{% trans "project list" %}
+
+
+
+
+
+ {% include "franceculture/partial/projectslist.html" %} +
+
+
+
+
+{% endblock %} diff -r 28d21b2123ba -r 652969ce19d6 web/franceculture/templates/ldt/user/login_form.html --- a/web/franceculture/templates/ldt/user/login_form.html Tue Sep 14 13:15:28 2010 +0200 +++ b/web/franceculture/templates/ldt/user/login_form.html Tue Sep 14 13:38:47 2010 +0200 @@ -25,22 +25,7 @@ {% block css_import %} {{block.super}} {% endblock %} -
-