# HG changeset patch # User veltr # Date 1368709382 -7200 # Node ID e5feaa369cccf7037b93303df628fa147c4d9a9b # Parent 34df8e58b6fcb5da8f719257bdd2e1110bdfd9b0# Parent e3d551eda5a6da3f2d82e801b84b4af947c43645 Merge with e3d551eda5a6da3f2d82e801b84b4af947c43645 diff -r e3d551eda5a6 -r e5feaa369ccc integration/data/empty-project.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/integration/data/empty-project.json Thu May 16 15:03:02 2013 +0200 @@ -0,0 +1,61 @@ +{ + "views": [], + "tags": [], + "lists": [], + "medias": [ + { + "origin": "0", + "url": "http://www.iri.centrepompidou.fr/dev/~veltr/mashup/moon/melies.webm", + "http://advene.liris.cnrs.fr/ns/frame_of_reference/ms": "o=0", + "meta": { + "dc:contributor": "IRI", + "item": { + "name": "streamer", + "value": "rtmp://media.iri.centrepompidou.fr/ddc_player/" + }, + "dc:created": "2011-02-14T15:06:34.829919", + "dc:duration": 674000, + "dc:creator": "IRI", + "dc:created.contents": "2012-02-13", + "dc:title": "Méliès - Le Voyage dans la Lune", + "dc:creator.contents": "IRI", + "dc:modified": "2012-02-13T11:55:23.898905", + "dc:description": "Méliès - Le Voyage dans la Lune" + }, + "id": "9a493932-3053-11e0-862b-00145ea49a02", + "unit": "ms" + } + ], + "meta": { + "dc:contributor": "admin", + "dc:created": "2011-02-14T15:15:52.602502", + "dc:creator": "admin", + "main_media": { + "id-ref": "9a493932-3053-11e0-862b-00145ea49a02" + }, + "dc:description": "", + "dc:title": "Nouveau projet", + "id": "13b0aa52-336b-11e0-b233-00145ea49a02", + "dc:modified": "2012-04-29T15:41:55.858453" + }, + "annotations": [], + "annotation-types": [ + { + "dc:contributor": "perso", + "dc:creator": "perso", + "dc:title": "Chapitrage", + "id": "c_E0FF6CF0-B8E9-8432-8B92-293EFFFFA827", + "dc:created": "2012-05-07T10:11:06.721324", + "dc:description": "Chapitrage", + "dc:modified": "2012-05-07T10:11:06.721324" + }, { + "dc:contributor": "perso", + "dc:creator": "perso", + "dc:title": "Annotations", + "id": "16b010ab-9050-4d8d-8082-3803031b0499", + "dc:created": "2012-05-07T10:11:06.746777", + "dc:description": "Annotations", + "dc:modified": "2012-05-07T10:11:06.746777" + } + ] +} \ No newline at end of file diff -r e3d551eda5a6 -r e5feaa369ccc integration/edition.html --- a/integration/edition.html Thu May 16 14:00:50 2013 +0200 +++ b/integration/edition.html Thu May 16 15:03:02 2013 +0200 @@ -56,7 +56,7 @@
+
@@ -440,8 +440,44 @@
-
+
+
+
+
-
+
+