--- a/src/ldt/ldt/ldt_utils/templates/admin/ldt_utils/app_action.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/admin/ldt_utils/app_action.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,6 +1,6 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
{% block breadcrumbs %}
-<div class="breadcrumbs"><a href="{% url admin:index %}"> {% trans "Home" %}</a> › <a href="{% url admin:app_list 'ldt_utils' %}">ldt_utils</a> › {{ current_action }}</div>
+<div class="breadcrumbs"><a href="{% url 'admin:index' %}"> {% trans "Home" %}</a> › <a href="{% url 'admin:app_list' 'ldt_utils' %}">ldt_utils</a> › {{ current_action }}</div>
{% endblock %}
--- a/src/ldt/ldt/ldt_utils/templates/admin/ldt_utils/app_index.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/admin/ldt_utils/app_index.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,9 +1,9 @@
{% extends "admin/app_index.html" %}
{% load absurl %}
-{% load absstatic %}
+{% load static %}
{% block extrastyle %}
{{ block.super }}
- <link rel="stylesheet" type="text/css" href='{% absstatic "ldt/css/dashboard.css" %}' />
+ <link rel="stylesheet" type="text/css" href='{% static "ldt/css/dashboard.css" %}' />
{% endblock %}
{% load i18n %}
{% block content %}
@@ -13,18 +13,18 @@
<table summary="Import">
<caption>Import</caption>
<tr>
- <th><a href="{% absurl admin:ldt_content_import_file %}">Import
+ <th><a href="{% absurl 'admin:ldt_content_import_file' %}">Import
an ldt</a>
</th>
<td> </td>
</tr>
<tr>
- <th><a href="{% absurl admin:ldt_content_reindex %}">Reindex</a>
+ <th><a href="{% absurl 'admin:ldt_content_reindex' %}">Reindex</a>
</th>
<td> </td>
</tr>
<tr>
- <th><a href="{% absurl admin:ldt_project_compute_stats %}">Compute stats</a>
+ <th><a href="{% absurl 'admin:ldt_project_compute_stats' %}">Compute stats</a>
</th>
<td> </td>
</tr>
@@ -34,7 +34,7 @@
<table summary="Data">
<caption>Data</caption>
<tr>
- <th><a href="{% absurl admin:ldt_admin_dump_data %}">Dump data</a>
+ <th><a href="{% absurl 'admin:ldt_admin_dump_data' %}">Dump data</a>
</th>
<td> </td>
</tr>
--- a/src/ldt/ldt/ldt_utils/templates/admin/ldt_utils/content/dumpdata.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/admin/ldt_utils/content/dumpdata.html Thu Feb 28 00:38:51 2013 +0100
@@ -9,8 +9,8 @@
</div>
{% endif %}
<div>
-<p>Click <a href="{% absurl admin:ldt_admin_dump_data %}?dump=1">HERE</a> if you want to download the dumpdata's json. It can be long to load. The dumpdata is full and raw, without natural keys.</p>
+<p>Click <a href="{% absurl 'admin:ldt_admin_dump_data' %}?dump=1">HERE</a> if you want to download the dumpdata's json. It can be long to load. The dumpdata is full and raw, without natural keys.</p>
</div>
-<a href="{% absurl admin:app_list 'ldt_utils' %}">Back to administration page</a>
+<a href="{% absurl 'admin:app_list' 'ldt_utils' %}">Back to administration page</a>
{% endblock %}
--- a/src/ldt/ldt/ldt_utils/templates/admin/ldt_utils/content/reindex_form.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/admin/ldt_utils/content/reindex_form.html Thu Feb 28 00:38:51 2013 +0100
@@ -12,13 +12,13 @@
{% endif %}
<div>
<form method="post"
- action="{% absurl admin:ldt_content_reindex %}">{% csrf_token %}
+ action="{% absurl 'admin:ldt_content_reindex' %}">{% csrf_token %}
<table>
{{ form.as_table }}
</table>
<input type="submit" /></form>
</div>
-<a href="{% absurl admin:app_list 'ldt_utils' %}">Back to administration page</a>
+<a href="{% absurl 'admin:app_list' 'ldt_utils' %}">Back to administration page</a>
{% endblock %}
--- a/src/ldt/ldt/ldt_utils/templates/admin/ldt_utils/content/stats_form.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/admin/ldt_utils/content/stats_form.html Thu Feb 28 00:38:51 2013 +0100
@@ -12,13 +12,13 @@
{% endif %}
<div>
<form method="post"
- action="{% absurl admin:ldt_project_compute_stats %}">{% csrf_token %}
+ action="{% absurl 'admin:ldt_project_compute_stats' %}">{% csrf_token %}
<table>
{{ form.as_table }}
</table>
<input type="submit" /></form>
</div>
-<a href="{% absurl admin:app_list 'ldt_utils' %}">Back to administration page</a>
+<a href="{% absurl 'admin:app_list' 'ldt_utils' %}">Back to administration page</a>
{% endblock %}
--- a/src/ldt/ldt/ldt_utils/templates/admin/ldt_utils/content/upload_form.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/admin/ldt_utils/content/upload_form.html Thu Feb 28 00:38:51 2013 +0100
@@ -22,6 +22,6 @@
<input type="submit" /></form>
{% endif %}
-<a href="{% url admin:app_list 'ldt_utils' %}">Back to administration page</a>
+<a href="{% url 'admin:app_list' 'ldt_utils' %}">Back to administration page</a>
{% endblock %}
--- a/src/ldt/ldt/ldt_utils/templates/front/front_all_contents.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/front/front_all_contents.html Thu Feb 28 00:38:51 2013 +0100
@@ -2,7 +2,7 @@
{% load i18n %}
{% load thumbnail %}
{% load front_tags %}
-{% load absstatic %}
+{% load static %}
{% block title %}
{% if tag_label %}
@@ -14,13 +14,13 @@
{% block js_import %}
{{block.super}}
-<script src='{% absstatic "ldt/js/raphael.js" %}' type="text/javascript"></script>
-<script src='{% absstatic "ldt/js/Ldt_front_sparkline.js" %}' type="text/javascript"></script>
+<script src='{% static "ldt/js/raphael.js" %}' type="text/javascript"></script>
+<script src='{% static "ldt/js/Ldt_front_sparkline.js" %}' type="text/javascript"></script>
{% endblock %}
{% block css_import %}
{{block.super}}
-<link rel="stylesheet" href='{% absstatic "ldt/css/front_home.css" %}' type="text/css"/>
+<link rel="stylesheet" href='{% static "ldt/css/front_home.css" %}' type="text/css"/>
{% endblock %}
{% block js_declaration %}
@@ -42,17 +42,17 @@
{% block body %}
{{block.super}}
<!-- Last annotated contents -->
-{% if front_tags|length > 0 %}<p class="tag_link">{% trans 'Filter the medias by category' %} : {% for t in front_tags %}<a href="{% url ldt.ldt_utils.views.front.all_contents %}?tag={{t}}">{{t}}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</p>{% endif %}
+{% if front_tags|length > 0 %}<p class="tag_link">{% trans 'Filter the medias by category' %} : {% for t in front_tags %}<a href="{% url 'ldt.ldt_utils.views.front.all_contents' %}?tag={{t}}">{{t}}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</p>{% endif %}
<ul class="floatlist full_width" id="derniers_medias">
<li class="li_h2">
<ul class="title_ul">
<li><h2>
- {% if tag_label %}<a href="{% url ldt.ldt_utils.views.front.all_contents %}">{% trans 'All medias' %}</a>{% if tag_label %}<span class="pink"> > {{tag_label}}</span>{% endif %}
- {% elif media_title %}<a href="{% url ldt.ldt_utils.views.front.all_contents %}">{% trans 'All medias' %}</a>{% if media_title %}<span class="pink"> > "{{media_title}}"</span>{% endif %}
+ {% if tag_label %}<a href="{% url 'ldt.ldt_utils.views.front.all_contents' %}">{% trans 'All medias' %}</a>{% if tag_label %}<span class="pink"> > {{tag_label}}</span>{% endif %}
+ {% elif media_title %}<a href="{% url 'ldt.ldt_utils.views.front.all_contents' %}">{% trans 'All medias' %}</a>{% if media_title %}<span class="pink"> > "{{media_title}}"</span>{% endif %}
{% else %}{% trans 'All medias' %}{% endif %}</h2>
</li>
<li class="li_right">
- <span class="tag_link"><a href="#" id="tag_cloud_link" title="{% trans 'Filter the medias' %}"><img id="hide_tag_cloud" src='{% absstatic "ldt/img/little_minus_pink.png" %}' alt="{% trans 'Filter the medias' %}" /><img id="show_tag_cloud" src='{% absstatic "ldt/img/little_plus_pink.png" %}' alt="{% trans 'Filter the medias' %}" /> {% trans 'Filter the medias' %}</a></span>
+ <span class="tag_link"><a href="#" id="tag_cloud_link" title="{% trans 'Filter the medias' %}"><img id="hide_tag_cloud" src='{% static "ldt/img/little_minus_pink.png" %}' alt="{% trans 'Filter the medias' %}" /><img id="show_tag_cloud" src='{% static "ldt/img/little_plus_pink.png" %}' alt="{% trans 'Filter the medias' %}" /> {% trans 'Filter the medias' %}</a></span>
</li>
</ul>
</li>
@@ -61,7 +61,7 @@
{% trans 'Search in the medias title' %} :
<input id="input_media_title" type="text" name="title"> <input id="search_media_title" type="submit" value=""/>
</form>
- {% if tag_cloud|length > 0 %}<p class="left tag_link">{% trans 'All categories of medias' %} : {% for t in tag_cloud %}<a href="{% url ldt.ldt_utils.views.front.all_contents %}?tag={{t.name}}">
+ {% if tag_cloud|length > 0 %}<p class="left tag_link">{% trans 'All categories of medias' %} : {% for t in tag_cloud %}<a href="{% url 'ldt.ldt_utils.views.front.all_contents' %}?tag={{t.name}}">
<span style="font-size:{{t.font_size|add:"12"}}px;">{{t.name}}</span></a>{% if not forloop.last %}, {% endif %}{% endfor %}</p>
{% endif %}
</li>
@@ -69,7 +69,7 @@
<li id="result_pagination" class="li_h2">
<p>
{% if results.has_previous %}
- <a class="blue under" href="{% url ldt.ldt_utils.views.front.all_contents %}?page={{ results.previous_page_number }}{% if tag_label %}&tag={{tag_label}}{% endif %}{% if media_title %}&title={{media_title}}{% endif %}" title="{% trans 'previous' %}">{% trans "previous" %}</a>
+ <a class="blue under" href="{% url 'ldt.ldt_utils.views.front.all_contents' %}?page={{ results.previous_page_number }}{% if tag_label %}&tag={{tag_label}}{% endif %}{% if media_title %}&title={{media_title}}{% endif %}" title="{% trans 'previous' %}">{% trans "previous" %}</a>
{% endif %}
{% if results.paginator.num_pages > 1 %}
<span class="current">
@@ -78,7 +78,7 @@
{% if i|add:'1' == results.number %}
<span class="pink">{{i|add:'1'}}</span>
{% else %}
- <a class="blue under" href="{% url ldt.ldt_utils.views.front.all_contents %}?page={{i|add:'1'}}{% if tag_label %}&tag={{tag_label}}{% endif %}{% if media_title %}&title={{media_title}}{% endif %}">{{i|add:'1'}}</a>
+ <a class="blue under" href="{% url 'ldt.ldt_utils.views.front.all_contents' %}?page={{i|add:'1'}}{% if tag_label %}&tag={{tag_label}}{% endif %}{% if media_title %}&title={{media_title}}{% endif %}">{{i|add:'1'}}</a>
{% endif %}
{% if i|add:'1' < results.paginator.num_pages and 1 < results.paginator.num_pages %}
{% endif %}
@@ -87,10 +87,10 @@
</span>
{% endif %}
{% if results.has_next %}
- <a class="blue under" href="{% url ldt.ldt_utils.views.front.all_contents %}?page={{ results.next_page_number }}{% if tag_label %}&tag={{tag_label}}{% endif %}{% if media_title %}&title={{media_title}}{% endif %}" title="{% trans 'next' %}">{% trans "next" %}</a>
+ <a class="blue under" href="{% url 'ldt.ldt_utils.views.front.all_contents' %}?page={{ results.next_page_number }}{% if tag_label %}&tag={{tag_label}}{% endif %}{% if media_title %}&title={{media_title}}{% endif %}" title="{% trans 'next' %}">{% trans "next" %}</a>
{% endif %}
{% if results.paginator.num_pages > 1 %}
- . <a class="blue under" href="{% url ldt.ldt_utils.views.front.all_contents %}?page=x{% if tag_label %}&tag={{tag_label}}{% endif %}{% if media_title %}&title={{media_title}}{% endif %}"">({% trans 'All' %})</a>
+ . <a class="blue under" href="{% url 'ldt.ldt_utils.views.front.all_contents' %}?page=x{% if tag_label %}&tag={{tag_label}}{% endif %}{% if media_title %}&title={{media_title}}{% endif %}"">({% trans 'All' %})</a>
{% endif %}
</p>
</li>
@@ -98,7 +98,7 @@
{% for content in results.object_list %}
<li class="li_media">
<div class="img_and_overlay">
- <a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}">
+ <a href="{% url 'ldt.ldt_utils.views.front.annot_content' content.iri_id %}">
{% thumbnail content.image "294x165" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}" alt="{% trans 'open this media' %}" title="{% trans 'open this media' %}">{% endthumbnail %}
</a>
<div class="overlay">
@@ -112,12 +112,12 @@
</div>
</div>
<div class="bulle_annot" title="{% blocktrans count nb=content.nb_annotations %}{{nb}} annotation on this media{% plural %}{{nb}} annotations on this media{% endblocktrans %}">{{ content.nb_annotations }}</div>
- <p><a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}" title="{% trans 'open this media' %}" ><b>{% if content.title|length > 69 %}{{content.title|slice:":69"}}...{% else %}{{content.title}}{% endif %}</b></a></p>
+ <p><a href="{% url 'ldt.ldt_utils.views.front.annot_content' content.iri_id %}" title="{% trans 'open this media' %}" ><b>{% if content.title|length > 69 %}{{content.title|slice:":69"}}...{% else %}{{content.title}}{% endif %}</b></a></p>
<p>{% trans 'by' %} IRI | {{content.duration|str_duration:"h"}}</p>
</li>
{% endfor %}
</ul>
-{% if tag_cloud|length > 0 %}<p class="left tag_link">{% trans 'All categories of medias' %} : {% for t in tag_cloud %}<a href="{% url ldt.ldt_utils.views.front.all_contents %}?tag={{t.name}}">
+{% if tag_cloud|length > 0 %}<p class="left tag_link">{% trans 'All categories of medias' %} : {% for t in tag_cloud %}<a href="{% url 'ldt.ldt_utils.views.front.all_contents' %}?tag={{t.name}}">
<span style="font-size:{{t.font_size|add:"12"}}px;">{{t.name}}</span>
</a>{% if not forloop.last %}, {% endif %}{% endfor %}</p>
{% endif %}
--- a/src/ldt/ldt/ldt_utils/templates/front/front_base.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/front/front_base.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,7 +1,7 @@
{% load i18n %}
{% load logintag %}
{% load navigation %}
-{% load absstatic %}
+{% load static %}
{% load analytics %}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -10,15 +10,15 @@
{% block head %}
<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
<meta http-equiv="content-language" content="{{LANGUAGE_CODE}}" />
- <link rel="SHORTCUT ICON" href='{% absstatic "ldt/img/favicon.ico" %}' />
+ <link rel="SHORTCUT ICON" href='{% static "ldt/img/favicon.ico" %}' />
<title>{% block title %}Lignes de temps{% endblock %}</title>
{% block js_import %}
- <script src='{% absstatic "ldt/js/jquery.min.js" %}' type="text/javascript"></script>
- <script src='{% absstatic "ldt/js/jquery.textchange.min.js" %}' type="text/javascript"></script>
+ <script src='{% static "ldt/js/jquery.min.js" %}' type="text/javascript"></script>
+ <script src='{% static "ldt/js/jquery.textchange.min.js" %}' type="text/javascript"></script>
{% endblock %}
{% block css_declaration %}{% endblock %}
{% block css_import %}
- <link rel="stylesheet" href='{% absstatic "ldt/css/front_common.css" %}' type="text/css"/>
+ <link rel="stylesheet" href='{% static "ldt/css/front_common.css" %}' type="text/css"/>
{% endblock %}
{% block js_declaration %}
<script type="text/javascript">
@@ -42,10 +42,10 @@
<div id="general_container">
<ul class="floatlist" id="title_bar">
<li id="li_h1">
- <h1><a href="{% url ldt.ldt_utils.views.front.front_home %}" title="{% trans 'homepage' %}">{% trans '<b>Lignes</b> de temps' %}</a></h1>
+ <h1><a href="{% url 'ldt.ldt_utils.views.front.front_home' %}" title="{% trans 'homepage' %}">{% trans '<b>Lignes</b> de temps' %}</a></h1>
</li>
<li id="li_search">
- <form id="form_search" action="{% url ldt.ldt_utils.views.front.search_index %}" method="GET">
+ <form id="form_search" action="{% url 'ldt.ldt_utils.views.front.search_index' %}" method="GET">
<!--input id="search_text" name="q" value="" /-->
<input id="id_search" type="text" name="search">
<input type="hidden" value="all" name="field">
@@ -56,20 +56,20 @@
{% if user.is_authenticated %}
<li id="li_annotation">
<div class="fl">
- <!-- a href="#"><img src='{% absstatic "ldt/img/annot_icon.png" %}' id="annot_icon" /></a -->
- <a href="{% url root-view %}" title="{% trans "My projects" %}">{% trans "My projects" %}</a>
+ <!-- a href="#"><img src='{% static "ldt/img/annot_icon.png" %}' id="annot_icon" /></a -->
+ <a href="{% url 'root-view' %}" title="{% trans "My projects" %}">{% trans "My projects" %}</a>
</div>
<div class="fl">
- <!-- a href="{% url root-view %}">{% trans 'Annotate' %}</a -->
+ <!-- a href="{% url 'root-view' %}">{% trans 'Annotate' %}</a -->
</div>
</li>
{% endif %}
<li id="li_connexion">
{% if user.is_authenticated %}
- <a href="{% url ldt.user.views.logout_view %}" title="{% trans "Log out" %}">{% trans "Log out" %}</a>
+ <a href="{% url 'ldt.user.views.logout_view' %}" title="{% trans "Log out" %}">{% trans "Log out" %}</a>
{% else %}
- <a href="{% url auth_login %}" title="{% trans "Log in" %}">{% trans "Log in" %}</a>
+ <a href="{% url 'auth_login' %}" title="{% trans "Log in" %}">{% trans "Log in" %}</a>
{% endif %}
</li>
</ul>
--- a/src/ldt/ldt/ldt_utils/templates/front/front_group.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/front/front_group.html Thu Feb 28 00:38:51 2013 +0100
@@ -2,13 +2,13 @@
{% load i18n %}
{% load thumbnail %}
{% load front_tags %}
-{% load absstatic %}
+{% load static %}
{% block title %}Lignes de temps : groupe "{{group.name}}"{% endblock %}
{% block css_import %}
{{block.super}}
-<link rel="stylesheet" href='{% absstatic "ldt/css/front_group.css" %}' type="text/css"/>
+<link rel="stylesheet" href='{% static "ldt/css/front_group.css" %}' type="text/css"/>
{% endblock %}
{% block js_declaration %}
@@ -91,9 +91,9 @@
</li>
{% for content in content_list %}
<li class="li_media">
- <a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}">{% thumbnail content.image "134x75" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}" alt="{% trans 'open this media' %}" title="{% trans 'open this media' %}">{% endthumbnail %}</a>
+ <a href="{% url 'ldt.ldt_utils.views.front.annot_content' content.iri_id %}">{% thumbnail content.image "134x75" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}" alt="{% trans 'open this media' %}" title="{% trans 'open this media' %}">{% endthumbnail %}</a>
<div class="bulle_annot" title="{% blocktrans count nb=content.nb_annotations %}{{nb}} annotation on this media{% plural %}{{nb}} annotations on this media{% endblocktrans %}">{{content.nb_annotations}}</div>
- <p><a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}" title="{% trans 'open this media' %}"><b>{% if content.title|length > 69 %}{{content.title|slice:":69"}}...{% else %}{{content.title}}{% endif %}</b></a></p>
+ <p><a href="{% url 'ldt.ldt_utils.views.front.annot_content' content.iri_id %}" title="{% trans 'open this media' %}"><b>{% if content.title|length > 69 %}{{content.title|slice:":69"}}...{% else %}{{content.title}}{% endif %}</b></a></p>
<p class="font_11">{% trans 'by' %} IRI | {{content.duration|str_duration:"h"}}</p>
</li>
{% endfor %}
--- a/src/ldt/ldt/ldt_utils/templates/front/front_home.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/front/front_home.html Thu Feb 28 00:38:51 2013 +0100
@@ -2,19 +2,19 @@
{% load i18n %}
{% load thumbnail %}
{% load front_tags %}
-{% load absstatic %}
+{% load static %}
{% block title %}{% trans "front.home" %}{% endblock %}
{% block js_import %}
{{block.super}}
-<script src='{% absstatic "ldt/js/raphael.js" %}' type="text/javascript"/></script>
-<script src='{% absstatic "ldt/js/Ldt_front_sparkline.js" %}' type="text/javascript"/></script>
+<script src='{% static "ldt/js/raphael.js" %}' type="text/javascript"/></script>
+<script src='{% static "ldt/js/Ldt_front_sparkline.js" %}' type="text/javascript"/></script>
{% endblock %}
{% block css_import %}
{{block.super}}
-<link rel="stylesheet" href='{% absstatic "ldt/css/front_home.css" %}' type="text/css"/>
+<link rel="stylesheet" href='{% static "ldt/css/front_home.css" %}' type="text/css"/>
{% endblock %}
{% block js_declaration %}
@@ -36,29 +36,29 @@
{% block body %}
{{block.super}}
<!-- Last annotated contents -->
-{% if front_tags|length > 0 %}<p class="tag_link">{% trans 'Filter the medias by category' %} : {% for t in front_tags %}<a href="{% url ldt.ldt_utils.views.front.all_contents %}?tag={{t}}">{{t}}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</p>{% endif %}
+{% if front_tags|length > 0 %}<p class="tag_link">{% trans 'Filter the medias by category' %} : {% for t in front_tags %}<a href="{% url 'ldt.ldt_utils.views.front.all_contents' %}?tag={{t}}">{{t}}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</p>{% endif %}
<ul class="floatlist full_width" id="derniers_medias">
<li class="li_h2">
<ul class="title_ul">
<li><h2>{% trans 'Last annotated medias' %}</h2></li>
<li class="li_right">
- <a class="blue" href="{% url ldt.ldt_utils.views.front.all_contents %}" title="{% trans 'view all medias' %}">{% trans 'All medias' %}</a> <span class="tag_link"><a href="#" id="tag_cloud_link" title="{% trans 'Filter the medias' %}"><img id="hide_tag_cloud" src='{% absstatic "ldt/img/little_minus_pink.png" %}' alt="{% trans 'Filter the medias' %}" /><img id="show_tag_cloud" src='{% absstatic "ldt/img/little_plus_pink.png" %}' alt="{% trans 'Filter the medias' %}" /> {% trans 'Filter the medias' %}</a></span>
+ <a class="blue" href="{% url 'ldt.ldt_utils.views.front.all_contents' %}" title="{% trans 'view all medias' %}">{% trans 'All medias' %}</a> <span class="tag_link"><a href="#" id="tag_cloud_link" title="{% trans 'Filter the medias' %}"><img id="hide_tag_cloud" src='{% static "ldt/img/little_minus_pink.png" %}' alt="{% trans 'Filter the medias' %}" /><img id="show_tag_cloud" src='{% static "ldt/img/little_plus_pink.png" %}' alt="{% trans 'Filter the medias' %}" /> {% trans 'Filter the medias' %}</a></span>
</li>
</ul>
</li>
<li class="li_h2" id="home_tag_cloud">
- <form id="media_search" method="GET" action="{% url ldt.ldt_utils.views.front.all_contents %}">
+ <form id="media_search" method="GET" action="{% url 'ldt.ldt_utils.views.front.all_contents' %}">
{% trans 'Search in the medias title' %} :
<input id="input_media_title" type="text" name="title"/><input id="search_media_title" type="submit" value=""/>
</form>
- {% if tag_cloud|length > 0 %}<p class="left tag_link">{% trans 'All categories of medias' %} : {% for t in tag_cloud %}<a href="{% url ldt.ldt_utils.views.front.all_contents %}?tag={{t.name}}">
+ {% if tag_cloud|length > 0 %}<p class="left tag_link">{% trans 'All categories of medias' %} : {% for t in tag_cloud %}<a href="{% url 'ldt.ldt_utils.views.front.all_contents' %}?tag={{t.name}}">
<span style="font-size:{{t.font_size|add:"12"}}px;">{{t.name}}</span></a>{% if not forloop.last %}, {% endif %}{% endfor %}</p>
{% endif %}
</li>
{% for content in last_contents %}
<li class="li_media">
<div class="img_and_overlay">
- <a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}">
+ <a href="{% url 'ldt.ldt_utils.views.front.annot_content' content_iri_id=content.iri_id %}">
{% thumbnail content.image "294x165" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}" alt="{% trans 'open this media' %}" title="{% trans 'open this media' %}">{% endthumbnail %}
</a>
<div class="overlay">
@@ -70,7 +70,7 @@
</div>
</div>
<div class="bulle_annot" title="{% blocktrans count nb=content.nb_annotations %}{{nb}} annotation on this media{% plural %}{{nb}} annotations on this media{% endblocktrans %}">{{ content.nb_annotations }}</div>
- <p><a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}" title="{% trans 'open this media' %}"><b>{{content.title}}</b></a></p>
+ <p><a href="{% url 'ldt.ldt_utils.views.front.annot_content' content_iri_id=content.iri_id %}" title="{% trans 'open this media' %}"><b>{{content.title}}</b></a></p>
<p>{% trans 'by' %} IRI | {{content.duration|str_duration:"h"}}</p>
</li>
@@ -86,7 +86,7 @@
{% for content in most_contents %}
<li class="li_media">
<div class="img_and_overlay">
- <a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}">
+ <a href="{% url 'ldt.ldt_utils.views.front.annot_content' content_iri_id=content.iri_id %}">
{% thumbnail content.image "134x75" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}" alt="{% trans 'open this media' %}" title="{% trans 'open this media' %}">{% endthumbnail %}</a>
<div class="overlay">
<ul class="polemics">
@@ -96,7 +96,7 @@
</div>
</div>
<div class="bulle_annot" title="{% blocktrans count nb=content.nb_annotations %}{{nb}} annotation on this media{% plural %}{{nb}} annotations on this media{% endblocktrans %}">{{ content.nb_annotations }}</div>
- <p><a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}" title="{% trans 'open this media' %}"><b>{% if content.title|length > 69 %}{{content.title|slice:":69"}}...{% else %}{{content.title}}{% endif %}</b></a></p>
+ <p><a href="{% url 'ldt.ldt_utils.views.front.annot_content' content_iri_id=content.iri_id %}" title="{% trans 'open this media' %}"><b>{% if content.title|length > 69 %}{{content.title|slice:":69"}}...{% else %}{{content.title}}{% endif %}</b></a></p>
<p class="font_11">{% trans 'by' %} IRI | {{content.duration|str_duration:"h"}}</p>
</li>
{% endfor %}
@@ -109,11 +109,11 @@
{% for group in active_groups %}
<li class="li_media">
<div class="img_groupes_actifs">
- <a href="{% url ldt.ldt_utils.views.front.group_info group.id %}">{% thumbnail group.get_profile.image "54x40" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}" alt="{% trans 'group picture' %}" title="{% trans 'view more infos on this group'%}">{% endthumbnail %}</a>
+ <a href="{% url 'ldt.ldt_utils.views.front.group_info' group_id=group.id %}">{% thumbnail group.get_profile.image "54x40" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}" alt="{% trans 'group picture' %}" title="{% trans 'view more infos on this group'%}">{% endthumbnail %}</a>
</div>
<div class="txt_groupes_actifs">
<div class="bulle_people" title="{% blocktrans count nb=group.nb_users %}{{nb}} user in this group{% plural %}{{nb}} users in this group{% endblocktrans %}">{{ group.nb_users }}</div>
- <p><a href="{% url ldt.ldt_utils.views.front.group_info group.id %}" class="under" title="{% trans 'view more infos on this group'%}"><b>{{group.name}}</b></a></p>
+ <p><a href="{% url 'ldt.ldt_utils.views.front.group_info' group_id=group.id %}" class="under" title="{% trans 'view more infos on this group'%}"><b>{{group.name}}</b></a></p>
<p>{% if group.get_profile.description|striptags|length > 69 %}{{group.get_profile.description|striptags|slice:":69"}}...{% else %}{{group.get_profile.description|striptags}}{% endif %}</p>
</div>
</li>
--- a/src/ldt/ldt/ldt_utils/templates/front/front_player.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/front/front_player.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,15 +1,15 @@
{% extends "front/front_base.html" %}
{% load i18n %}
{% load thumbnail %}
-{% load absstatic %}
+{% load static %}
{% block title %}Lignes de temps : {% trans 'Annotate' %} "{{content.title}}"{% endblock %}
{% block css_import %}
{{block.super}}
-<link rel="stylesheet" href='{% absstatic "ldt/css/front_player.css" %}' type="text/css"/>
-<link rel="stylesheet" href='{% absstatic "ldt/css/embed_popup.css" %}' type="text/css"/>
-<link rel="stylesheet" href='{% absstatic "ldt/css/jq-css/jquery.qtip.css" %}' type="text/css"/>
+<link rel="stylesheet" href='{% static "ldt/css/front_player.css" %}' type="text/css"/>
+<link rel="stylesheet" href='{% static "ldt/css/embed_popup.css" %}' type="text/css"/>
+<link rel="stylesheet" href='{% static "ldt/css/jq-css/jquery.qtip.css" %}' type="text/css"/>
{% endblock %}
{% block js_declaration %}
--- a/src/ldt/ldt/ldt_utils/templates/front/front_search_results.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/front/front_search_results.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,19 +1,19 @@
{% extends "front/front_base.html" %}
{% load i18n %}
{% load thumbnail %}
-{% load absstatic %}
+{% load static %}
{% load front_tags %}
{% block title %}Lignes de temps : {% trans 'search' %} "{{search}}" {% endblock %}
{% block js_import %}
{{block.super}}
-<script src='{% absstatic "ldt/js/raphael.js" %}' type="text/javascript"/></script>
+<script src='{% static "ldt/js/raphael.js" %}' type="text/javascript"/></script>
{% endblock %}
{% block css_import %}
{{block.super}}
-<link rel="stylesheet" href='{% absstatic "ldt/css/front_search.css" %}' type="text/css"/>
+<link rel="stylesheet" href='{% static "ldt/css/front_search.css" %}' type="text/css"/>
{% endblock %}
{% block js_declaration %}
@@ -41,7 +41,7 @@
var global_csrf_token = "{{ csrf_token }}";
</script>
-<script src='{% absstatic "ldt/js/Ldt_front_search_results.js" %}' type="text/javascript"></script>
+<script src='{% static "ldt/js/Ldt_front_search_results.js" %}' type="text/javascript"></script>
{% endblock %}
{% block body %}
@@ -53,7 +53,7 @@
{% ifequal nb_results 0 %}
{% if tag_label %}
{% blocktrans %} No results for <b>{{ search }}</b> with the medias tagged <span class="pink">{{tag_label}}</span>{% endblocktrans %}
- <br/><a href="{% url ldt.ldt_utils.views.front.search_index %}?search={{search}}&field={{field}}">{% trans "See for all medias" %}</a>
+ <br/><a href="{% url 'ldt.ldt_utils.views.front.search_index' %}?search={{search}}&field={{field}}">{% trans "See for all medias" %}</a>
{% else %}
{% blocktrans %} No results for <b>{{ search }}</b>.{% endblocktrans %}
{% endif %}
@@ -70,7 +70,7 @@
<li id="title_resultats">
<h2>
{% if tag_label %}
- <a href="{% url ldt.ldt_utils.views.front.search_index %}?search={{search}}&field={{field}}">{% trans "Search results for " %} <b> {{ search }}</b></a><span class="pink"> > {{tag_label}}</span>
+ <a href="{% url 'ldt.ldt_utils.views.front.search_index' %}?search={{search}}&field={{field}}">{% trans "Search results for " %} <b> {{ search }}</b></a><span class="pink"> > {{tag_label}}</span>
{% else %}
{% trans "Search results for " %} <b> {{ search }}</b>
{% endif %}
@@ -108,15 +108,15 @@
<li class="li_segment" id="li_{{segment.project_id}}_{{segment.iri_id}}_{{segment.ensemble_id}}_{{segment.cutting_id}}_{{segment.element_id}}">
<div class="left_segment">
<div class="color_zone"></div>
- <a href="{% url ldt.ldt_utils.views.front.annot_content segment.iri_id segment.project_id segment.cutting_id %}#id={{segment.element_id}}"><img src='{% absstatic "ldt/img/annot_icon_80x45.png" %}' width="80" height="45" alt="" /></a>
+ <a href="{% url 'ldt.ldt_utils.views.front.annot_content' content_iri_id=segment.iri_id project_id=segment.project_id cutting_id=segment.cutting_id %}#id={{segment.element_id}}"><img src='{% static "ldt/img/annot_icon_80x45.png" %}' width="80" height="45" alt="" /></a>
<!--p class="duree_segment">{{ segment.duration|str_duration:"::" }}</p-->
</div>
- <h4 class="title_segment"><a class="blue under" href="{% url ldt.ldt_utils.views.front.annot_content segment.iri_id segment.project_id segment.cutting_id %}#id={{segment.element_id}}" title="{% trans 'view this annotation in the player' %}">
+ <h4 class="title_segment"><a class="blue under" href="{% url 'ldt.ldt_utils.views.front.annot_content' content_iri_id=segment.iri_id project_id=segment.project_id cutting_id=segment.cutting_id %}#id={{segment.element_id}}" title="{% trans 'view this annotation in the player' %}">
{% if segment.title %}{{ segment.title }}{% else %}{% trans "No title" %}{% endif %}</a></h4>
<p class="text_segment">{% if segment.context %}{{ segment.context }}{% endif %}<br/>{% trans "Begin" %} : {{ segment.start_ts|str_duration:"::" }} - {% trans "duration" %} : {{ segment.duration|str_duration:"::" }}</p>
<div class="hidden_preview">
{% thumbnail res.content.image "300x200" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}" %}">{% endthumbnail %}
- <h4><a class="pink under b" href="{% url ldt.ldt_utils.views.front.annot_content segment.iri_id segment.project_id segment.cutting_id %}#id={{segment.element_id}}" title="{% trans 'view this annotation in the player' %}">
+ <h4><a class="pink under b" href="{% url 'ldt.ldt_utils.views.front.annot_content' content_iri_id=segment.iri_id project_id=segment.project_id cutting_id=segment.cutting_id %}#id={{segment.element_id}}" title="{% trans 'view this annotation in the player' %}">
{% if segment.title %}{{ segment.title }}{% else %}{% trans "No title" %}{% endif %}</a></h4>
<p class="bigmargin">{% if segment.context %}{{ segment.context }}{% else %}{{ segment.abstract }}{% endif %}</p>
{% if segment.context_tags or segment.tags %}
@@ -135,7 +135,7 @@
<li id="result_pagination">
<p>
{% if results.has_previous %}
- <a class="blue under" href="{% url ldt.ldt_utils.views.front.search_index %}?page={{ results.previous_page_number }}&search={{search}}&field={{field}}{% if tag_label %}&content_tag={{tag_label}}{% endif %}" title="{% trans 'previous' %}">{% trans "previous" %}</a>
+ <a class="blue under" href="{% url 'ldt.ldt_utils.views.front.search_index' %}?page={{ results.previous_page_number }}&search={{search}}&field={{field}}{% if tag_label %}&content_tag={{tag_label}}{% endif %}" title="{% trans 'previous' %}">{% trans "previous" %}</a>
.
{% endif %}
{% if results.paginator.num_pages > 1 %}
@@ -145,7 +145,7 @@
{% if i|add:'1' == results.number %}
<span class="pink">{{i|add:'1'}}</span>
{% else %}
- <a class="blue under" href="{% url ldt.ldt_utils.views.front.search_index %}?page={{i|add:'1'}}&search={{search}}&field={{field}}{% if tag_label %}&content_tag={{tag_label}}{% endif %}">{{i|add:'1'}}</a>
+ <a class="blue under" href="{% url 'ldt.ldt_utils.views.front.search_index' %}?page={{i|add:'1'}}&search={{search}}&field={{field}}{% if tag_label %}&content_tag={{tag_label}}{% endif %}">{{i|add:'1'}}</a>
{% endif %}
{% if i|add:'1' < results.paginator.num_pages and 1 < results.paginator.num_pages %}
{% endif %}
@@ -155,7 +155,7 @@
{% endif %}
{% if results.has_next %}
- <a class="blue under" href="{% url ldt.ldt_utils.views.front.search_index %}?page={{ results.next_page_number }}&search={{search}}&field={{field}}{% if tag_label %}&content_tag={{tag_label}}{% endif %}" title="{% trans 'next' %}">{% trans "next" %}</a>
+ <a class="blue under" href="{% url 'ldt.ldt_utils.views.front.search_index' %}?page={{ results.next_page_number }}&search={{search}}&field={{field}}{% if tag_label %}&content_tag={{tag_label}}{% endif %}" title="{% trans 'next' %}">{% trans "next" %}</a>
{% endif %}
</p>
</li>
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/content_list.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/content_list.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,6 +1,6 @@
{% extends "ldt/user/user_base.html" %}
{% load i18n %}
-{% load absstatic %}
+{% load static %}
{% block js_declaration %}
{{block.super}}
@@ -48,12 +48,12 @@
{% block css_import %}
{{block.super}}
- <link rel="stylesheet" type="text/css" href='{% absstatic "ldt/css/ldt.css" %}' />
+ <link rel="stylesheet" type="text/css" href='{% static "ldt/css/ldt.css" %}' />
{% endblock %}
{% block breadcrumb %}
<li></li>
-<li><a href="{% url ldt.userpanel.views.space %}">{% trans "Space" %}</a></li>
+<li><a href="{% url 'ldt.userpanel.views.space' %}">{% trans "Space" %}</a></li>
<li>{% trans "Ldt Project" %}</li>
{% endblock %}
@@ -74,8 +74,8 @@
<tbody>
{% for content in contents %}
<tr>
- <td><a href="{% url ldt.ldt_utils.views.lignesdetemps.index content.iri_id %}" class="ldt_link">{{ content.title }}</a></td>
- <td><a href="{% url ldt.ldt_utils.views.project.create_project content.iri_id %}" class="ldt_link_create">{% trans "create project" %}</a></td>
+ <td><a href="{% url 'ldt.ldt_utils.views.lignesdetemps.index' content.iri_id %}" class="ldt_link">{{ content.title }}</a></td>
+ <td><a href="{% url 'ldt.ldt_utils.views.project.create_project' content.iri_id %}" class="ldt_link_create">{% trans "create project" %}</a></td>
</tr>
{% endfor %}
</tbody>
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/copy_ldt.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/copy_ldt.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,11 +1,11 @@
{% extends "ldt/ldt_raw_base.html" %}
-{% load absstatic %}
+{% load static %}
{% load i18n %} {# form of copy of project ldt #}
{% block css_import %}
{{ block.super }}
- <link rel="stylesheet" href='{% absstatic "ldt/css/ldt.css" %}' />
- <link rel="stylesheet" href='{% absstatic "ldt/css/ldtform.css" %}' />
- <link rel="stylesheet" href='{% absstatic "ldt/css/workspace.css" %}' />
+ <link rel="stylesheet" href='{% static "ldt/css/ldt.css" %}' />
+ <link rel="stylesheet" href='{% static "ldt/css/ldtform.css" %}' />
+ <link rel="stylesheet" href='{% static "ldt/css/workspace.css" %}' />
{% endblock %}
{% block body %}
<div id="add_contribution" class="span-12 last">
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_group.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_group.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,6 +1,6 @@
{% extends "ldt/ldt_utils/workspace_base.html" %}
{% load i18n %}
-{% load absstatic %}
+{% load static %}
{% load absurl %}
{% load adminmedia %}
@@ -8,18 +8,18 @@
{% block js_import %}
{{ block.super }}
- <script type="text/javascript" src="{% absurl ldt.jsi18n packages='ldt' %}" ></script>
- <script type="text/javascript" src='{% absstatic "ldt/js/projectscontents.js" %}' ></script>
- <script type="text/javascript" src='{% absstatic "ldt/js/tiny_mce/tiny_mce.js" %}'></script>
+ <script type="text/javascript" src="{% absurl 'ldt.jsi18n' packages='ldt' %}" ></script>
+ <script type="text/javascript" src='{% static "ldt/js/projectscontents.js" %}' ></script>
+ <script type="text/javascript" src='{% static "ldt/js/tiny_mce/tiny_mce.js" %}'></script>
{{ content_form.media.js }}
{% endblock %}
{% block css_import %}
{{ block.super }}
{{ content_form.media.css }}
- <link rel="stylesheet" href='{% absstatic "ldt/css/ldt.css" %}' />
- <link rel="stylesheet" href='{% absstatic "ldt/css/ldtform.css" %}' />
- <link rel="stylesheet" href='{% absstatic "ldt/css/workspace.css" %}' />
+ <link rel="stylesheet" href='{% static "ldt/css/ldt.css" %}' />
+ <link rel="stylesheet" href='{% static "ldt/css/ldtform.css" %}' />
+ <link rel="stylesheet" href='{% static "ldt/css/workspace.css" %}' />
{% endblock %}
@@ -44,7 +44,7 @@
$( this ).find("button[type=submit]").removeClass("e-clicked");
});
- var search_url = "{% absurl ldt.ldt_utils.views.workspace.share_filter filter='__FILTER__' use_groups='false' %}";
+ var search_url = "{% absurl 'ldt.ldt_utils.views.workspace.share_filter' filter='__FILTER__' use_groups='false' %}";
});
</script>
@@ -55,7 +55,7 @@
<div id="add_group" class="span-18 last">
<div class="projectscontentstitle span-18 last">{% if group_id %}{% trans "Update a group" %}{% else %}{% trans "Create a group" %}{% endif %}</div>
- <form action="{% if group_id %}{% absurl ldt.ldt_utils.views.group.update_group group_id %} {% else %}{% absurl ldt.ldt_utils.views.group.create_group %}{% endif %}" method="POST" enctype="multipart/form-data" {% if target_parent %}target="_parent"{% endif %}>
+ <form action="{% if group_id %}{% absurl 'ldt.ldt_utils.views.group.update_group' group_id %} {% else %}{% absurl 'ldt.ldt_utils.views.group.create_group' %}{% endif %}" method="POST" enctype="multipart/form-data" {% if target_parent %}target="_parent"{% endif %}>
{% csrf_token %}
<input type="hidden" name="form_status" value="{{form_status}}" id="project_form_status" />
<input type="hidden" name="id_group" value="" id="id_group"/>
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_ldt.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_ldt.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,23 +1,23 @@
{% extends "ldt/ldt_raw_base.html" %}
-{% load absstatic %}
+{% load static %}
{% load i18n %} {# form of creation of content #}
{% load adminmedia %}
{% block js_import %}
{{ block.super }}
- <script type="text/javascript" src='{% absstatic "ldt/js/jquery.nyroModal.min.js" %}'></script>
- <script type="text/javascript" src="{% url ldt.jsi18n packages='ldt' %}" ></script>
- <script type="text/javascript" src='{% absstatic "ldt/js/projectscontents.js" %}'></script>
- <script type="text/javascript" src='{% absstatic "ldt/js/tiny_mce/tiny_mce.js" %}'></script>
+ <script type="text/javascript" src='{% static "ldt/js/jquery.nyroModal.min.js" %}'></script>
+ <script type="text/javascript" src="{% url 'ldt.jsi18n' packages='ldt' %}" ></script>
+ <script type="text/javascript" src='{% static "ldt/js/projectscontents.js" %}'></script>
+ <script type="text/javascript" src='{% static "ldt/js/tiny_mce/tiny_mce.js" %}'></script>
{{ content_form.media.js }}
{% endblock %}
{% block css_import %}
{{ block.super }}
{{ content_form.media.css }}
- <link rel="stylesheet" href='{% absstatic "ldt/css/ldt.css" %}' />
- <link rel="stylesheet" href='{% absstatic "ldt/css/ldtform.css" %}' />
- <link rel="stylesheet" href='{% absstatic "ldt/css/workspace.css" %}' />
+ <link rel="stylesheet" href='{% static "ldt/css/ldt.css" %}' />
+ <link rel="stylesheet" href='{% static "ldt/css/ldtform.css" %}' />
+ <link rel="stylesheet" href='{% static "ldt/css/workspace.css" %}' />
{% endblock %}
{% block js_declaration %}
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_iframe.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_iframe.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,6 +1,6 @@
{% load i18n %}
{% load thumbnail %}
-{% load absstatic %}
+{% load static %}
{% load absurl %}
{% load analytics %}
<?xml version="1.0" encoding="UTF-8"?>
@@ -26,7 +26,7 @@
<div>
<div id="{{ player_id }}_embed" class="iri_player_embed"></div>
- <script type="text/javascript" src='{% absstatic "ldt/metadataplayer/LdtPlayer-core.js" %}'></script>
+ <script type="text/javascript" src='{% static "ldt/metadataplayer/LdtPlayer-core.js" %}'></script>
<script type="text/javascript">
if (typeof jQuery == "undefined") {
@@ -35,14 +35,14 @@
var metadatas = {metadata: {url: '{{json_url}}'}};
var metadata_key = "metadata";
- IriSP.libFiles.defaultDir = '{% absstatic "ldt/js/" %}';
- IriSP.libFiles.locations.jwPlayerSWF = '{% absstatic "ldt/swf/player.swf" %}';
- IriSP.libFiles.locations.recordMicSwf = '{% absstatic "ldt/swf/record_mic.swf" %}';
- IriSP.libFiles.locations.zeroClipboardSwf = '{% absstatic "ldt/swf/ZeroClipboard10.swf" %}';
- IriSP.libFiles.locations.cssjQueryUI = '{% absstatic "ldt/css/jq-css/themes/base/jquery-ui.css" %}';
+ IriSP.libFiles.defaultDir = '{% static "ldt/js/" %}';
+ IriSP.libFiles.locations.jwPlayerSWF = '{% static "ldt/swf/player.swf" %}';
+ IriSP.libFiles.locations.recordMicSwf = '{% static "ldt/swf/record_mic.swf" %}';
+ IriSP.libFiles.locations.zeroClipboardSwf = '{% static "ldt/swf/ZeroClipboard10.swf" %}';
+ IriSP.libFiles.locations.cssjQueryUI = '{% static "ldt/css/jq-css/themes/base/jquery-ui.css" %}';
IriSP.language = '{{LANGUAGE_CODE}}';
- IriSP.widgetsDir = '{% absstatic "ldt/metadataplayer" %}';
+ IriSP.widgetsDir = '{% static "ldt/metadataplayer" %}';
var _metadata = {
url: metadatas[metadata_key].url + '?callback=?',
format: 'ldt'
@@ -50,7 +50,7 @@
var _config = {
width: '{{ player_width }}',
container: '{{ player_id }}_embed',
- css: '{% absstatic "ldt/metadataplayer/LdtPlayer-core.css" %}',
+ css: '{% static "ldt/metadataplayer/LdtPlayer-core.css" %}',
default_options: {
metadata: _metadata
},
@@ -121,9 +121,9 @@
{% if annotations_list %},{
type: "AnnotationsList",
container: "AnnotationsList_ext",
- ajax_url: "{% absurl segment_api_empty resource_name='segments' api_name='1.0' %}{% templatetag openvariable %}media{% templatetag closevariable %}/{% templatetag openvariable %}begin{% templatetag closevariable %}/{% templatetag openvariable %}end{% templatetag closevariable %}",
+ ajax_url: "{% absurl 'segment_api_empty' resource_name='segments' api_name='1.0' %}{% templatetag openvariable %}media{% templatetag closevariable %}/{% templatetag openvariable %}begin{% templatetag closevariable %}/{% templatetag openvariable %}end{% templatetag closevariable %}",
ajax_granularity : 300000,
- default_thumbnail : '{% absstatic "ldt/css/imgs/video_sequence.png" %}',
+ default_thumbnail : '{% static "ldt/css/imgs/video_sequence.png" %}',
show_audio: true,
rtmp_streamer: "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/"
}{% endif %},{
@@ -149,7 +149,7 @@
{% if createannotation %},{
type: "CreateAnnotation",
- api_endpoint_template: "{% absurl api_dispatch_list resource_name='annotations' api_name='1.0' %}",
+ api_endpoint_template: "{% absurl 'api_dispatch_list' resource_name='annotations' api_name='1.0' %}",
api_method: "PUT",
after_send_timeout: 8000,
{% if tag_titles %}
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_popup.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_popup.html Thu Feb 28 00:38:51 2013 +0100
@@ -3,14 +3,14 @@
{% load front_tags %}
{% load absurl %}
{% load static %}
-{% load absstatic %}
+{% load static %}
{% load analytics %}
{% block js_import %}
{{ block.super }}
- <script type="text/javascript" src='{% absstatic "ldt/js/jquery.min.js" %}'></script>
- <script type="text/javascript" src='{% absstatic "ldtjs/jquery.qtip.min.js" %}'></script>
- <script type="text/javascript" src='{% absstatic "ldt/js/embed_popup.js" %}'></script>
- <script type="text/javascript" src='{% absstatic "ldt/js/jscolor/jscolor.js" %}'></script>
+ <script type="text/javascript" src='{% static "ldt/js/jquery.min.js" %}'></script>
+ <script type="text/javascript" src='{% static "ldtjs/jquery.qtip.min.js" %}'></script>
+ <script type="text/javascript" src='{% static "ldt/js/embed_popup.js" %}'></script>
+ <script type="text/javascript" src='{% static "ldt/js/jscolor/jscolor.js" %}'></script>
{{ content_form.media.js }}
{% endblock %}
@@ -28,16 +28,16 @@
var LANGUAGE_CODE='{{LANGUAGE_CODE}}';
var json_url='{{json_url}}';
var player_id='{{player_id}}';
- var defaultDir='{% absstatic "ldt/js/" %}';
- var jwPlayerSWF='{% absstatic "ldt/swf/player.swf" %}';
- var recordMicSwf='{% absstatic "ldt/swf/record_mic.swf" %}';
- var zeroClipboardSwf='{% absstatic "ldt/swf/ZeroClipboard10.swf" %}';
- var cssjQueryUI='{% absstatic "ldt/css/jq-css/themes/base/jquery-ui.css" %}';
- var widgetsDir='{% absstatic "ldt/metadataplayer" %}';
- var configCss='{% absstatic "ldt/metadataplayer/LdtPlayer-core.css" %}';
- var default_thumbnail='{% absstatic "ldt/css/imgs/video_sequence.png" %}';
- var segment_api="{% absurl segment_api_empty resource_name='segments' api_name='1.0' %}{% templatetag openvariable %}media{% templatetag closevariable %}/{% templatetag openvariable %}begin{% templatetag closevariable %}/{% templatetag openvariable %}end{% templatetag closevariable %}";
- var LdtPlayer_core='{% absstatic "ldt/metadataplayer/LdtPlayer-core.js" %}';
+ var defaultDir='{% static "ldt/js/" %}';
+ var jwPlayerSWF='{% static "ldt/swf/player.swf" %}';
+ var recordMicSwf='{% static "ldt/swf/record_mic.swf" %}';
+ var zeroClipboardSwf='{% static "ldt/swf/ZeroClipboard10.swf" %}';
+ var cssjQueryUI='{% static "ldt/css/jq-css/themes/base/jquery-ui.css" %}';
+ var widgetsDir='{% static "ldt/metadataplayer" %}';
+ var configCss='{% static "ldt/metadataplayer/LdtPlayer-core.css" %}';
+ var default_thumbnail='{% static "ldt/css/imgs/video_sequence.png" %}';
+ var segment_api="{% absurl 'segment_api_empty' resource_name='segments' api_name='1.0' %}{% templatetag openvariable %}media{% templatetag closevariable %}/{% templatetag openvariable %}begin{% templatetag closevariable %}/{% templatetag openvariable %}end{% templatetag closevariable %}";
+ var LdtPlayer_core='{% static "ldt/metadataplayer/LdtPlayer-core.js" %}';
var creator_name='{{request.user.username}}';
$j(document).ready(function(){
@@ -49,10 +49,10 @@
{% block css_import %}
{{ block.super }}
{{ content_form.media.css }}
- <link rel="stylesheet" href='{% absstatic "ldt/css/style.css" %}' />
- <link rel="stylesheet" href='{% absstatic "ldt/css/workspace.css" %}'/>
- <link rel="stylesheet" href='{% absstatic "ldt/css/embed_popup.css" %}'/>
- <link rel="stylesheet" href='{% absstatic "ldt/css/jq-css/jquery.qtip.css" %}' type="text/css"/>
+ <link rel="stylesheet" href='{% static "ldt/css/style.css" %}' />
+ <link rel="stylesheet" href='{% static "ldt/css/workspace.css" %}'/>
+ <link rel="stylesheet" href='{% static "ldt/css/embed_popup.css" %}'/>
+ <link rel="stylesheet" href='{% static "ldt/css/jq-css/jquery.qtip.css" %}' type="text/css"/>
{% endblock %}
@@ -234,7 +234,7 @@
</div>
<div id="player_div" style="display:none">
<button type="button" class="refresh_button" id="refresh_player_button" title="Rafraichir le player" >
- <img src='{% absstatic "ldt/img/arrow_refresh.png" %}' id="refresh_player" ></img>
+ <img src='{% static "ldt/img/arrow_refresh.png" %}' id="refresh_player" ></img>
</button>
<div class="ldt_player" id="wrapper_{{player_id}}"></div>
</div>
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/error_confirm.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/error_confirm.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,17 +1,17 @@
{% extends "ldt/ldt_utils/workspace_base.html" %}
-{% load absstatic %}
+{% load static %}
{% load i18n %} {# form of creation of content #}
{% block js_import %}
{{ block.super }}
- <script type="text/javascript" src="{% url ldt.jsi18n packages='ldt' %}" ></script>
- <script type="text/javascript" src='{% absstatic "ldt/js/projectscontents.js" %}'></script>
+ <script type="text/javascript" src="{% url 'ldt.jsi18n' packages='ldt' %}" ></script>
+ <script type="text/javascript" src='{% static "ldt/js/projectscontents.js" %}'></script>
{% endblock %}
{% block css_import %}
{{ block.super }}
{{ content_form.media.css }}
- <link rel="stylesheet" href='{% absstatic "ldt/css/ldtform.css" %}' />
+ <link rel="stylesheet" href='{% static "ldt/css/ldtform.css" %}' />
{% endblock %}
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/error_confirm_popup.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/error_confirm_popup.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,18 +1,18 @@
{% extends "ldt/ldt_raw_base.html" %}
-{% load absstatic %}
+{% load static %}
{% load i18n %} {# form of creation of content #}
{% block js_import %}
{{ block.super }}
- <script type="text/javascript" src="{% url ldt.jsi18n packages='ldt' %}" ></script>
- <script type="text/javascript" src='{% absstatic "ldt/js/projectscontents.js" %}' ></script>
+ <script type="text/javascript" src="{% url 'ldt.jsi18n' packages='ldt' %}" ></script>
+ <script type="text/javascript" src='{% static "ldt/js/projectscontents.js" %}' ></script>
{% endblock %}
{% block css_import %}
{{ block.super }}
{{ content_form.media.css }}
- <link rel="stylesheet" href='{% absstatic "ldt/css/ldt.css" %}' />
- <link rel="stylesheet" href='{% absstatic "ldt/css/ldtform.css" %}' />
+ <link rel="stylesheet" href='{% static "ldt/css/ldt.css" %}' />
+ <link rel="stylesheet" href='{% static "ldt/css/ldtform.css" %}' />
{% endblock %}
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,26 +1,26 @@
{% extends "ldt/ldt_base.html" %}
{% load i18n %}
-{% load absstatic %}
+{% load static %}
{% block js_import %}
{{block.super}}
- <script type="text/javascript" src="{% url ldt.jsi18n packages='ldt' %}" ></script>
- <script type="text/javascript" src='{% absstatic "ldt/js/projectscontents.js" %}' ></script>
- <script type="text/javascript" src='{% absstatic "ldt/js/jquery.history.js" %}'></script>
+ <script type="text/javascript" src="{% url 'ldt.jsi18n' packages='ldt' %}" ></script>
+ <script type="text/javascript" src='{% static "ldt/js/projectscontents.js" %}' ></script>
+ <script type="text/javascript" src='{% static "ldt/js/jquery.history.js" %}'></script>
{% endblock %}
{% block js_declaration %}
{{block.super}}
<script type="text/javascript">
-var groups_filter_url = "{% url ldt.ldt_utils.views.group.groups_filter filter='__FILTER__' %}";
-var content_filter_url = "{% url ldt.ldt_utils.views.content.contents_filter filter_c='__FILTER__' %}";
-var project_filter_url = "{% url ldt.ldt_utils.views.project.projects_filter filter='__FILTER__' is_owner='false' status='0' id_group='__ID_GROUP__' %}";
-var publish_project_url = "{% url ldt.ldt_utils.views.project.publish '__PROJECT_ID__' %}";
-var unpublish_project_url = "{% url ldt.ldt_utils.views.project.unpublish '__PROJECT_ID__' %}";
-var get_group_projects_url = "{% url ldt.ldt_utils.views.group.get_group_projects_view %}";
+var groups_filter_url = "{% url 'ldt.ldt_utils.views.group.groups_filter' filter='__FILTER__' %}";
+var content_filter_url = "{% url 'ldt.ldt_utils.views.content.contents_filter' filter_c='__FILTER__' %}";
+var project_filter_url = "{% url 'ldt.ldt_utils.views.project.projects_filter' filter='__FILTER__' is_owner='false' status='0' id_group='__ID_GROUP__' %}";
+var publish_project_url = "{% url 'ldt.ldt_utils.views.project.publish' '__PROJECT_ID__' %}";
+var unpublish_project_url = "{% url 'ldt.ldt_utils.views.project.unpublish' '__PROJECT_ID__' %}";
+var get_group_projects_url = "{% url 'ldt.ldt_utils.views.group.get_group_projects' %}";
function init_events(base_node) {
- init_events_projects(base_node, "{% url ldt.ldt_utils.views.workspace.popup_embed %}", project_filter_url, publish_project_url, unpublish_project_url)
+ init_events_projects(base_node, "{% url 'ldt.ldt_utils.views.workspace.popup_embed' %}", project_filter_url, publish_project_url, unpublish_project_url)
}
var global_csrf_token = "{{ csrf_token }}";
@@ -111,7 +111,7 @@
{% block css_import %}
{{block.super}}
- <link rel="stylesheet" href='{% absstatic "ldt/css/workspace.css" %}' type="text/css"/>
+ <link rel="stylesheet" href='{% static "ldt/css/workspace.css" %}' type="text/css"/>
{% endblock %}
{% block content %}
@@ -120,13 +120,13 @@
<div class="span-12 last titlediv" >
<div class="span-8 projectscontentstitle">{% trans "My groups" %}
{% if can_add_group %}
- <a class="create_group" href="{% url ldt.ldt_utils.views.group.create_group %}"><img class='icon_title' src='{% absstatic "ldt/img/group_add.png" %}' alt="{% trans 'Create group' %}" title="{% trans 'Create group' %}" /></a>
+ <a class="create_group" href="{% url 'ldt.ldt_utils.views.group.create_group' %}"><img class='icon_title' src='{% static "ldt/img/group_add.png" %}' alt="{% trans 'Create group' %}" title="{% trans 'Create group' %}" /></a>
{% endif %}
</div>
<div class="span-4 last searchfielddiv" >
<div class="span-4 last searchfielddiv" >
- <div class="searchfield rounded"><input id="searchgroupsinput" class="searchfieldinput searchfieldinputbase" placeholder="{% trans 'search' %}" type="text" /><img id="projectsajaxloader" class="searchajaxloader" src='{% absstatic "ldt/img/ajax-loader-16x16.gif" %}' alt="loader"/><img id="projecsclear" class="searchclear" src='{% absstatic "ldt/img/clear-left.png" %}'/></div>
+ <div class="searchfield rounded"><input id="searchgroupsinput" class="searchfieldinput searchfieldinputbase" placeholder="{% trans 'search' %}" type="text" /><img id="projectsajaxloader" class="searchajaxloader" src='{% static "ldt/img/ajax-loader-16x16.gif" %}' alt="loader"/><img id="projecsclear" class="searchclear" src='{% static "ldt/img/clear-left.png" %}'/></div>
</div>
</div>
</div>
@@ -138,7 +138,7 @@
<div class="span-12 last titlediv" >
<div class="span-8 projectscontentstitle" >{% trans "The group's projects" %}</div>
<div class="span-4 last searchfielddiv" >
- <div class="searchfield rounded"><input id="searchprojectsinput" class="searchfieldinput searchfieldinputbase" placeholder="{% trans 'search' %}" type="text" /><img id="projectsajaxloader" class="searchajaxloader" src='{% absstatic "ldt/img/ajax-loader-16x16.gif" %}' alt="loader"/><img id="projecsclear" class="searchclear" src='{% absstatic "ldt/img/clear-left.png" %}' /></div>
+ <div class="searchfield rounded"><input id="searchprojectsinput" class="searchfieldinput searchfieldinputbase" placeholder="{% trans 'search' %}" type="text" /><img id="projectsajaxloader" class="searchajaxloader" src='{% static "ldt/img/ajax-loader-16x16.gif" %}' alt="loader"/><img id="projecsclear" class="searchclear" src='{% static "ldt/img/clear-left.png" %}' /></div>
</div>
</div>
<div class="span-12 last projectscontentsdiv" id="projectslistcontainer">
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/init_ldt.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/init_ldt.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,4 +1,4 @@
-{% load absstatic %}
+{% load static %}
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -7,10 +7,10 @@
<meta http-equiv="Cache" content="no store" />
<meta http-equiv="Expires" content="-1" />
<title>Ligne de Temps - IRI</title>
-<script type="text/javascript" src='{% absstatic "ldt/js/jquery.min.js" %}'></script>
-<script type="text/javascript" src='{% absstatic "ldt/js/jquery.nyroModal.min.js" %}'></script>
-<script type="text/javascript" src="{% url ldt.jsi18n packages='ldt' %}" ></script>
-<script type="text/javascript" src='{% absstatic "ldt/js/projectscontents.js" %}'></script>
+<script type="text/javascript" src='{% static "ldt/js/jquery.min.js" %}'></script>
+<script type="text/javascript" src='{% static "ldt/js/jquery.nyroModal.min.js" %}'></script>
+<script type="text/javascript" src="{% url 'ldt.jsi18n' packages='ldt' %}" ></script>
+<script type="text/javascript" src='{% static "ldt/js/projectscontents.js" %}'></script>
<script type="text/javascript">
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/ldt_list.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/ldt_list.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,10 +1,10 @@
{% extends "ldt/ldt_base.html" %}
{% load i18n %}
-{% load absstatic %}
+{% load static %}
{% block js_import %}
{{block.super}}
- <script type="text/javascript" src="{% url ldt.jsi18n packages='ldt' %}" ></script>
- <script type="text/javascript" src='{% absstatic "ldt/js/projectscontents.js" %}' ></script>
+ <script type="text/javascript" src="{% url 'ldt.jsi18n' packages='ldt' %}" ></script>
+ <script type="text/javascript" src='{% static "ldt/js/projectscontents.js" %}' ></script>
{% endblock %}
@@ -12,13 +12,13 @@
{{block.super}}
<script type="text/javascript">
-searchprojectfilterurl = "{% url ldt.ldt_utils.views.project.projects_filter filter='__FILTER__' is_owner='true' status='0' %}";
-publishprojecturl = "{% url ldt.ldt_utils.views.project.publish '__PROJECT_ID__' 'false' %}";
-unpublishprojecturl = "{% url ldt.ldt_utils.views.project.unpublish '__PROJECT_ID__' 'false' %}";
+searchprojectfilterurl = "{% url 'ldt.ldt_utils.views.project.projects_filter' filter='__FILTER__' is_owner='true' status='0' %}";
+publishprojecturl = "{% url 'ldt.ldt_utils.views.project.publish' '__PROJECT_ID__' 'false' %}";
+unpublishprojecturl = "{% url 'ldt.ldt_utils.views.project.unpublish' '__PROJECT_ID__' 'false' %}";
function init_events(base_node) {
- init_events_base(base_node, "{% url ldt.ldt_utils.views.workspace.popup_embed %}");
+ init_events_base(base_node, "{% url 'ldt.ldt_utils.views.workspace.popup_embed' %}");
$('.publishedproject', base_node).click(function(e) {
e.preventDefault();
@@ -68,7 +68,7 @@
{% block css_import %}
{{block.super}}
- <link rel="stylesheet" href='{% absstatic "ldt/css/workspace.css" %}' type="text/css"/>
+ <link rel="stylesheet" href='{% static "ldt/css/workspace.css" %}' type="text/css"/>
{% endblock %}
{% block content %}
@@ -77,7 +77,7 @@
<div class="span-12 last titlediv" >
<div class="span-8 projectscontentstitle" >{% trans "project list" %}</div>
<div class="span-4 last searchfielddiv" >
- <div class="searchfield rounded"><input id="searchprojectsinput" class="searchfieldinput searchfieldinputbase" value="{% trans 'search' %}" type="text" /><img id="projectsajaxloader" class="searchajaxloader" src='{% absstatic "ldt/img/ajax-loader-16x16.gif" %}'/><img id="projectsclear" class="searchclear" src='{% absstatic "ldt/img/clear-left.png" %}'/></div>
+ <div class="searchfield rounded"><input id="searchprojectsinput" class="searchfieldinput searchfieldinputbase" value="{% trans 'search' %}" type="text" /><img id="projectsajaxloader" class="searchajaxloader" src='{% static "ldt/img/ajax-loader-16x16.gif" %}'/><img id="projectsclear" class="searchclear" src='{% static "ldt/img/clear-left.png" %}'/></div>
</div>
</div>
<div class="span-12 last projectscontentsdiv" id="projectslistcontainer">
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/loading.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/loading.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,4 +1,4 @@
-{% load absstatic %}
+{% load static %}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<?xml version="1.0" encoding="UTF-8"?>
@@ -21,7 +21,7 @@
<body>
<div class="center">
<div><img alt="loading"
- src='{% absstatic "ldt/img/loadingAnimation.gif" %}' /></div>
+ src='{% static "ldt/img/loadingAnimation.gif" %}' /></div>
</div>
</body>
</html>
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/contentslist.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/contentslist.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,7 +1,7 @@
{% load i18n %}
{% load thumbnail %}
{% load front_tags %}
-{% load absstatic %}
+{% load static %}
<ul class="prev_next_cont_proj" >
<li id="content_tags_li"><span id="content_tags" class="clickable">{% if tag_cloud|length > 0 %}{% trans 'All categories' %}{% endif %}</span>{% if current_content_tag %}{% if current_content_tag != "" %} > {{current_content_tag}} <span id="no_content_tag" class="clickable">[x]</span>{% endif %}{% endif %}</li>
@@ -26,10 +26,10 @@
<tbody class="projectscontentsbody">
{% for content in contents %}
<tr class="imageline {% cycle 'projectscontentsoddline' 'projectscontentsevenline'%}">
- <td class="cellimg"><div class="cellimgdiv"><img src='{% absstatic "ldt/img/page_add.png" %}' title="{% trans 'create project' %}" alt="{% trans 'create project' %}" href="{% url ldt.ldt_utils.views.project.create_project content.iri_id %}" class="ldt_link_create_project"/></div></td>
- <td class="cellimg"><div class="cellimgdiv"><img alt="{% trans 'preview media'%}" title="{% trans 'preview media'%}" src='{% absstatic "ldt/img/control_play.png" %}' href="{% url ldt.ldt_utils.views.lignesdetemps.index content.iri_id %}" class="ldt_link_open_ldt"/></div></td>
+ <td class="cellimg"><div class="cellimgdiv"><img src='{% static "ldt/img/page_add.png" %}' title="{% trans 'create project' %}" alt="{% trans 'create project' %}" href="{% url 'ldt.ldt_utils.views.project.create_project' content.iri_id %}" class="ldt_link_create_project"/></div></td>
+ <td class="cellimg"><div class="cellimgdiv"><img alt="{% trans 'preview media'%}" title="{% trans 'preview media'%}" src='{% static "ldt/img/control_play.png" %}' href="{% url 'ldt.ldt_utils.views.lignesdetemps.index' content.iri_id %}" class="ldt_link_open_ldt"/></div></td>
<td>{% thumbnail content.image "50x50" format="PNG" crop="top" as im %}<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}">{% endthumbnail %}</td>
- <td class="contenttitle"><a {% if content.change %} class="contenttitlelink infostooltip" href="{% url ldt.ldt_utils.views.content.write_content iri_id=content.iri_id %}" data-title="{{ content.title}}" data-desc="{{ content.description }}" {% else %} class="contenttitlelink qtiplink" title="{% trans "You can't edit this content" %}" {% endif %}>{{ content.title|default:"_" }}</a></td>
+ <td class="contenttitle"><a {% if content.change %} class="contenttitlelink infostooltip" href="{% url 'ldt.ldt_utils.views.content.write_content' iri_id=content.iri_id %}" data-title="{{ content.title}}" data-desc="{{ content.description }}" {% else %} class="contenttitlelink qtiplink" title="{% trans "You can't edit this content" %}" {% endif %}>{{ content.title|default:"_" }}</a></td>
</tr>
{% endfor %}
</tbody>
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,12 +1,12 @@
{% spaceless %}
{% load i18n %}
{% load absurl %}
-{% load absstatic %}
+{% load static %}
{% load thumbnail %}
<div>
<div id="{{ player_id }}_embed" class="iri_player_embed">
</div>
-<script type="text/javascript" src='{% absstatic "ldt/metadataplayer/LdtPlayer-core.js" %}'></script>
+<script type="text/javascript" src='{% static "ldt/metadataplayer/LdtPlayer-core.js" %}'></script>
<script type="text/javascript">
if (typeof jQuery == "undefined") {
@@ -15,14 +15,14 @@
var metadatas = {metadata: {url: '{{json_url}}'}};
var metadata_key = "metadata";
-IriSP.libFiles.defaultDir = '{% absstatic "ldt/js/" %}';
-IriSP.libFiles.locations.jwPlayerSWF = '{% absstatic "ldt/swf/player.swf" %}';
-IriSP.libFiles.locations.recordMicSwf = '{% absstatic "ldt/swf/record_mic.swf" %}';
-IriSP.libFiles.locations.zeroClipboardSwf = '{% absstatic "ldt/swf/ZeroClipboard10.swf" %}';
-IriSP.libFiles.locations.cssjQueryUI = '{% absstatic "ldt/css/jq-css/themes/base/jquery-ui.css" %}';
+IriSP.libFiles.defaultDir = '{% static "ldt/js/" %}';
+IriSP.libFiles.locations.jwPlayerSWF = '{% static "ldt/swf/player.swf" %}';
+IriSP.libFiles.locations.recordMicSwf = '{% static "ldt/swf/record_mic.swf" %}';
+IriSP.libFiles.locations.zeroClipboardSwf = '{% static "ldt/swf/ZeroClipboard10.swf" %}';
+IriSP.libFiles.locations.cssjQueryUI = '{% static "ldt/css/jq-css/themes/base/jquery-ui.css" %}';
IriSP.language = '{{LANGUAGE_CODE}}';
-IriSP.widgetsDir = '{% absstatic "ldt/metadataplayer" %}';
+IriSP.widgetsDir = '{% static "ldt/metadataplayer" %}';
var _metadata = {
url: metadatas[metadata_key].url,
format: 'ldt'
@@ -30,7 +30,7 @@
var _config = {
width: '{{ player_width }}',
container: '{{ player_id }}_embed',
- css: '{% absstatic "ldt/metadataplayer/LdtPlayer-core.css" %}',
+ css: '{% static "ldt/metadataplayer/LdtPlayer-core.css" %}',
default_options: {
metadata: _metadata
},
@@ -59,9 +59,9 @@
},{
type: "AnnotationsList",
container: "AnnotationsList_ext",
- ajax_url: "{% absurl segment_api_empty resource_name='segments' api_name='1.0' %}{% templatetag openvariable %}media{% templatetag closevariable %}/{% templatetag openvariable %}begin{% templatetag closevariable %}/{% templatetag openvariable %}end{% templatetag closevariable %}",
+ ajax_url: "{% absurl 'segment_api_empty' resource_name='segments' api_name='1.0' %}{% templatetag openvariable %}media{% templatetag closevariable %}/{% templatetag openvariable %}begin{% templatetag closevariable %}/{% templatetag openvariable %}end{% templatetag closevariable %}",
ajax_granularity : 300000,
- default_thumbnail : '{% absstatic "ldt/css/imgs/video_sequence.png" %}',
+ default_thumbnail : '{% static "ldt/css/imgs/video_sequence.png" %}',
show_audio: true,
rtmp_streamer: "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/"
},{
@@ -73,7 +73,7 @@
hide_timeout: 5000
},{
type: "CreateAnnotation",
- api_endpoint_template: "{% absurl api_dispatch_list resource_name='annotations' api_name='1.0' %}",
+ api_endpoint_template: "{% absurl 'api_dispatch_list' resource_name='annotations' api_name='1.0' %}",
after_send_timeout: 8000,
show_mic_record: {% if show_mic_record %}true{% else %}false{% endif %},
close_after_send: false,
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_seo_meta.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_seo_meta.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,4 +1,4 @@
{% load absurl %}
{% spaceless %}
-<link rel="meta" href="{% absurl ldt.ldt_utils.views.rdf.project_annotations_rdf ldt_id=ldt_id %}"/>
+<link rel="meta" href="{% absurl 'ldt.ldt_utils.views.rdf.project_annotations_rdf' ldt_id=ldt_id %}"/>
{% endspaceless %}
\ No newline at end of file
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/groupslist.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/groupslist.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,6 +1,6 @@
{% load i18n %}
{% load thumbnail %}
-{% load absstatic %}
+{% load static %}
{% load static %}
<script type="text/javascript">
@@ -8,7 +8,7 @@
$(document).ready(function () {
var icon_size = 16;
$(".editable").each(function () {
- var src='{% absstatic "ldt/img/pencil.png" %}';
+ var src='{% static "ldt/img/pencil.png" %}';
var img = $('<img src='+src+' id="pencil_img" >');
var top = $(this).offset().top + $(this).height() - icon_size;
var left = $(this).offset().left + $(this).width() - icon_size;
@@ -45,7 +45,7 @@
{% if group.change %}
<td class="groupimg" >
- <a class="grouplink create_group" title="{% trans 'Change this group'%}" href="{% url ldt.ldt_utils.views.group.update_group group.id %}">
+ <a class="grouplink create_group" title="{% trans 'Change this group'%}" href="{% url 'ldt.ldt_utils.views.group.update_group' group.id %}">
{% thumbnail group.profile.image "50x50" crop="center" format="PNG" as im %}<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" class="editable"/>{% empty %} {% endthumbnail %}
</a>
</td>
@@ -57,7 +57,7 @@
<td>{{ group.name }}</td>
{% endif %}
- <td class="align_right"><img src='{% absstatic "ldt/img/control_play.png" %}' class="next_icon"/></td>
+ <td class="align_right"><img src='{% static "ldt/img/control_play.png" %}' class="next_icon"/></td>
</tr>
{% endfor %}
@@ -69,7 +69,7 @@
</td>
<td>{% trans "Projects shared with me only" %}</td>
- <td class="align_right"><img src='{% absstatic "ldt/img/control_play.png" %}' class="next_icon"/></td>
+ <td class="align_right"><img src='{% static "ldt/img/control_play.png" %}' class="next_icon"/></td>
</tr>
{% endif %}
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/ldt_div.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/ldt_div.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,9 +1,9 @@
{% load absurl %}
-{% load absstatic %}
+{% load static %}
{% comment %}
Yes we include swfobject.js in the middle of the page...
{% endcomment %}
-<script type="text/javascript" src='{% absstatic "ldt/js/swfobject.js" %}'></script>
+<script type="text/javascript" src='{% static "ldt/js/swfobject.js" %}'></script>
<div id="ldtInit" name="ldtInit" style="background-color: #00FF00; width: 1201px; height: 831px; left: 100px; top: 100px; z-index: 99999999; margin: 0; padding: 0;"> </div>
<script language="JavaScript" type="text/javascript">
@@ -32,14 +32,14 @@
{% else %}
readOnly:'true',
{% endifequal %}
- segmentPassMask:"{% absurl ldt.ldt_utils.views.lignesdetemps.index_segment '{4}' '{0}' '{1}' '{2}' '{3}' %}",
- simplePlayerPassMask:"{% absurl ldt.ldt_utils.views.front.annot_content '{0}' '{4}' '{2}' %}#id={3}"
+ segmentPassMask:"{% absurl 'ldt.ldt_utils.views.lignesdetemps.index_segment' '{4}' '{0}' '{1}' '{2}' '{3}' %}",
+ simplePlayerPassMask:"{% absurl 'ldt.ldt_utils.views.front.annot_content' '{0}' '{4}' '{2}' %}#id={3}"
};
var attributes = { id: "ldtInitSwf", name: "ldtInitSwf"};
- swfobject.embedSWF('{% absstatic "ldt/swf/ldt/LignesDeTempsFlex.swf" %}', "ldtInit", "1000", "630", "10.2.0", '{% absstatic "ldt/swf/expressInstall.swf" %}', flashvars, params, attributes);
+ swfobject.embedSWF('{% static "ldt/swf/ldt/LignesDeTempsFlex.swf" %}', "ldtInit", "1000", "630", "10.2.0", '{% static "ldt/swf/expressInstall.swf" %}', flashvars, params, attributes);
</script>
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/permissions.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/permissions.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,7 +1,7 @@
{% load i18n %}
-{% load absstatic %}
+{% load static %}
-<script type="text/javascript" src='{% absstatic "ldt/js/jquery-ui.min.js" %}'></script>
+<script type="text/javascript" src='{% static "ldt/js/jquery-ui.min.js" %}'></script>
<script type="text/javascript">
function init_events() {
@@ -18,13 +18,13 @@
}
$(document).ready(function() {
- var can_edit = '{% absstatic "ldt/img/pencil.png" %}';
- var can_view = '{% absstatic "ldt/img/eye.png" %}';
+ var can_edit = '{% static "ldt/img/pencil.png" %}';
+ var can_view = '{% static "ldt/img/eye.png" %}';
{% if group_edition %}
- var search_url = "{% url ldt.ldt_utils.views.workspace.share_filter filter='__FILTER__' use_groups='false' %}";
+ var search_url = "{% url 'ldt.ldt_utils.views.workspace.share_filter' filter='__FILTER__' use_groups='false' %}";
{% else %}
- var search_url = "{% url ldt.ldt_utils.views.workspace.share_filter filter='__FILTER__' use_groups='true' %}";
+ var search_url = "{% url 'ldt.ldt_utils.views.workspace.share_filter' filter='__FILTER__' use_groups='true' %}";
{% endif %}
input_list_init = [
@@ -76,7 +76,7 @@
selection.each(function () {
var id_item = $("input",$(this)).val();
- var eye_img = '{% absstatic "ldt/img/eye.png" %}';
+ var eye_img = '{% static "ldt/img/eye.png" %}';
$("#read").append('<input type="hidden" name="read_list" value="' + id_item + '"/>');
$("td:last",$(this)).append('<img class="can_view" src="'+eye_img+'" title="{% trans "share.eye" %}" alt="{% trans "share.eye" %}"/>');
});
@@ -109,7 +109,7 @@
{% if not group_edition %}
<div id="shareproject" class="clear dropdownlist">
-<img class="shareicon" src='{% absstatic "ldt/img/user_add.png" %}' />{% trans "share" %}
+<img class="shareicon" src='{% static "ldt/img/user_add.png" %}' />{% trans "share" %}
</div>
{% endif %}
@@ -131,8 +131,8 @@
{% trans "User and group list" %}<br />
<div class="searchfield span-4">
<input type="text" name="search" id="searchuserinput" class="searchfieldinput searchfieldinputbase" placeholder="{% trans 'search' %}"/>
- <img id="projectsajaxloader" class="searchajaxloader" src='{% absstatic "ldt/img/ajax-loader-16x16.gif" %}' alt="loader"/>
- <img id="projecsclear" class="searchclear" src='{% absstatic "ldt/img/clear-left.png" %}'/>
+ <img id="projectsajaxloader" class="searchajaxloader" src='{% static "ldt/img/ajax-loader-16x16.gif" %}' alt="loader"/>
+ <img id="projecsclear" class="searchclear" src='{% static "ldt/img/clear-left.png" %}'/>
</div>
</div><br /><br />
@@ -143,13 +143,13 @@
</div>
<div id="elemslistfooter">
- <a href="#" id="selectallitems" title="{% trans "select all displayed elements" %}"><img class="shareicon" src='{% absstatic "ldt/img/user_go.png" %}' title="{% trans "select all displayed elements" %}"/>{% trans "select all displayed elements" %}</a>
+ <a href="#" id="selectallitems" title="{% trans "select all displayed elements" %}"><img class="shareicon" src='{% static "ldt/img/user_go.png" %}' title="{% trans "select all displayed elements" %}"/>{% trans "select all displayed elements" %}</a>
</div>
</div>
<div id="selectors">
- <a href="#" id="selectelems"><img src='{% absstatic "ldt/img/to-right.gif" %}' title="{% trans "select users" %}"></a><br />
- <a href="#" id="removeelems"><img src='{% absstatic "ldt/img/to-left.gif" %}' title="{% trans "remove users" %}"></a>
+ <a href="#" id="selectelems"><img src='{% static "ldt/img/to-right.gif" %}' title="{% trans "select users" %}"></a><br />
+ <a href="#" id="removeelems"><img src='{% static "ldt/img/to-left.gif" %}' title="{% trans "remove users" %}"></a>
</div>
{% if media_form %}
<br /> <br />
@@ -166,18 +166,18 @@
<tr class="shareline">
<td style="width: 5%;">
{% if elem.type == "user" %}
- <img src='{% absstatic "ldt/img/user.png" %}' alt="{% trans "user" %}"/>
+ <img src='{% static "ldt/img/user.png" %}' alt="{% trans "user" %}"/>
{% else %}
- <img src='{% absstatic "ldt/img/group.png" %}' alt="{% trans "group" %}"/>
+ <img src='{% static "ldt/img/group.png" %}' alt="{% trans "group" %}"/>
{% endif %}
</td>
<td style="width: 95%;">{{ elem.name }}</td>
<td>
{% if elem.change %}
- <img class="can_edit" src='{% absstatic "ldt/img/pencil.png" %}' alt="{% trans "share.pencil" %}" />
+ <img class="can_edit" src='{% static "ldt/img/pencil.png" %}' alt="{% trans "share.pencil" %}" />
{% else %}
- <img class="can_view" src='{% absstatic "ldt/img/eye.png" %}' alt="{% trans "share.eye" %}" />
+ <img class="can_view" src='{% static "ldt/img/eye.png" %}' alt="{% trans "share.eye" %}" />
{% endif %}
</td>
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/picture.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/picture.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,6 +1,6 @@
{% load i18n %}
{% load thumbnail %}
-{% load absstatic %}
+{% load static %}
<script type="text/javascript">
$(document).ready(function () {
@@ -13,7 +13,7 @@
</script>
<div class="clear dropdownlist">
-<img class="shareicon" title="{% trans "choose a profile image" %}" src='{% absstatic "ldt/img/zoom_in.png" %}'/>
+<img class="shareicon" title="{% trans "choose a profile image" %}" src='{% static "ldt/img/zoom_in.png" %}'/>
{% trans "choose a profile image" %}
</div>
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,6 +1,6 @@
{% load i18n %}
{% load thumbnail %}
-{% load absstatic %}
+{% load static %}
{% load front_tags %}
{% if nb_pj_pages %}
@@ -18,48 +18,48 @@
{% for project in projects %}
<tr class="imageline {% cycle 'projectscontentsoddline' 'projectscontentsevenline'%}" >
- {% url ldt.ldt_utils.views.json.project_json_id project.ldt_id as json_url_id %}
+ {% url 'ldt.ldt_utils.views.json.project_json_id' project.ldt_id as json_url_id %}
{% if is_gecko %}
- <td class="cellimg"><div class="cellimgdiv"><a href="{% url index_project_full project.ldt_id %}">
+ <td class="cellimg"><div class="cellimgdiv"><a href="{% url 'index_project_full' project.ldt_id %}">
{% if project.change or project.owner == user %}
{% if project.state != 2 %}
- <img src='{% absstatic "ldt/img/page_edit.png" %}' alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/>
+ <img src='{% static "ldt/img/page_edit.png" %}' alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/>
{% else %}
- <img src='{% absstatic "ldt/img/page_eye.png" %}' alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/>
+ <img src='{% static "ldt/img/page_eye.png" %}' alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/>
{% endif %}
{% else %}
- <img src='{% absstatic "ldt/img/page_eye.png" %}' alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/>
+ <img src='{% static "ldt/img/page_eye.png" %}' alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/>
{% endif %}
</a></div></td>
{% else %}
- <td class="cellimg"><div class="cellimgdiv"><a href="{% url index_project project.ldt_id %}" class="ldt_link_open_ldt">
+ <td class="cellimg"><div class="cellimgdiv"><a href="{% url 'index_project' project.ldt_id %}" class="ldt_link_open_ldt">
{% if project.change or project.owner == user %}
{% if project.state != 2 %}
- <img src='{% absstatic "ldt/img/page_edit.png" %}' alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/>
+ <img src='{% static "ldt/img/page_edit.png" %}' alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/>
{% else %}
- <img src='{% absstatic "ldt/img/page_eye.png" %}' alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/>
+ <img src='{% static "ldt/img/page_eye.png" %}' alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/>
{% endif %}
{% else %}
- <img src='{% absstatic "ldt/img/page_eye.png" %}' alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/>
+ <img src='{% static "ldt/img/page_eye.png" %}' alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/>
{% endif %}
</a></div></td>
{% endif %}
- <td class="cellimg"><div class="cellimgdiv"><img src='{% absstatic "ldt/img/page_copy.png" %}' href="{% url ldt.ldt_utils.views.project.copy_project project.ldt_id group_id %}" class="ldt_link_copy_project" alt="{% trans 'copy project' %}" title="{% trans 'copy project' %}"/></div></td>
+ <td class="cellimg"><div class="cellimgdiv"><img src='{% static "ldt/img/page_copy.png" %}' href="{% url 'ldt.ldt_utils.views.project.copy_project' project.ldt_id group_id %}" class="ldt_link_copy_project" alt="{% trans 'copy project' %}" title="{% trans 'copy project' %}"/></div></td>
<td class="cellimg">
<div class="cellimgdiv">
{% if project.state == 2 %}
- <a href='{% url ldt.ldt_utils.views.workspace.popup_embed %}?json_url={{WEB_URL}}{{json_url_id}}&player_id=player_project_{{project.ldt_id}}&ldt_id={{project.ldt_id}}'>
- <img src='{% absstatic "ldt/img/plugin.png" %}' id="player_project_{{project.ldt_id}}" class="ldt_link_embed" alt="{% trans 'link json by id' %}" title="{% trans 'link json by id' %}"/>
+ <a href='{% url 'ldt.ldt_utils.views.workspace.popup_embed' %}?json_url={{WEB_URL}}{{json_url_id}}&player_id=player_project_{{project.ldt_id}}&ldt_id={{project.ldt_id}}'>
+ <img src='{% static "ldt/img/plugin.png" %}' id="player_project_{{project.ldt_id}}" class="ldt_link_embed" alt="{% trans 'link json by id' %}" title="{% trans 'link json by id' %}"/>
</a>
{% endif %}
</div>
</td>
<td class="cellimg">
{% ifequal project.state 2 %}
- <img src='{% absstatic "ldt/img/icon-yes.gif" %}' {% if project.change or project.owner == user %} alt="{% trans 'Project published, click to unpublish' %}" title="{% trans 'Project published, click to unpublish' %}" class="publishedproject qtiplink" {% else %} class="qtiplink" title="{% trans "You are not allowed to change this project" %}"{% endif %} id="project_{{project.ldt_id}}" /></div>
+ <img src='{% static "ldt/img/icon-yes.gif" %}' {% if project.change or project.owner == user %} alt="{% trans 'Project published, click to unpublish' %}" title="{% trans 'Project published, click to unpublish' %}" class="publishedproject qtiplink" {% else %} class="qtiplink" title="{% trans "You are not allowed to change this project" %}"{% endif %} id="project_{{project.ldt_id}}" /></div>
{% else %}
- <img src='{% absstatic "ldt/img/icon-no.gif" %}' {% if project.change or project.owner == user %} alt="{% trans 'Project not published, click to publish' %}" title="{% trans 'Project not published, click to publish' %}" class="unpublishedproject qtiplink" {% else %} class="qtiplink" title="{% trans "You are not allowed to change this project" %}"{% endif %}id="project_{{project.ldt_id}}" />
+ <img src='{% static "ldt/img/icon-no.gif" %}' {% if project.change or project.owner == user %} alt="{% trans 'Project not published, click to publish' %}" title="{% trans 'Project not published, click to publish' %}" class="unpublishedproject qtiplink" {% else %} class="qtiplink" title="{% trans "You are not allowed to change this project" %}"{% endif %}id="project_{{project.ldt_id}}" />
{% endifequal %}
</td>
<td>{% thumbnail project.image "50x50" crop="center" format="PNG" as im %}<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" />{% empty %} {% endthumbnail %}</td>
@@ -68,7 +68,7 @@
<span class="projecttitlelink infostooltip" data-title="{{ project.title }}" data-desc="{{ project.description|linebreaksbr }}" >{% if show_username %}{{ project.owner.username }} : {% endif %}{{ project.title }}</span>
{% else %}
{% if project.change or project.owner == user %}
- <a class="projecttitlelink" href="{% url ldt.ldt_utils.views.project.update_project ldt_id=project.ldt_id %}"><span class="infostooltip" data-title="{{ project.title }}" data-desc="{{ project.description|linebreaksbr }}" >{% if show_username %}{{ project.owner.username }} : {% endif %}{{ project.title }}</span></a>
+ <a class="projecttitlelink" href="{% url 'ldt.ldt_utils.views.project.update_project' ldt_id=project.ldt_id %}"><span class="infostooltip" data-title="{{ project.title }}" data-desc="{{ project.description|linebreaksbr }}" >{% if show_username %}{{ project.owner.username }} : {% endif %}{{ project.title }}</span></a>
{% else %}
<a class="projecttitlelink"><span class="qtiplink" title="{% trans "You are not allowed to change this project" %}">{% if show_username %}{{ project.owner.username }} : {% endif %}{{ project.title }}</span></a>
{% endif %}
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,7 +1,7 @@
{% load i18n %}
{% load thumbnail %}
{% load front_tags %}
-{% load absstatic %}
+{% load static %}
{% if nb_pj_pages %}
<ul class="prev_next_cont_proj" >
@@ -17,29 +17,29 @@
<tbody class="projectscontentsbody">
{% for project in projects %}
<tr class="imageline {% cycle 'projectscontentsoddline' 'projectscontentsevenline'%}" >
- {% url ldt.ldt_utils.views.json.project_json_id project.ldt_id as json_url_id %}
+ {% url 'ldt.ldt_utils.views.json.project_json_id' project.ldt_id as json_url_id %}
{% if is_gecko %}
- <td class="cellimg"><div class="cellimgdiv"><a href="{% url index_project_full project.ldt_id %}"><img src='{% absstatic "ldt/img/page_eye.png" %}' alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/></a></div></td>
+ <td class="cellimg"><div class="cellimgdiv"><a href="{% url 'index_project_full' project.ldt_id %}"><img src='{% static "ldt/img/page_eye.png" %}' alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/></a></div></td>
{% else %}
- <td class="cellimg"><div class="cellimgdiv"><a href="{% url index_project project.ldt_id %}" class="ldt_link_open_ldt"><img src='{% absstatic "ldt/img/page_eye.png" %}' alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/></a></div></td>
+ <td class="cellimg"><div class="cellimgdiv"><a href="{% url 'index_project' project.ldt_id %}" class="ldt_link_open_ldt"><img src='{% static "ldt/img/page_eye.png" %}' alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/></a></div></td>
{% endif %}
- <td class="cellimg"><div class="cellimgdiv"><img src='{% absstatic "ldt/img/page_copy.png" %}' href="{% url ldt.ldt_utils.views.project.copy_project project.ldt_id %}" class="ldt_link_copy_project" alt="{% trans 'copy the project' %}" title="{% trans 'copy the project' %}"/></div></td>
+ <td class="cellimg"><div class="cellimgdiv"><img src='{% static "ldt/img/page_copy.png" %}' href="{% url 'ldt.ldt_utils.views.project.copy_project' project.ldt_id %}" class="ldt_link_copy_project" alt="{% trans 'copy the project' %}" title="{% trans 'copy the project' %}"/></div></td>
<td class="cellimg">
<div class="cellimgdiv">
- <a href='{% url ldt.ldt_utils.views.workspace.popup_embed %}?json_url={{WEB_URL}}{{json_url_id}}&player_id=player_project_{{project.ldt_id}}&ldt_id={{project.ldt_id}}'>
- <img src='{% absstatic "ldt/img/plugin.png" %}' id="player_project_{{project.ldt_id}}" class="ldt_link_embed" alt="{% trans 'link json by id' %}" title="{% trans 'link json by id' %}"/>
+ <a href='{% url 'ldt.ldt_utils.views.workspace.popup_embed' %}?json_url={{WEB_URL}}{{json_url_id}}&player_id=player_project_{{project.ldt_id}}&ldt_id={{project.ldt_id}}'>
+ <img src='{% static "ldt/img/plugin.png" %}' id="player_project_{{project.ldt_id}}" class="ldt_link_embed" alt="{% trans 'link json by id' %}" title="{% trans 'link json by id' %}"/>
</a>
</div>
</td>
<td class="cellimg">
- <img src='{% absstatic "ldt/img/icon-yes.gif" %}' alt="{% trans 'Project published' %}" id="project_{{project.ldt_id}}" />
+ <img src='{% static "ldt/img/icon-yes.gif" %}' alt="{% trans 'Project published' %}" id="project_{{project.ldt_id}}" />
</td>
<td>{% thumbnail project.image "50x50" crop="center" format="PNG" as im %}<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" />{% empty %} {% endthumbnail %}</td>
<td class="projecttitle">
{% ifequal project.state 2 %}
<span class="projectinfos" data-title="{{ project.title }}" data-desc="{{ project.description|linebreaksbr }}">{{ project.title }}</span>
{% else %}
- <a class="projecttitlelink" href="{% url ldt.ldt_utils.views.project.update_project ldt_id=project.ldt_id %} data-desc="{{ project.description|linebreaksbr }}">{{ project.title }}</a>
+ <a class="projecttitlelink" href="{% url 'ldt.ldt_utils.views.project.update_project' ldt_id=project.ldt_id %} data-desc="{{ project.description|linebreaksbr }}">{{ project.title }}</a>
{% endifequal %}
</td>
</tr>
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/sharewith.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/sharewith.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,12 +1,12 @@
{% load i18n %}
-{% load absstatic %}
+{% load static %}
{% for res in elem_list %}
<tr class="shareline">
<td class="firstcolsharetable">
{% if res.type == "user" %}
- <img src='{% absstatic "ldt/img/user.png" %}' alt="{% trans "user" %}"/>
+ <img src='{% static "ldt/img/user.png" %}' alt="{% trans "user" %}"/>
{% else %}
- <img src='{% absstatic "ldt/img/group.png" %}' alt={% trans "group" %}"/>
+ <img src='{% static "ldt/img/group.png" %}' alt={% trans "group" %}"/>
{% endif %}
</td>
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/published_projects.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/published_projects.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,26 +1,26 @@
{% extends "ldt/ldt_base.html" %}
{% load i18n %}
-{% load absstatic %}
+{% load static %}
{% block js_import %}
{{block.super}}
- <script type="text/javascript" src="{% url ldt.jsi18n packages='ldt' %}" ></script>
- <script type="text/javascript" src='{% absstatic "ldt/js/projectscontents.js" %}' ></script>
- <script type="text/javascript" src='{% absstatic "ldt/js/jquery.history.js" %}'></script>
+ <script type="text/javascript" src="{% url 'ldt.jsi18n' packages='ldt' %}" ></script>
+ <script type="text/javascript" src='{% static "ldt/js/projectscontents.js" %}' ></script>
+ <script type="text/javascript" src='{% static "ldt/js/jquery.history.js" %}'></script>
{% endblock %}
{% block js_declaration %}
{{block.super}}
<script type="text/javascript">
-var content_filter_url = "{% url ldt.ldt_utils.views.content.contents_filter filter_c='__FILTER__' %}";
-var project_filter_url = "{% url ldt.ldt_utils.views.project.projects_filter filter='__FILTER__' is_owner='false' status='2' %}";
-var publish_project_url = "{% url ldt.ldt_utils.views.project.publish '__PROJECT_ID__' %}";
-var unpublish_project_url = "{% url ldt.ldt_utils.views.project.unpublish '__PROJECT_ID__' %}";
+var content_filter_url = "{% url 'ldt.ldt_utils.views.content.contents_filter' filter_c='__FILTER__' %}";
+var project_filter_url = "{% url 'ldt.ldt_utils.views.project.projects_filter' filter='__FILTER__' is_owner='false' status='2' %}";
+var publish_project_url = "{% url 'ldt.ldt_utils.views.project.publish' '__PROJECT_ID__' %}";
+var unpublish_project_url = "{% url 'ldt.ldt_utils.views.project.unpublish' '__PROJECT_ID__' %}";
function init_events(base_node) {
- init_events_all(base_node, "{% url ldt.ldt_utils.views.workspace.popup_embed %}", content_filter_url, project_filter_url, publish_project_url, unpublish_project_url);
+ init_events_all(base_node, "{% url 'ldt.ldt_utils.views.workspace.popup_embed' %}", content_filter_url, project_filter_url, publish_project_url, unpublish_project_url);
}
@@ -70,7 +70,7 @@
{% block css_import %}
{{block.super}}
- <link rel="stylesheet" href='{% absstatic "ldt/css/workspace.css" %}' type="text/css"/>
+ <link rel="stylesheet" href='{% static "ldt/css/workspace.css" %}' type="text/css"/>
{% endblock %}
{% block content %}
@@ -81,7 +81,7 @@
</div>
<div class="span-12 last projectscontentsdiv" id="autre">
<form method="get" id="my_form"
- action="{% url ldt.ldt_utils.views.workspace.search_index %}"
+ action="{% url 'ldt.ldt_utils.views.workspace.search_index' %}"
accept-charset="utf-8">
<table>
{{ form.as_table }}
@@ -92,9 +92,9 @@
<div class="span-12 last" id="projectsdiv">
<div class="span-12 last titlediv" >
<div class="span-8 projectscontentstitle" >{% trans "Published projects" %}
- <a class='ldt_link_create_project' href="{% url ldt.ldt_utils.views.project.create_ldt_view %}" ><img class='icon_title' src='{% absstatic "ldt/img/page_add_large.png" %}' alt="{% trans 'Create project' %}" title="{% trans 'Create project' %}" /></a></div>
+ <a class='ldt_link_create_project' href="{% url 'ldt.ldt_utils.views.project.create_ldt_view' %}" ><img class='icon_title' src='{% static "ldt/img/page_add_large.png" %}' alt="{% trans 'Create project' %}" title="{% trans 'Create project' %}" /></a></div>
<div class="span-4 last searchfielddiv" >
- <div class="searchfield rounded"><input id="searchprojectsinput" class="searchfieldinput searchfieldinputbase" placeholder="{% trans 'search' %}" type="text" /><img id="projectsajaxloader" class="searchajaxloader" src='{% absstatic "ldt/img/ajax-loader-16x16.gif" %}' alt="loader"/><img id="projecsclear" class="searchclear" src='{% absstatic "ldt/img/clear-left.png" %}'/></div>
+ <div class="searchfield rounded"><input id="searchprojectsinput" class="searchfieldinput searchfieldinputbase" placeholder="{% trans 'search' %}" type="text" /><img id="projectsajaxloader" class="searchajaxloader" src='{% static "ldt/img/ajax-loader-16x16.gif" %}' alt="loader"/><img id="projecsclear" class="searchclear" src='{% static "ldt/img/clear-left.png" %}'/></div>
</div>
</div>
<div class="span-12 last projectscontentsdiv" id="projectslistcontainer">
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/reset_confirm.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/reset_confirm.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,18 +1,18 @@
{% extends "ldt/ldt_utils/workspace_base.html" %}
-{% load absstatic %}
+{% load static %}
{% load i18n %} {# form of creation of content #}
{% block js_import %}
{{ block.super }}
- <script type="text/javascript" src="{% url ldt.jsi18n packages='ldt' %}" ></script>
- <script type="text/javascript" src='{% absstatic "ldt/js/projectscontents.js" %}'></script>
+ <script type="text/javascript" src="{% url 'ldt.jsi18n' packages='ldt' %}" ></script>
+ <script type="text/javascript" src='{% static "ldt/js/projectscontents.js" %}'></script>
{% endblock %}
{% block css_import %}
{{ block.super }}
{{ content_form.media.css }}
- <link rel="stylesheet" href='{% absstatic "ldt/css/ldt.css" %}' />
- <link rel="stylesheet" href='{% absstatic "ldt/css/ldtform.css" %}' />
+ <link rel="stylesheet" href='{% static "ldt/css/ldt.css" %}' />
+ <link rel="stylesheet" href='{% static "ldt/css/ldtform.css" %}' />
{% endblock %}
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/reset_confirm_popup.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/reset_confirm_popup.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,18 +1,18 @@
{% extends "ldt/ldt_raw_base.html" %}
-{% load absstatic %}
+{% load static %}
{% load i18n %} {# form of creation of content #}
{% block js_import %}
{{ block.super }}
- <script type="text/javascript" src="{% url ldt.jsi18n packages='ldt' %}" ></script>
- <script type="text/javascript" src='{% absstatic "ldt/js/projectscontents.js" %}'></script>
+ <script type="text/javascript" src="{% url 'ldt.jsi18n' packages='ldt' %}" ></script>
+ <script type="text/javascript" src='{% static "ldt/js/projectscontents.js" %}'></script>
{% endblock %}
{% block css_import %}
{{ block.super }}
{{ content_form.media.css }}
- <link rel="stylesheet" href='{% absstatic "ldt/css/ldt.css" %}' />
- <link rel="stylesheet" href='{% absstatic "ldt/css/ldtform.css" %}' />
+ <link rel="stylesheet" href='{% static "ldt/css/ldt.css" %}' />
+ <link rel="stylesheet" href='{% static "ldt/css/ldtform.css" %}' />
{% endblock %}
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/search_form.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/search_form.html Thu Feb 28 00:38:51 2013 +0100
@@ -21,8 +21,8 @@
{% block content %}
<form method="post" id="my_form"
- {% comment %}action="{% absurl ldt.ldt_utils.views.workspace.search_index %}"{% endcomment %}
- action="{% url ldt.ldt_utils.views.workspace.search_index %}"
+ {% comment %}action="{% absurl 'ldt.ldt_utils.views.workspace.search_index' %}"{% endcomment %}
+ action="{% url 'ldt.ldt_utils.views.workspace.search_index' %}"
accept-charset="utf-8">
{% csrf_token %}
<table>
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/search_results.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/search_results.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,15 +1,15 @@
{% extends "ldt/ldt_base.html" %}
{% load i18n %}
-{% load absstatic %}
+{% load static %}
{% block js_import %}
{{ block.super }}
- <script type="text/javascript" src="{% url ldt.jsi18n packages='ldt' %}" ></script>
- <script type="text/javascript" src='{% absstatic "ldt/js/projectscontents.js" %}'></script>
+ <script type="text/javascript" src="{% url 'ldt.jsi18n' packages='ldt' %}" ></script>
+ <script type="text/javascript" src='{% static "ldt/js/projectscontents.js" %}'></script>
{% endblock %}
{% block css_import %}
{{ block.super }}
- <link rel="stylesheet" href='{% absstatic "ldt/css/workspace.css" %}' />
+ <link rel="stylesheet" href='{% static "ldt/css/workspace.css" %}' />
<style type="text/css">
.titleresults {
@@ -41,7 +41,7 @@
{{ block.super }}
<script type="text/javascript">
$(document).ready(function(){
- init_events_all(document, "{% url ldt.ldt_utils.views.workspace.popup_embed %}", '', '', '', '');
+ init_events_all(document, "{% url 'ldt.ldt_utils.views.workspace.popup_embed' %}", '', '', '', '');
});
</script>
{% endblock %}
@@ -75,9 +75,9 @@
{% for segment in res.list %}
<li class="segmentinfos" >
{% if user.is_staff %}
- <a style="float:right;" onclick="return confirm('{% trans "Are you sure you want to delete this annotation ? You cannot undo this action." %}');" href="{% url delete_segment segment.project_id segment.iri_id segment.ensemble_id segment.cutting_id segment.element_id %}" title='{% trans "Delete permantly the current annotation" %}'><img src='{% absstatic "ldt/img/close.png" %}'/></a>
+ <a style="float:right;" onclick="return confirm('{% trans "Are you sure you want to delete this annotation ? You cannot undo this action." %}');" href="{% url 'delete_segment' segment.project_id segment.iri_id segment.ensemble_id segment.cutting_id segment.element_id %}" title='{% trans "Delete permantly the current annotation" %}'><img src='{% static "ldt/img/close.png" %}'/></a>
{% endif %}
- <span class="" title="{% trans 'open ldt' %}"><a class="ldt_link_open_ldt" href="{% url ldt.ldt_utils.views.lignesdetemps.index_segment segment.project_id segment.iri_id segment.ensemble_id segment.cutting_id segment.element_id %}">
+ <span class="" title="{% trans 'open ldt' %}"><a class="ldt_link_open_ldt" href="{% url 'ldt.ldt_utils.views.lignesdetemps.index_segment' segment.project_id segment.iri_id segment.ensemble_id segment.cutting_id segment.element_id %}">
{% if segment.title %}
{{ segment.title }}
{% else %}
@@ -102,7 +102,7 @@
<div class="pagination">
<span class="step-links">
{% if results.has_previous %}
- <a href="{% url ldt.ldt_utils.views.workspace.search_index %}?page={{ results.previous_page_number }}&search={{search}}&field={{field}}">{% trans "previous" %}</a>
+ <a href="{% url 'ldt.ldt_utils.views.workspace.search_index' %}?page={{ results.previous_page_number }}&search={{search}}&field={{field}}">{% trans "previous" %}</a>
{% endif %}
{% if results.paginator.num_pages > 1 %}
@@ -112,7 +112,7 @@
{% endif %}
{% if results.has_next %}
- <a href="{% url ldt.ldt_utils.views.workspace.search_index %}?page={{ results.next_page_number }}&search={{search}}&field={{field}}">{% trans "next" %}</a>
+ <a href="{% url 'ldt.ldt_utils.views.workspace.search_index' %}?page={{ results.next_page_number }}&search={{search}}&field={{field}}">{% trans "next" %}</a>
{% endif %}
</span>
</div>
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/workspace_base.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/workspace_base.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,11 +1,11 @@
{% extends "ldt/ldt_base.html" %}
{% load i18n %}
-{% load absstatic %}
+{% load static %}
{% block js_import %}
{{block.super}}
- <script type="text/javascript" src="{% url ldt.jsi18n packages='ldt' %}" ></script>
- <script type="text/javascript" src='{% absstatic "ldt/js/projectscontents.js" %}'></script>
- <script type="text/javascript" src='{% absstatic "ldt/js/jquery.history.js" %}'></script>
+ <script type="text/javascript" src="{% url 'ldt.jsi18n' packages='ldt' %}" ></script>
+ <script type="text/javascript" src='{% static "ldt/js/projectscontents.js" %}'></script>
+ <script type="text/javascript" src='{% static "ldt/js/jquery.history.js" %}'></script>
{% endblock %}
@@ -13,13 +13,13 @@
{{block.super}}
<script type="text/javascript">
-var content_filter_url = "{% url ldt.ldt_utils.views.content.contents_filter filter_c='__FILTER__' %}";
-var project_filter_url = "{% url ldt.ldt_utils.views.project.projects_filter filter='__FILTER__' is_owner='true' status='0' %}";
-var publish_project_url = "{% url ldt.ldt_utils.views.project.publish '__PROJECT_ID__' %}";
-var unpublish_project_url = "{% url ldt.ldt_utils.views.project.unpublish '__PROJECT_ID__' %}";
+var content_filter_url = "{% url 'ldt.ldt_utils.views.content.contents_filter' filter_c='__FILTER__' %}";
+var project_filter_url = "{% url 'ldt.ldt_utils.views.project.projects_filter' filter='__FILTER__' is_owner='true' status='0' %}";
+var publish_project_url = "{% url 'ldt.ldt_utils.views.project.publish' '__PROJECT_ID__' %}";
+var unpublish_project_url = "{% url 'ldt.ldt_utils.views.project.unpublish' '__PROJECT_ID__' %}";
function init_events(base_node) {
- init_events_all(base_node, "{% url ldt.ldt_utils.views.workspace.popup_embed %}", content_filter_url, project_filter_url, publish_project_url, unpublish_project_url);
+ init_events_all(base_node, "{% url 'ldt.ldt_utils.views.workspace.popup_embed' %}", content_filter_url, project_filter_url, publish_project_url, unpublish_project_url);
}
@@ -89,7 +89,7 @@
{% block css_import %}
{{block.super}}
- <link rel="stylesheet" href='{% absstatic "ldt/css/workspace.css" %}' type="text/css"/>
+ <link rel="stylesheet" href='{% static "ldt/css/workspace.css" %}' type="text/css"/>
{% endblock %}
{% block content %}
@@ -97,12 +97,12 @@
<div class="span-12" id="contentsdiv">
<div class="span-12 last titlediv" >
<div class="span-8 projectscontentstitle">{% trans "content list" %}
- <a class='content_link_create' href="{% url ldt.ldt_utils.views.content.write_content %}" ><img class='icon_title' src='{% absstatic "ldt/img/film_add.png" %}' alt="{% trans 'Create content' %}" title="{% trans 'Create content' %}" /></a></div>
+ <a class='content_link_create' href="{% url 'ldt.ldt_utils.views.content.write_content' %}" ><img class='icon_title' src='{% static "ldt/img/film_add.png" %}' alt="{% trans 'Create content' %}" title="{% trans 'Create content' %}" /></a></div>
<div class="span-4 last searchfielddiv" >
<div class="searchfield rounded">
<input id="searchcontentsinput" class="searchfieldinput searchfieldinputbase" placeholder="{% trans 'search' %}" type="text" />
- <img id="contentsajaxloader" class="searchajaxloader" src='{% absstatic "ldt//img/ajax-loader-16x16.gif" %}' alt="loader"/>
- <img id="contentsclear" class="searchclear" src='{% absstatic "ldt/img/clear-left.png" %}' />
+ <img id="contentsajaxloader" class="searchajaxloader" src='{% static "ldt//img/ajax-loader-16x16.gif" %}' alt="loader"/>
+ <img id="contentsclear" class="searchclear" src='{% static "ldt/img/clear-left.png" %}' />
</div>
</div>
</div>
@@ -113,9 +113,9 @@
<div class="span-12 last" id="projectsdiv">
<div class="span-12 last titlediv" >
<div class="span-8 projectscontentstitle" >{% trans "My projects" %}
- <a class='ldt_link_create_project' href="{% url ldt.ldt_utils.views.project.create_ldt_view %}" ><img class='icon_title' src='{% absstatic "ldt/img/page_add_large.png" %}' alt="{% trans 'Create project' %}" title="{% trans 'Create project' %}" /></a></div>
+ <a class='ldt_link_create_project' href="{% url 'ldt.ldt_utils.views.project.create_ldt_view' %}" ><img class='icon_title' src='{% static "ldt/img/page_add_large.png" %}' alt="{% trans 'Create project' %}" title="{% trans 'Create project' %}" /></a></div>
<div class="span-4 last searchfielddiv" >
- <div class="searchfield rounded"><input id="searchprojectsinput" class="searchfieldinput searchfieldinputbase" placeholder="{% trans 'search' %}" type="text" /><img id="projectsajaxloader" class="searchajaxloader" src='{% absstatic "ldt//img/ajax-loader-16x16.gif" %}' alt="loader"/><img id="projecsclear" class="searchclear" src='{% absstatic "ldt/img/clear-left.png" %}'/></div>
+ <div class="searchfield rounded"><input id="searchprojectsinput" class="searchfieldinput searchfieldinputbase" placeholder="{% trans 'search' %}" type="text" /><img id="projectsajaxloader" class="searchajaxloader" src='{% static "ldt//img/ajax-loader-16x16.gif" %}' alt="loader"/><img id="projecsclear" class="searchclear" src='{% static "ldt/img/clear-left.png" %}'/></div>
</div>
</div>
<div class="span-12 last projectscontentsdiv" id="projectslistcontainer">
--- a/src/ldt/ldt/ldt_utils/views/front.py Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/views/front.py Thu Feb 28 00:38:51 2013 +0100
@@ -6,15 +6,14 @@
from django.db.models import Count
from django.shortcuts import render_to_response
from django.template import RequestContext
+from ldt.ldt_utils.forms import SearchForm
from ldt.ldt_utils.models import Content, Project
-from ldt.ldt_utils.forms import SearchForm
from ldt.ldt_utils.views.content import get_content_tags
-from ldt.ldt_utils.views.group import get_group_projects
from ldt.ldt_utils.views.workspace import get_search_results
+from ldt.utils.url import static
from tagging.models import TaggedItem
-from ldt.utils.url import absstatic
+import logging
-import logging
logger = logging.getLogger(__name__)
@@ -149,9 +148,9 @@
player_id = "player_project_" + proj.ldt_id
if cutting_id is None :
- json_url = reverse("ldt.ldt_utils.views.json.project_json_id", args=[proj.ldt_id])
+ json_url = reverse("ldt.ldt_utils.views.json.project_json_id", kwargs={'id' : proj.ldt_id})
else:
- json_url = reverse("ldt.ldt_utils.views.json.project_json_cutting_id", args=[proj.ldt_id, cutting_id])
+ json_url = reverse("ldt.ldt_utils.views.json.project_json_cutting_id", kwargs={'id':proj.ldt_id, 'cutting_id':cutting_id})
player_width = 550
player_height = 380
stream_mode = proj.stream_mode
@@ -175,9 +174,9 @@
search = ''
field = 'all'
content_tag = None
- colorurl=absstatic(request, "ldt/swf/ldt/pkg/color.xml")
- i18nurl=absstatic(request, "ldt/swf/ldt/pkg/i18n")
- baseurl=absstatic(request, "ldt/swf/ldt/")
+ colorurl=static("ldt/swf/ldt/pkg/color.xml")
+ i18nurl=static("ldt/swf/ldt/pkg/i18n")
+ baseurl=static("ldt/swf/ldt/")
sform = SearchForm(request.GET)
if sform.is_valid():
search = sform.cleaned_data["search"]
--- a/src/ldt/ldt/ldt_utils/views/lignesdetemps.py Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/views/lignesdetemps.py Thu Feb 28 00:38:51 2013 +0100
@@ -12,7 +12,7 @@
from ldt.security.permissionchecker import check_object_perm_for_user
from ldt.security.utils import set_forbidden_stream
from ldt.utils.projectldt_parser import absolute_src_xml, relative_src_xml
-from ldt.utils.url import absstatic, absurl
+from ldt.utils.url import static, absurl
from ldt.utils.web_url_management import get_web_url
import base64
import logging
@@ -25,9 +25,9 @@
language_code = request.LANGUAGE_CODE[:2]
url = absurl(request, "ldt.ldt_utils.views.lignesdetemps.search_init", args=[field, query])
- colorurl=absstatic(request, "ldt/swf/ldt/pkg/color.xml")
- i18nurl=absstatic(request, "ldt/swf/ldt/pkg/i18n")
- baseurl=absstatic(request, "ldt/swf/ldt/")
+ colorurl=static("ldt/swf/ldt/pkg/color.xml")
+ i18nurl=static("ldt/swf/ldt/pkg/i18n")
+ baseurl=static("ldt/swf/ldt/")
return render_to_response('ldt/ldt_utils/init_ldt.html', {'colorurl': colorurl, 'i18nurl': i18nurl, 'language': language_code, 'baseurl': baseurl, 'url': url}, context_instance=RequestContext(request))
def search_init(request, field, query):
@@ -91,9 +91,9 @@
language_code = request.LANGUAGE_CODE[:2]
readonly = 'true'
template_path = 'ldt/ldt_utils/init_ldt.html'
- colorurl=absstatic(request, "ldt/swf/ldt/pkg/color.xml")
- i18nurl=absstatic(request, "ldt/swf/ldt/pkg/i18n")
- baseurl=absstatic(request, "ldt/swf/ldt/")
+ colorurl=static("ldt/swf/ldt/pkg/color.xml")
+ i18nurl=static("ldt/swf/ldt/pkg/i18n")
+ baseurl=static("ldt/swf/ldt/")
return render_to_response(template_path, {'colorurl': colorurl, 'i18nurl': i18nurl, 'language': language_code, 'baseurl': baseurl, 'url': url_str, 'posturl': post_url, 'id': id, 'readonly': readonly}, context_instance=RequestContext(request))
def init_segment(request, project_id, content_id, ensemble_id, cutting_id, segment_id):
@@ -191,9 +191,9 @@
urlStr = absurl(request, "ldt.ldt_utils.views.lignesdetemps.init", args=['ldt_project', id])
posturl = absurl(request, "ldt.ldt_utils.views.lignesdetemps.save_ldt_project")
language_code = request.LANGUAGE_CODE[:2]
- colorurl = absstatic(request, "ldt/swf/ldt/pkg/color.xml")
- i18nurl = absstatic(request, "ldt/swf/ldt/pkg/i18n")
- baseurl = absstatic(request, "ldt/swf/ldt/")
+ colorurl = static("ldt/swf/ldt/pkg/color.xml")
+ i18nurl = static("ldt/swf/ldt/pkg/i18n")
+ baseurl = static("ldt/swf/ldt/")
audio_record_url = None
try:
--- a/src/ldt/ldt/ldt_utils/views/workspace.py Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/views/workspace.py Thu Feb 28 00:38:51 2013 +0100
@@ -23,7 +23,7 @@
from ldt.ldt_utils.views.project import (get_projects_page,
get_published_projects_page)
from ldt.security.utils import add_change_attr, get_userlist
-from ldt.utils.url import absstatic, absurl
+from ldt.utils.url import static, absurl
from ldt.utils.web_url_management import get_web_url
from operator import itemgetter
import base64
@@ -288,9 +288,9 @@
results = []
search = ''
field = 'all'
- colorurl=absstatic(request, "ldt/swf/ldt/pkg/color.xml")
- i18nurl=absstatic(request, "ldt/swf/ldt/pkg/i18n")
- baseurl=absstatic(request, "ldt/swf/ldt/")
+ colorurl = static("ldt/swf/ldt/pkg/color.xml")
+ i18nurl = static("ldt/swf/ldt/pkg/i18n")
+ baseurl = static("ldt/swf/ldt/")
sform = SearchForm(request.GET)
if sform.is_valid():
search = sform.cleaned_data["search"]
--- a/src/ldt/ldt/templates/403.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/templates/403.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,10 +1,10 @@
{% extends "ldt/ldt_base.html" %}
{% load i18n %}
-{% load absstatic %}
+{% load static %}
{% block content %}
<div style="text-align:center;vertical-align:middle;">
<h1>{% trans '403 error' %}</h1>
- <img src='{% absstatic "ldt/img/403_gandalf.gif" %}'alt="Gif 404" style="display:block;margin:auto;vertical-align:middle;"/>
+ <img src='{% static "ldt/img/403_gandalf.gif" %}'alt="Gif 404" style="display:block;margin:auto;vertical-align:middle;"/>
<br>
<h1>{% trans "You don't have the right permission to access this page" %}</h1>
</div>
--- a/src/ldt/ldt/templates/404.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/templates/404.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,11 +1,11 @@
{% extends "ldt/ldt_base.html" %}
{% load i18n %}
-{% load absstatic %}
+{% load static %}
{% block content %}
<div style="text-align:center;vertical-align:middle;">
<h1>{% trans '404 error' %}</h1>
- <img src='{% absstatic "ldt/img/404_gandalf.gif" %}' alt="Gif 404" style="display:block;margin:auto;vertical-align:middle;"/>
+ <img src='{% static "ldt/img/404_gandalf.gif" %}' alt="Gif 404" style="display:block;margin:auto;vertical-align:middle;"/>
<br>
<h1>{% trans "Sorry, we couldn't find your page" %}</h1>
</div>
--- a/src/ldt/ldt/templates/admin/index.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/templates/admin/index.html Thu Feb 28 00:38:51 2013 +0100
@@ -46,14 +46,14 @@
<caption>Import</caption>
<tr>
<th>
- <a href="{% url ldt.ldt_utils.views.importFile %}">Import an ldt</a>
+ <a href="{% url 'ldt.ldt_utils.views.importFile' %}">Import an ldt</a>
</th>
<td>
</td>
</tr>
<tr>
<th>
- <a href="{% url ldt.ldt_utils.views.reindex %}">Reindex</a>
+ <a href="{% url 'ldt.ldt_utils.views.reindex' %}">Reindex</a>
</th>
<td>
</td>
--- a/src/ldt/ldt/templates/admin/page_base.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/templates/admin/page_base.html Thu Feb 28 00:38:51 2013 +0100
@@ -16,7 +16,7 @@
<!-- END Header -->
{% block breadcrumb %}
<li></li>
- <li><a href="{% url ldt.userpanel.views.space %}">{% trans "Space" %}</a></li>
+ <li><a href="{% url 'ldt.userpanel.views.space' %}">{% trans "Space" %}</a></li>
<li>{% trans "Pages" %}</li>
{% endblock %}
--- a/src/ldt/ldt/templates/admin/page_login.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/templates/admin/page_login.html Thu Feb 28 00:38:51 2013 +0100
@@ -26,8 +26,8 @@
<td><input type="hidden" name="this_is_the_login_form" value="1" /></td>
</tr>
<tr>
- <td><a href="{% url registration.views.register %}" >{% trans "Create an account" %}</a>
- <a href="{% url django.contrib.auth.views.password_reset %}" >{% trans "Forget password?" %}</a>
+ <td><a href="{% url 'registration.views.register' %}" >{% trans "Create an account" %}</a>
+ <a href="{% url 'django.contrib.auth.views.password_reset' %}" >{% trans "Forget password?" %}</a>
</td>
<td><label> </label><input type="submit" value="{% trans 'Log in' %}" /></td>
</tr>
--- a/src/ldt/ldt/templates/base.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/templates/base.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,4 +1,4 @@
-{% load absstatic %}
+{% load static %}
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
{% block html_declare %}
<html lang="en">
@@ -6,7 +6,7 @@
<head>
<title>{% if user.is_authenticated %}Hello {{ user }}{% else %}Please login{% endif %}</title>
- <link rel="stylesheet" type="text/css" media="screen" href='{% absstatic "ldt/css/socialauth.css" %}' />
+ <link rel="stylesheet" type="text/css" media="screen" href='{% static "ldt/css/socialauth.css" %}' />
{% block extra_head %}
{% endblock %}
</head>
@@ -20,9 +20,9 @@
FB.init({appId: '{{ FACEBOOK_APP_ID }}', status: true, cookie: true, xfbml: true});
FB.Event.subscribe('auth.sessionChange', function(response) {
if (response.session) {
- window.location = '{% url socialauth_facebook_login_done %}';
+ window.location = '{% url 'socialauth_facebook_login_done' %}';
} else {
- //window.location = '{% url socialauth_social_logout %}';
+ //window.location = '{% url 'socialauth_social_logout' %}';
}
});
};
--- a/src/ldt/ldt/templates/ldt/ldt_base.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/templates/ldt/ldt_base.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,22 +1,22 @@
{% extends "ldt/ldt_raw_base.html" %}
{% load i18n %}
{% load logintag %}
+{% load static %}
{% load navigation %}
-{% load absstatic %}
{% load thumbnail %}
{% block js_import %}
<script type="text/javascript">
- var project_load_src = '{% absstatic "ldt/img/ajax-loader-transp.gif" %}'; // Required for search bar icon in projectscontents.js
+ var project_load_src = '{% static "ldt/img/ajax-loader-transp.gif" %}'; // Required for search bar icon in projectscontents.js
</script>
{{ block.super }}
- <script type="text/javascript" src='{% absstatic "ldt/js/jquery.nyroModal.min.js" %}'></script>
+ <script type="text/javascript" src='{% static "ldt/js/jquery.nyroModal.min.js" %}'></script>
<!--[if IE 6]>
- <script type="text/javascript" src='{% absstatic "ldt/js/jquery.nyroModal-ie6.min.js" %}'></script>
+ <script type="text/javascript" src='{% static "ldt/js/jquery.nyroModal-ie6.min.js" %}'></script>
<![endif]-->
- <script type="text/javascript" src='{% absstatic "ldt/js/jquery.qtip.min.js" %}'></script>
- <script type="text/javascript" src='{% absstatic "ldt/js/jquery.validate.js" %}' ></script>
+ <script type="text/javascript" src='{% static "ldt/js/jquery.qtip.min.js" %}'></script>
+ <script type="text/javascript" src='{% static "ldt/js/jquery.validate.js" %}' ></script>
{% endblock %}
{% block js_declaration %}
@@ -72,10 +72,10 @@
{% block css_import %}
{{ block.super }}
- <link rel="stylesheet" href='{% absstatic "ldt/css/tabs.css" %}' type="text/css" media="screen, projection" />
- <link rel="stylesheet" href='{% absstatic "ldt/css/nyroModal.css" %}' type="text/css"/>
- <link rel="stylesheet" href='{% absstatic "ldt/js/login_ajax/login_ajax.css" %}' type="text/css"/>
- <link rel="stylesheet" href='{% absstatic "ldt/css/jquery.qtip.min.css" %}' type="text/css"/>
+ <link rel="stylesheet" href='{% static "ldt/css/tabs.css" %}' type="text/css" media="screen, projection" />
+ <link rel="stylesheet" href='{% static "ldt/css/nyroModal.css" %}' type="text/css"/>
+ <link rel="stylesheet" href='{% static "ldt/js/login_ajax/login_ajax.css" %}' type="text/css"/>
+ <link rel="stylesheet" href='{% static "ldt/css/jquery.qtip.min.css" %}' type="text/css"/>
{% endblock %}
{% block body %}
@@ -84,18 +84,18 @@
<div id="header">
{% block header %}
<div id="header_left">
- <p><a href="{% url ldt.ldt_utils.views.workspace.home %}">{% block base_title %}{% trans "header_title" %}{% endblock %}</a></p>
+ <p><a href="{% url 'ldt.ldt_utils.views.workspace.home' %}">{% block base_title %}{% trans "header_title" %}{% endblock %}</a></p>
</div>
<div id="loginstate" >
{% if user.is_staff %}
- <a href="{% url admin:index %}" title="{% trans "Link to admin" %}">{% trans "Staff" %}</a>|
+ <a href="{% url 'admin:index' %}" title="{% trans "Link to admin" %}">{% trans "Staff" %}</a>|
{% endif %}
{% if user.is_authenticated %}
- <a href="{% url front_home %}" title="{% trans "front link" %}">{% trans "front link" %}</a> |
- <a href="{% url ldt.user.views.profile %}" title="{% trans "Profile change" %}">
+ <a href="{% url 'front_home' %}" title="{% trans "front link" %}">{% trans "front link" %}</a> |
+ <a href="{% url 'ldt.user.views.profile' %}" title="{% trans "Profile change" %}">
{% thumbnail user.get_profile.image "20x20" crop="center" format="PNG" as im %}<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" />{% empty %} {% endthumbnail %}
{{user.username}}</a>
- | <a href="{% url ldt.user.views.logout_view %}" title="{% trans "Log out" %}">{% trans "Log out" %}</a>
+ | <a href="{% url 'ldt.user.views.logout_view' %}" title="{% trans "Log out" %}">{% trans "Log out" %}</a>
{% endif %}
</div>
{% endblock %}
@@ -106,11 +106,11 @@
<div class="block span-24 last">
<div id="tabsdiv" class="block span-20">
{% if user.is_authenticated %}
- {% url ldt.ldt_utils.views.workspace.home as workspace_url %}
- {% url ldt.ldt_utils.views.workspace.groups as groups_url %}
- {% url ldt.ldt_utils.views.workspace.published_project as published_project_url %}
- {% url ldt.user.views.profile as profile_url %}
- {% url ldt.ldt_utils.views.workspace.search_form as search_url %}
+ {% url 'ldt.ldt_utils.views.workspace.home' as workspace_url %}
+ {% url 'ldt.ldt_utils.views.workspace.groups' as groups_url %}
+ {% url 'ldt.ldt_utils.views.workspace.published_project' as published_project_url %}
+ {% url 'ldt.user.views.profile' as profile_url %}
+ {% url 'ldt.ldt_utils.views.workspace.search_form' as search_url %}
<ul class="tabs">
<li class='{% active request "active" workspace_url %}'><a href="{{ workspace_url }}" title="{% trans "home" %}">{% trans "home" %}</a></li>
<li class='{% active request "active" groups_url %}'><a href="{{ groups_url }}" title="{% trans "home" %}">{% trans "My groups" %}</a></li>
@@ -124,7 +124,7 @@
</div>
{% if user.is_authenticated %}
<div class="block span-4 last">
- <form method="get" id="quick_search_form" action="{% url ldt.ldt_utils.views.workspace.search_index %}" title="{% trans "search"%}" accept-charset="utf-8">
+ <form method="get" id="quick_search_form" action="{% url 'ldt.ldt_utils.views.workspace.search_index' %}" title="{% trans "search"%}" accept-charset="utf-8">
<input type="text" name="search" id="id_search" size="16"/>
<input type='hidden' name='field' value='all' />
<input type="submit" class="quick_search_submit" value="" />
@@ -141,7 +141,7 @@
<div id="footer" class="span-24 last">
{% block footer %}
<div class="footer_img">
- <a href="http://www.iri.centrepompidou.fr"><img src='{% absstatic "ldt/img/logo_IRI_footer.png" %}' alt="Logo IRI" /></a>
+ <a href="http://www.iri.centrepompidou.fr"><img src='{% static "ldt/img/logo_IRI_footer.png" %}' alt="Logo IRI" /></a>
</div>
<div style="float: right; text-align: right;" class="small" id="copyright_version">
<div>©2011 <a style="text-decoration: none; color: #4F5155;" href="http://www.iri.centrepompidou.fr">IRI</a></div>
--- a/src/ldt/ldt/templates/ldt/ldt_raw_base.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/templates/ldt/ldt_raw_base.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,7 +1,7 @@
{% load i18n %}
{% load logintag %}
{% load navigation %}
-{% load absstatic %}
+{% load static %}
{% load analytics %}
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
@@ -11,28 +11,28 @@
{% block head %}
<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
<meta http-equiv="content-language" content="{{LANGUAGE_CODE}}" />
- <link rel="SHORTCUT ICON" href='{% absstatic "ldt/img/favicon.ico" %}' />
+ <link rel="SHORTCUT ICON" href='{% static "ldt/img/favicon.ico" %}' />
<title>{% block title %}{% trans "page_title" %}{% endblock %}</title>
{% block js_import %}
- <script type="text/javascript" src='{% absstatic "ldt/js/jquery.min.js" %}'></script>
+ <script type="text/javascript" src='{% static "ldt/js/jquery.min.js" %}'></script>
{% endblock %}
{% block css_declaration %}
<style type="text/css">
.rounded {
- behavior:url('{% absstatic "ldt/css/border-radius.htc" %}');
+ behavior:url('{% static "ldt/css/border-radius.htc" %}');
}
</style>
{% endblock %}
{% block css_import %}
- <link rel="stylesheet" href='{% absstatic "ldt/css/blueprint/screen.css" %}' type="text/css" media="screen, projection" />
- <link rel="stylesheet" href='{% absstatic "ldt/css/blueprint/print.css" %}' type="text/css" media="print" />
+ <link rel="stylesheet" href='{% static "ldt/css/blueprint/screen.css" %}' type="text/css" media="screen, projection" />
+ <link rel="stylesheet" href='{% static "ldt/css/blueprint/print.css" %}' type="text/css" media="print" />
<!--[if lt IE 8]>
<link rel="stylesheet" href="{{BASE_URL}}static/css/blueprint/ie.css" type="text/css" media="screen, projection" />
<![endif]-->
- <link rel="stylesheet" href='{% absstatic "ldt/css/style.css" %}' type="text/css"/>
+ <link rel="stylesheet" href='{% static "ldt/css/style.css" %}' type="text/css"/>
{% endblock %}
{% block js_declaration %}
--- a/src/ldt/ldt/templates/openid/index.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/templates/openid/index.html Thu Feb 28 00:38:51 2013 +0100
@@ -30,7 +30,7 @@
<br/>
<!-- Simple OpenID Selector -->
-<form action="{% url socialauth_openid_login %}" method="get" id="openid_form">
+<form action="{% url 'socialauth_openid_login' %}" method="get" id="openid_form">
<input type="hidden" name="action" value="verify" />
<fieldset>
--- a/src/ldt/ldt/templates/socialauth/login_page.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/templates/socialauth/login_page.html Thu Feb 28 00:38:51 2013 +0100
@@ -15,7 +15,7 @@
openid.init('openid_identifier');
});
//function facebook_onlogin(){
- // window.location = "{% url socialauth_facebook_login_done %}"
+ // window.location = "{% url 'socialauth_facebook_login_done' %}"
//}
</script>
<!-- /Simple OpenID Selector -->
@@ -28,11 +28,11 @@
{% block main_content %}
{% if user.is_authenticated %}
- <p>You are already logged in. <a href="{% url socialauth_social_logout %}">Logout</a>?</p>
+ <p>You are already logged in. <a href="{% url 'socialauth_social_logout' %}">Logout</a>?</p>
{% else %}
<div id="login">
-<form action="{% url socialauth_openid_login %}" method="get" id="openid_form">
+<form action="{% url 'socialauth_openid_login' %}" method="get" id="openid_form">
<input type="hidden" name="action" value="verify" />
<fieldset>
@@ -49,15 +49,15 @@
{% endif %}
<div id="linkedin">
- <a href="{% url socialauth_linkedin_login %}?next={{ next }}" id="linkedin_login_link" class="openid_large_btn linkedin"></a>
+ <a href="{% url 'socialauth_linkedin_login' %}?next={{ next }}" id="linkedin_login_link" class="openid_large_btn linkedin"></a>
</div>
<div id="twitter">
- <a href="{% url socialauth_twitter_login %}?next={{ next }}" id="twitter_login_link" class="openid_large_btn twitter"></a>
+ <a href="{% url 'socialauth_twitter_login' %}?next={{ next }}" id="twitter_login_link" class="openid_large_btn twitter"></a>
</div>
<!--<div id="yahoo">
- <a href="{% url socialauth_yahoo_login %}" id="yahoo_login_link" class="openid_large_btn yahoo"></a>
+ <a href="{% url 'socialauth_yahoo_login' %}" id="yahoo_login_link" class="openid_large_btn yahoo"></a>
</div>-->
</div>
--- a/src/ldt/ldt/templates/socialauth/signin_complete.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/templates/socialauth/signin_complete.html Thu Feb 28 00:38:51 2013 +0100
@@ -3,6 +3,6 @@
{% block main_content %}
You have signed in.<br/>
-<a onclick="FB.logout(); window.location='{% url socialauth_social_logout %}';" href="#">Logout</a>
+<a onclick="FB.logout(); window.location='{% url 'socialauth_social_logout' %}';" href="#">Logout</a>
{% endblock %}
--- a/src/ldt/ldt/user/admin.py Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/user/admin.py Thu Feb 28 00:38:51 2013 +0100
@@ -61,8 +61,8 @@
admin.site.unregister(Ldt)
admin.site.register(Ldt, LdtAdmin)
-admin.site.register(ApiKey)
-admin.site.register(ApiAccess)
+#admin.site.register(ApiKey)
+#admin.site.register(ApiAccess)
admin.site.unregister(User)
admin.site.register(User, UserProfileAdmin)
--- a/src/ldt/ldt/user/templates/ldt/user/change_profile.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/user/templates/ldt/user/change_profile.html Thu Feb 28 00:38:51 2013 +0100
@@ -35,7 +35,7 @@
{% if msg %}
<div class="success" style="left:50%; text-align: center;">{{ msg }}</div>
{% endif %}
-<form method="post" action="{% url ldt.user.views.profile %}">
+<form method="post" action="{% url 'ldt.user.views.profile' %}">
{% csrf_token %}
<table>
<tr>
@@ -97,7 +97,7 @@
</table>
</form>
-<form method="post" action="{% url ldt.user.views.password %}">
+<form method="post" action="{% url 'ldt.user.views.password' %}">
{% csrf_token %}
<table>
<tr>
@@ -146,7 +146,7 @@
</table>
</form>
-<form enctype="multipart/form-data" method="post" action="{% url ldt.user.views.profile_picture %}">
+<form enctype="multipart/form-data" method="post" action="{% url 'ldt.user.views.profile_picture' %}">
{% csrf_token %}
<table>
<tr>
--- a/src/ldt/ldt/user/templates/ldt/user/login_form.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/user/templates/ldt/user/login_form.html Thu Feb 28 00:38:51 2013 +0100
@@ -5,7 +5,7 @@
{{block.super}}
<script language="javascript">
- var url_login_ajax='{% absurl ldt.user.views.login_ajax %}';
+ var url_login_ajax='{% absurl "ldt.user.views.login_ajax" %}';
{% if reload %}
var reload=true;
{% else %}
@@ -30,9 +30,9 @@
<ul class="usertool">
{% if user.is_authenticated %}
<li id="user">{{user.username}}</li>
- <li><a href="{% url ldt.user.views.profile %}" >{% trans "Profiles" %}</a> </li>
- <li><a href="{% url ldt.user.views.space %}">{% trans "Space" %}</a></li>
- <li><a href="{% url ldt.user.views.logout_view %}" >{% trans "Log out" %}</a></li>
+ <li><a href="{% url 'ldt.user.views.profile' %}" >{% trans "Profiles" %}</a> </li>
+ <li><a href="{% url 'ldt.user.views.space' %}">{% trans "Space" %}</a></li>
+ <li><a href="{% url 'ldt.user.views.logout_view' %}" >{% trans "Log out" %}</a></li>
{% else %}
<li><a href="#inlineContent" class="login_link">{% trans "Log in" %}</li>
@@ -48,7 +48,7 @@
<div id="msg"></div>
<div id="login_form" style="padding: 8px;" method="POST" action="">
<div style="float: right; padding-bottom: 8px;">
- <a href="{% url registration.views.register %}" >{% trans "create account" %}</a>
+ <a href="{% url 'registration.views.register' %}" >{% trans "create account" %}</a>
</div>
<dl style="clear: both;">
@@ -66,7 +66,7 @@
</dd>
<dt/>
<dd>
- <a href="{% url django.contrib.auth.views.password_reset %}" >{% trans "reset password" %}</a>
+ <a href="{% url 'django.contrib.auth.views.password_reset' %}" >{% trans "reset password" %}</a>
</dd>
</dl>
<input class="button" id="submit" type="submit" value="{% trans 'Connection' %}"/>
--- a/src/ldt/ldt/user/templates/ldt/user/user_base.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/user/templates/ldt/user/user_base.html Thu Feb 28 00:38:51 2013 +0100
@@ -2,11 +2,11 @@
{# this page inherit base html, all pages of ldt inherit this page. #}
{# all contents are writed in the "iricontent" block #}
{% load i18n %}
-{% load absstatic %}
+{% load static %}
{% block css_import %}
{{ block.super }}
- <link rel="stylesheet" href='{% absstatic "ldt/css/workspace.css" %}' type="text/css"/>
+ <link rel="stylesheet" href='{% static "ldt/css/workspace.css" %}' type="text/css"/>
{% endblock %}
--- a/src/ldt/ldt/user/templates/registration/activate.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/user/templates/registration/activate.html Thu Feb 28 00:38:51 2013 +0100
@@ -10,5 +10,5 @@
{% block iricontent %}
<p>{% trans "You have activated your account" %}</p>
-<a href="{% url django.contrib.auth.views.login%}">{% trans "Go back to login page" %}</a>
+<a href="{% url 'django.contrib.auth.views.login'%}">{% trans "Go back to login page" %}</a>
{% endblock %}
\ No newline at end of file
--- a/src/ldt/ldt/user/templates/registration/base.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/user/templates/registration/base.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,10 +1,10 @@
{% extends "ldt/user/user_base.html" %}
-{% load absstatic %}
+{% load static %}
{% block js_import %}
{{ block.super }}
{% endblock %}
{% block css_import %}
{{ block.super }}
- <link rel="stylesheet" href='{% absstatic "ldt/css/registration.css" %}' />
+ <link rel="stylesheet" href='{% static "ldt/css/registration.css" %}' />
{% endblock %}
{% block pageclass %}profile{% endblock %}
--- a/src/ldt/ldt/user/templates/registration/login.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/user/templates/registration/login.html Thu Feb 28 00:38:51 2013 +0100
@@ -1,6 +1,6 @@
{% extends "registration/base.html" %}
{% load i18n %}
-{% load absstatic %}
+{% load static %}
{% block js_declaration %}{{ block.super }}
<script type="text/javascript">
$(document).ready(function() {
@@ -11,8 +11,8 @@
{% block css_import %}
{{ block.super }}
- <link rel="stylesheet" href='{% absstatic "ldt/css/ldt.css" %}' />
- <link rel="stylesheet" href='{% absstatic "ldt/css/ldtform.css" %}' />
+ <link rel="stylesheet" href='{% static "ldt/css/ldt.css" %}' />
+ <link rel="stylesheet" href='{% static "ldt/css/ldtform.css" %}' />
{% endblock %}
@@ -37,8 +37,8 @@
<div id="login_links" class="span-12 last">
<div id="login_links_list" class="span-12 last">
<ul>
- <li><a href="{% url registration.views.register %}" >{% trans "Create an account" %}</a></li>
- <li><a href="{% url django.contrib.auth.views.password_reset %}" >{% trans "Forget password?" %}</a></li>
+ <li><a href="{% url 'registration.views.register' %}" >{% trans "Create an account" %}</a></li>
+ <li><a href="{% url 'django.contrib.auth.views.password_reset' %}" >{% trans "Forget password?" %}</a></li>
</ul>
</div>
</div>
--- a/src/ldt/ldt/user/templates/registration/password_change_done.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/user/templates/registration/password_change_done.html Thu Feb 28 00:38:51 2013 +0100
@@ -4,7 +4,7 @@
{% block breadcrumb %}
<li></li>
- <li><a href="{% url ldt.user.views.profile %}">{% trans "Profiles" %}</a></li>
+ <li><a href="{% url 'ldt.user.views.profile' %}">{% trans "Profiles" %}</a></li>
<li>{% trans "password change" %}</li>
{% endblock %}
@@ -12,6 +12,6 @@
{% block iricontent %}
<p>{% trans 'Your password has been changed.' %}</p>
-<a href="{% url ldt.user.views.profile %}">{% trans 'Go back to profiles' %}</a>
+<a href="{% url 'ldt.user.views.profile' %}">{% trans 'Go back to profiles' %}</a>
{% endblock %}
--- a/src/ldt/ldt/user/templates/registration/password_change_form.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/user/templates/registration/password_change_form.html Thu Feb 28 00:38:51 2013 +0100
@@ -10,7 +10,7 @@
{% endblock %}
{% block breadcrumb %}
<li></li>
- <li><a href="{% url ldt.user.views.profile %}">{% trans "Profiles" %}</a></li>
+ <li><a href="{% url 'ldt.user.views.profile' %}">{% trans "Profiles" %}</a></li>
<li>{% trans 'Password change' %}</li>
{% endblock %}
--- a/src/ldt/ldt/user/templates/registration/password_reset_email.html Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/user/templates/registration/password_reset_email.html Thu Feb 28 00:38:51 2013 +0100
@@ -4,7 +4,7 @@
{% trans "Please go to the following page and choose a new password:" %}
{% block reset_link %}
-{{ protocol }}://{{ domain }}{% url django.contrib.auth.views.password_reset_confirm uidb36=uid, token=token %}
+{{ protocol }}://{{ domain }}{% url 'django.contrib.auth.views.password_reset_confirm' uidb36=uid, token=token %}
{% endblock %}
{% trans "Your username, in case you've forgotten:" %} {{ user.username }}
--- a/src/ldt/ldt/utils/url.py Mon May 13 14:22:37 2013 +0200
+++ b/src/ldt/ldt/utils/url.py Thu Feb 28 00:38:51 2013 +0100
@@ -6,7 +6,9 @@
import httplib2
import re
import urlparse
-import logging
+
+def static(path):
+ return staticfiles_storage.url(path)
def absstatic(request, path):
domain=get_web_url(request)