# HG changeset patch # User ymh # Date 1284160708 -7200 # Node ID 857830e09b0d26ba6830485a524bafb798afcffe # Parent db4e163c7c8e3606ef12bbf926775a19e9d5d9f7# Parent fefd3a8e0cbd694158aa6a9ba502ac6f9fe98ae2 Merge with fefd3a8e0cbd694158aa6a9ba502ac6f9fe98ae2 diff -r fefd3a8e0cbd -r 857830e09b0d sql/update_db_0_10_to_0_11.sql --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sql/update_db_0_10_to_0_11.sql Sat Sep 11 01:18:28 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; diff -r fefd3a8e0cbd -r 857830e09b0d web/franceculture/settings.py --- a/web/franceculture/settings.py Fri Sep 10 17:41:12 2010 +0200 +++ b/web/franceculture/settings.py Sat Sep 11 01:18:28 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 fefd3a8e0cbd -r 857830e09b0d web/franceculture/templates/base.html --- a/web/franceculture/templates/base.html Fri Sep 10 17:41:12 2010 +0200 +++ b/web/franceculture/templates/base.html Sat Sep 11 01:18:28 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 fefd3a8e0cbd -r 857830e09b0d 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 Sat Sep 11 01:18:28 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 fefd3a8e0cbd -r 857830e09b0d 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 Sat Sep 11 01:18:28 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 fefd3a8e0cbd -r 857830e09b0d web/franceculture/templates/franceculture/workspace.html --- a/web/franceculture/templates/franceculture/workspace.html Fri Sep 10 17:41:12 2010 +0200 +++ b/web/franceculture/templates/franceculture/workspace.html Sat Sep 11 01:18:28 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 fefd3a8e0cbd -r 857830e09b0d 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 Sat Sep 11 01:18:28 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 fefd3a8e0cbd -r 857830e09b0d 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 Sat Sep 11 01:18:28 2010 +0200 @@ -0,0 +1,58 @@ +{% 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.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 fefd3a8e0cbd -r 857830e09b0d 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 Sat Sep 11 01:18:28 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 fefd3a8e0cbd -r 857830e09b0d 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 Sat Sep 11 01:18:28 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 fefd3a8e0cbd -r 857830e09b0d web/franceculture/templates/ldt/user/login_form.html --- a/web/franceculture/templates/ldt/user/login_form.html Fri Sep 10 17:41:12 2010 +0200 +++ b/web/franceculture/templates/ldt/user/login_form.html Sat Sep 11 01:18:28 2010 +0200 @@ -25,22 +25,7 @@ {% block css_import %} {{block.super}} {% endblock %} -
-