# HG changeset patch
# User cavaliet
# Date 1352741995 -3600
# Node ID 16cc07633339bc12412d203cbf908197cbb6a43c
# Parent  a227bbd1d2c7430150d057d6ef9e1d85e865c5df# Parent  170da3907040476932f14daf873b23f2d9ef691d
Merge with 170da3907040476932f14daf873b23f2d9ef691d

diff -r 170da3907040 -r 16cc07633339 src/ldt/ldt/ldt_utils/projectserializer.py
--- a/src/ldt/ldt/ldt_utils/projectserializer.py	Mon Nov 12 16:22:33 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/projectserializer.py	Mon Nov 12 18:39:55 2012 +0100
@@ -239,10 +239,10 @@
 
                 if not element_tags:
                     element_tags = None
-                    
+                
                 new_annotation = {
-                    "begin": int(element_begin),
-                    "end": int(element_begin) + int(element_duration),
+                    "begin": int(float(element_begin)),
+                    "end": int(float(element_begin)) + int(float(element_duration)),
                     "id": element_id,
                     "media": element_media,
                     "color": element_color,
@@ -320,7 +320,7 @@
             ensemble_node = cutting_node.xpath('..')[0]
             content_node = ensemble_node.xpath('..')[0]
             iri_id = content_node.get("id")
-            content = Content.objects.get(iri_id=iri_id)            
+            content = Content.objects.get(iri_id=iri_id)
             self.__parse_ensemble(ensemble_node, content, cutting_only=[cutting_node])
             
         
@@ -455,7 +455,7 @@
         
         self.views_dict['test'] = new_display
         
-        if self.serialize_contents:        
+        if self.serialize_contents:
             res = doc.xpath("/iri/body/ensembles/ensemble")
             for ensemble_node in res:
                 self.__parse_ensemble(ensemble_node, content)
diff -r 170da3907040 -r 16cc07633339 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html
diff -r 170da3907040 -r 16cc07633339 src/ldt/ldt/ldt_utils/utils.py
--- a/src/ldt/ldt/ldt_utils/utils.py	Mon Nov 12 16:22:33 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/utils.py	Mon Nov 12 18:39:55 2012 +0100
@@ -102,8 +102,8 @@
             for content in contentList:
                 contentd = lxml.etree.SubElement(display, "content")
                 contentd.set(u"id", content.iri_id)
-                __, content = request_with_auth(content.iri_url())
-                filepath = StringIO(content)
+                __, content_str = request_with_auth(content.iri_url())
+                filepath = StringIO(content_str)
             
                 udoc = lxml.etree.parse(filepath)
                 res = udoc.xpath("/iri/body/ensembles/ensemble/decoupage")
diff -r 170da3907040 -r 16cc07633339 src/ldt/ldt/ldt_utils/views/workspace.py
diff -r 170da3907040 -r 16cc07633339 src/ldt/ldt/locale/fr/LC_MESSAGES/django.mo
Binary file src/ldt/ldt/locale/fr/LC_MESSAGES/django.mo has changed
diff -r 170da3907040 -r 16cc07633339 src/ldt/ldt/static/ldt/js/projectscontents.js