--- a/src/metadatacomposer/templates/metadatacomposer_home.html Fri May 24 17:24:11 2013 +0200
+++ b/src/metadatacomposer/templates/metadatacomposer_home.html Mon May 27 13:36:54 2013 +0200
@@ -30,13 +30,13 @@
<header>
<div class="container">
<div class="row">
- <div class="span3"><h1><a class="clearfix" href="{% url composer_home branding=branding %}">
+ <div class="span3"><h1><a class="clearfix" href="{% url 'composer_home' branding=branding %}">
{% include top_header_partial %}
</a></h1></div>
<div class="span9">
<ul class="breadcrumb nav-bar">
- <li><a href="{% url composer_project_list branding=branding %}"><i class="icon-file"></i> Projets</a> <span class="divider">/</span></li>
- <li><a href="{% url composer_resource_list branding=branding %}"><i class="icon-folder-close-alt"></i>Ressources</a></li>
+ <li><a href="{% url 'composer_project_list' branding=branding %}"><i class="icon-file"></i> Projets</a> <span class="divider">/</span></li>
+ <li><a href="{% url 'composer_resource_list' branding=branding %}"><i class="icon-folder-close-alt"></i>Ressources</a></li>
</ul>
</div>
</div>
@@ -64,7 +64,7 @@
<h3 class="span8"><i class="icon-picture"></i> Dernières images</h3>
<div class="span4 wrap-btn-add">
<a data-type-media="image" data-title="Ajouter une image" class="btn btn-success open-modal"
- href="{% url composer_modal_image branding=branding %}" data-hide-bibliotheque>
+ href="{% url 'composer_modal_image' branding=branding %}" data-hide-bibliotheque>
Ajouter une image <i class="icon-plus-sign"></i></a>
</div>
</div>
@@ -82,7 +82,7 @@
<h3 class="span8"><i class="icon-film"></i> Dernières vidéos</h3>
<div class="span4 wrap-btn-add">
<a data-type-media="video" data-title="Ajouter une vidéo" class="btn btn-success open-modal"
- href="{% url composer_modal_video branding=branding %}" data-hide-bibliotheque>
+ href="{% url 'composer_modal_video' branding=branding %}" data-hide-bibliotheque>
Ajouter une vidéo <i class="icon-plus-sign"></i></a>
</div>
</div>
--- a/src/metadatacomposer/templates/metadatacomposer_modal_image.html Fri May 24 17:24:11 2013 +0200
+++ b/src/metadatacomposer/templates/metadatacomposer_modal_image.html Mon May 27 13:36:54 2013 +0200
@@ -9,7 +9,7 @@
</div>
<div class="span8 offset1 popup-content">
<h4>Informations et source de l'image</h4>
- <form class="form-horizontal" action="{% url composer_modal_image branding=branding %}" enctype="multipart/form-data" method="post">{% csrf_token %}
+ <form class="form-horizontal" action="{% url 'composer_modal_image' branding=branding %}" enctype="multipart/form-data" method="post">{% csrf_token %}
{% if image_pk %}<input type="hidden" value="{{ image_pk }}" name="image_pk">{% endif %}
{% for error in form.errors %}
<span class="error">{{ error }}</span>
--- a/src/metadatacomposer/templates/metadatacomposer_modal_video.html Fri May 24 17:24:11 2013 +0200
+++ b/src/metadatacomposer/templates/metadatacomposer_modal_video.html Mon May 27 13:36:54 2013 +0200
@@ -10,7 +10,7 @@
</div>
<div class="span8 offset1 popup-content">
- <form class="row" action="{% if content %}{% url composer_modal_video branding=branding iri_id=content.iri_id %}{% else %}{% url composer_modal_video branding=branding %}{% endif %}" enctype="multipart/form-data" method="post">
+ <form class="row" action="{% if content %}{% url 'composer_modal_video' branding=branding iri_id=content.iri_id %}{% else %}{% url 'composer_modal_video' branding=branding %}{% endif %}" enctype="multipart/form-data" method="post">
<h4 class="span8">Informations sur la vidéo</h4>
<div class="span4">
{% csrf_token %}
--- a/src/metadatacomposer/templates/metadatacomposer_resource_list.html Fri May 24 17:24:11 2013 +0200
+++ b/src/metadatacomposer/templates/metadatacomposer_resource_list.html Mon May 27 13:36:54 2013 +0200
@@ -19,7 +19,7 @@
<div class="row article-title">
<h3 class="span8"><i class="icon-picture"></i> Liste des images</h3>
<div class="span4 wrap-btn-add">
- <a data-type-media="image" data-title="Ajouter une image" class="btn btn-success open-modal" href="{% url composer_modal_image branding=branding %}">
+ <a data-type-media="image" data-title="Ajouter une image" class="btn btn-success open-modal" href="{% url 'composer_modal_image' branding=branding %}">
Ajouter une image <i class="icon-plus-sign"></i>
</a>
</div>
@@ -34,7 +34,7 @@
<div class="row article-title">
<h3 class="span8"><i class="icon-film"></i> Liste des vidéos</h3>
<div class="span4 wrap-btn-add">
- <a data-type-media="video" data-title="Ajouter une vidéo" class="btn btn-success open-modal" href="{% url composer_modal_video branding=branding %}">
+ <a data-type-media="video" data-title="Ajouter une vidéo" class="btn btn-success open-modal" href="{% url 'composer_modal_video' branding=branding %}">
Ajouter une vidéo <i class="icon-plus-sign"></i>
</a>
</div>
--- a/src/metadatacomposer/templates/partial/resource_content_list.html Fri May 24 17:24:11 2013 +0200
+++ b/src/metadatacomposer/templates/partial/resource_content_list.html Mon May 27 13:36:54 2013 +0200
@@ -26,7 +26,7 @@
</td>
<td>{{ res.content.update_date|date:"Y/m/d" }}</td>
<td>
- <a data-type-media="video" data-title="Modifier une vidéo" class="btn open-modal" href="{% url composer_modal_video branding=branding iri_id=res.content.iri_id %}"><i class="icon-pencil"></i></a>
+ <a data-type-media="video" data-title="Modifier une vidéo" class="btn open-modal" href="{% url 'composer_modal_video' branding=branding iri_id=res.content.iri_id %}"><i class="icon-pencil"></i></a>
<a class="btn btn-delete" data-title="Titre du média" href="#row-list-ressources-video-id1">
<i class="icon-remove"></i>
</a>
@@ -38,7 +38,7 @@
<div class="pagination">
<ul>
{% if content_results.has_previous %}
- <li><a href="{% url composer_content_page branding=branding %}?page={{ content_results.previous_page_number }}" class="content_pagination">{% trans "Previous" %}</a></li>
+ <li><a href="{% url 'composer_content_page' branding=branding %}?page={{ content_results.previous_page_number }}" class="content_pagination">{% trans "Previous" %}</a></li>
{% else %}
<li class="disabled"><a>{% trans "Previous" %}</a></li>
{% endif %}
@@ -47,17 +47,17 @@
{% if i|add:'1' == content_results.number %}
<li class="active"><a href="#">{{i|add:'1'}}</a></li>
{% else %}
- <li><a href="{% url composer_content_page branding=branding %}?page={{i|add:'1'}}" class="content_pagination">{{i|add:'1'}}</a></li>
+ <li><a href="{% url 'composer_content_page' branding=branding %}?page={{i|add:'1'}}" class="content_pagination">{{i|add:'1'}}</a></li>
{% endif %}
{% endfor %}
{% endif %}
{% if content_results.has_next %}
- <li><a href="{% url composer_content_page branding=branding %}?page={{ content_results.next_page_number }}" class="content_pagination">{% trans "Next" %}</a></li>
+ <li><a href="{% url 'composer_content_page' branding=branding %}?page={{ content_results.next_page_number }}" class="content_pagination">{% trans "Next" %}</a></li>
{% else %}
<li class="disabled"><a>{% trans "Next" %}</a></li>
{% endif %}
{% if content_results.paginator.num_pages > 1 %}
- <li><a href="{% url composer_content_page branding=branding %}?page=x" class="content_pagination">({% trans "All" %})</a></li>
+ <li><a href="{% url 'composer_content_page' branding=branding %}?page=x" class="content_pagination">({% trans "All" %})</a></li>
{% endif %}
</ul>
</div>
\ No newline at end of file
--- a/src/metadatacomposer/templates/partial/resource_image_list.html Fri May 24 17:24:11 2013 +0200
+++ b/src/metadatacomposer/templates/partial/resource_image_list.html Mon May 27 13:36:54 2013 +0200
@@ -24,7 +24,7 @@
</td>
<td>{{ res.modification_date|date:"Y/m/d" }}</td>
<td>
- <a data-type-media="image" data-title="Modifier une image" class="btn open-modal" href="{% url composer_modal_image branding=branding %}?image={{ res.pk }}"><i class="icon-pencil"></i></a>
+ <a data-type-media="image" data-title="Modifier une image" class="btn open-modal" href="{% url 'composer_modal_image' branding=branding %}?image={{ res.pk }}"><i class="icon-pencil"></i></a>
<a class="btn btn-delete" data-title="Titre du média" href="#row-list-ressources-image-id1">
<i class="icon-remove"></i>
</a>
@@ -36,7 +36,7 @@
<div class="pagination">
<ul>
{% if image_results.has_previous %}
- <li><a href="{% url composer_image_page branding=branding %}?page={{ image_results.previous_page_number }}" class="image_pagination">{% trans "Previous" %}</a></li>
+ <li><a href="{% url 'composer_image_page' branding=branding %}?page={{ image_results.previous_page_number }}" class="image_pagination">{% trans "Previous" %}</a></li>
{% else %}
<li class="disabled"><a>{% trans "Previous" %}</a></li>
{% endif %}
@@ -45,17 +45,17 @@
{% if i|add:'1' == image_results.number %}
<li class="active"><a href="#">{{i|add:'1'}}</a></li>
{% else %}
- <li><a href="{% url composer_image_page branding=branding %}?page={{i|add:'1'}}" class="image_pagination">{{i|add:'1'}}</a></li>
+ <li><a href="{% url 'composer_image_page' branding=branding %}?page={{i|add:'1'}}" class="image_pagination">{{i|add:'1'}}</a></li>
{% endif %}
{% endfor %}
{% endif %}
{% if image_results.has_next %}
- <li><a href="{% url composer_image_page branding=branding %}?page={{ image_results.next_page_number }}" class="image_pagination">{% trans "Next" %}</a></li>
+ <li><a href="{% url 'composer_image_page' branding=branding %}?page={{ image_results.next_page_number }}" class="image_pagination">{% trans "Next" %}</a></li>
{% else %}
<li class="disabled"><a>{% trans "Next" %}</a></li>
{% endif %}
{% if image_results.paginator.num_pages > 1 %}
- <li><a href="{% url composer_image_page branding=branding %}?page=x" class="image_pagination">({% trans "All" %})</a></li>
+ <li><a href="{% url 'composer_image_page' branding=branding %}?page=x" class="image_pagination">({% trans "All" %})</a></li>
{% endif %}
</ul>
</div>
\ No newline at end of file