# HG changeset patch # User cavaliet # Date 1386257202 -3600 # Node ID b7486a56ad7d1db0c8df2304a2ea78bba43cc792 # Parent 5124b8694b2448402ea6c6e9210e94fc9d8a8f53 v0.8.2 : html5 drag n drop attributes. diff -r 5124b8694b24 -r b7486a56ad7d src/egonomy/__init__.py --- a/src/egonomy/__init__.py Wed Oct 09 12:14:59 2013 +0200 +++ b/src/egonomy/__init__.py Thu Dec 05 16:26:42 2013 +0100 @@ -1,4 +1,4 @@ -VERSION = (0, 8, 1, "final", 1) +VERSION = (0, 8, 2, "final", 1) VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2]))) diff -r 5124b8694b24 -r b7486a56ad7d src/egonomy/templates/egonomy_annotate_picture.html --- a/src/egonomy/templates/egonomy_annotate_picture.html Wed Oct 09 12:14:59 2013 +0200 +++ b/src/egonomy/templates/egonomy_annotate_picture.html Thu Dec 05 16:26:42 2013 +0100 @@ -1,5 +1,6 @@ {% extends "egonomy_newbase.html" %} {% load static %} +{% load absstatic %} {% load i18n %} {% load thumbnail %} @@ -42,6 +43,11 @@
+
{% with img.info.image_file as image %} {% if image|is_portrait %} @@ -67,6 +73,7 @@ {% endif %}
+
{% if search %} {% if index_search > 0 %}
@@ -180,5 +187,11 @@ } ); }); + function onDragImage(e){ + var dt = e.dataTransfer; + var snippet = $('
').html(dt.getData("text/html")); + snippet.find("svg").remove(); + e.dataTransfer.setData("text/html", snippet.html()); + } {% endblock %} \ No newline at end of file diff -r 5124b8694b24 -r b7486a56ad7d src/egonomy/templates/egonomy_view_fragment.html --- a/src/egonomy/templates/egonomy_view_fragment.html Wed Oct 09 12:14:59 2013 +0200 +++ b/src/egonomy/templates/egonomy_view_fragment.html Thu Dec 05 16:26:42 2013 +0100 @@ -57,6 +57,9 @@
{% if search %} {% if index_search > 0 %} diff -r 5124b8694b24 -r b7486a56ad7d src/egonomy/templates/partial/fragment_in_list.html --- a/src/egonomy/templates/partial/fragment_in_list.html Wed Oct 09 12:14:59 2013 +0200 +++ b/src/egonomy/templates/partial/fragment_in_list.html Thu Dec 05 16:26:42 2013 +0100 @@ -1,7 +1,8 @@ {% load i18n %} {# we suppose here that "frg" has been defined #} {% with fragment=frg.object|default:frg %}{# frg.object in search case, frg otherwise #} - +
{% with image=fragment.image.info.image_file %} diff -r 5124b8694b24 -r b7486a56ad7d src/egonomy/templates/partial/image_in_list.html --- a/src/egonomy/templates/partial/image_in_list.html Wed Oct 09 12:14:59 2013 +0200 +++ b/src/egonomy/templates/partial/image_in_list.html Thu Dec 05 16:26:42 2013 +0100 @@ -2,7 +2,8 @@ {% load i18n %} {% load thumbnail %} {# we suppose here that "img" has been defined #} - +
{% with img.info.image_file as image %} {% if image %} diff -r 5124b8694b24 -r b7486a56ad7d src/egonomy/templates/partial/item_in_collection_geographical.html --- a/src/egonomy/templates/partial/item_in_collection_geographical.html Wed Oct 09 12:14:59 2013 +0200 +++ b/src/egonomy/templates/partial/item_in_collection_geographical.html Thu Dec 05 16:26:42 2013 +0100 @@ -4,14 +4,16 @@
  • {% ifequal item.content_type.model "fragment" %} {% with fragment=item.content_object %} - -
  • {% with fragment=item.content_object %}
    - -