--- a/src/egonomy/__init__.py Fri Jun 28 10:51:35 2013 +0200
+++ b/src/egonomy/__init__.py Fri Jun 28 11:23:42 2013 +0200
@@ -1,4 +1,4 @@
-VERSION = (0, 6, 3, "final", 1)
+VERSION = (0, 6, 4, "final", 1)
VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2])))
--- a/src/egonomy/templates/partial/item_in_collection_list.html Fri Jun 28 10:51:35 2013 +0200
+++ b/src/egonomy/templates/partial/item_in_collection_list.html Fri Jun 28 11:23:42 2013 +0200
@@ -34,7 +34,7 @@
<h3>{{ fragment.title }}</h3>
<h4>{{ fragment.author }}</h4>
</div>
- <p>desc : {{ item.description }}</p>
+ <p>{{ item.description }}</p>
</div>
{% endwith %}
</li>
@@ -77,7 +77,7 @@
<li>{% if user.is_authenticated %}
<a class="tool plus open-popin additemtocollection" data-type="image" data-id="{{ img.id }}" href="#add-to-collection" title="{% trans 'Add to a collection' %}"></a>
{% else %}
- <a class="tool plus" href="{% url 'login' %}?next={% url 'annotation_picture' image_id=img.id %}" title="{% trans 'Add to a collection' %}"></a>
+ <a class="tool plus" href="{% url 'login' %}?next={% url 'annotate_picture' image_id=img.id %}" title="{% trans 'Add to a collection' %}"></a>
{% endif %}</li>
<li><a class="tool cut" href="{% url 'create_fragment' image_id=img.id %}" title="{% trans 'Create a fragment'%}"></a></li>
<li><a title="Supprimer" class="tool trash" href="#"></a></li>
@@ -90,7 +90,7 @@
<h3>{{ img.metadata.titre }}</h3>
<h4>{{ img.metadata.auteur }}</h4>
</div>
- <p>desc : {{ item.description }}</p>
+ <p>{{ item.description }}</p>
</div>
</li>
{% endwith %}
--- a/src/egonomy/templates/partial/item_in_collection_mosaic.html Fri Jun 28 10:51:35 2013 +0200
+++ b/src/egonomy/templates/partial/item_in_collection_mosaic.html Fri Jun 28 11:23:42 2013 +0200
@@ -38,7 +38,7 @@
<h3>{{ fragment.title }}</h3>
<h4>{{ fragment.author }}</h4>
</div>
- <p>desc : {{ item.description }}<br/>contenttype : {{ item.content_type.model }}<br/>object_id : {{ item.object_id }}<br/>content_object : {{ item.content_object }}</p>
+ <p>{{ item.description }}</p>
</div>
{% endwith %}
{% else %}
@@ -66,7 +66,7 @@
<li>{% if user.is_authenticated %}
<a class="tool plus open-popin additemtocollection" data-type="image" data-id="{{ img.id }}" href="#add-to-collection" title="{% trans 'Add to a collection' %}"></a>
{% else %}
- <a class="tool plus" href="{% url 'login' %}?next={% url 'annotation_picture' image_id=img.id %}" title="{% trans 'Add to a collection' %}"></a>
+ <a class="tool plus" href="{% url 'login' %}?next={% url 'annotate_picture' image_id=img.id %}" title="{% trans 'Add to a collection' %}"></a>
{% endif %}</li>
<li><a class="tool cut" href="{% url 'create_fragment' image_id=img.id %}" title="{% trans 'Create a fragment'%}"></a></li>
<li><a title="Supprimer" class="tool trash" href="#"></a></li>
@@ -78,7 +78,7 @@
<h3>{{ img.metadata.titre }}</h3>
<h4>{{ img.metadata.auteur }}</h4>
</div>
- <p>desc : {{ item.description }}<br/>contenttype : {{ item.content_type.model }}<br/>object_id : {{ item.object_id }}<br/>content_object : {{ item.content_object }}</p>
+ <p>{{ item.description }}</p>
</div>
{% endwith %}
{% endwith %}