# HG changeset patch
# User veltr
# Date 1331313102 -3600
# Node ID 6397a2ca3a674d442210a4c6bd290f176639b85f
# Parent  0dd21c2983805044f284c016ee165f9a5461c95d
corrections

diff -r 0dd21c298380 -r 6397a2ca3a67 src/css/imgs/minimize.png
Binary file src/css/imgs/minimize.png has changed
diff -r 0dd21c298380 -r 6397a2ca3a67 src/js/widgets/createAnnotationWidget.js
--- a/src/js/widgets/createAnnotationWidget.js	Fri Mar 09 17:29:23 2012 +0100
+++ b/src/js/widgets/createAnnotationWidget.js	Fri Mar 09 18:11:42 2012 +0100
@@ -235,6 +235,8 @@
   this.selector.find(".Ldt-createAnnotation-screen").hide();
   this.selector.find(".Ldt-createAnnotation-errorScreen").show();
   this._state = "errorScreen";
+  var _this = this;
+  window.setTimeout(function() { _this.showStartScreen(); }, 2000);
 };
 
 /** update show the final screen with links to share the created annotation */
@@ -293,7 +295,7 @@
                       if (_this._state == "waitScreen") {
                         _this.showEndScreen(annotation);
                         if (_this.cinecast_version) {
-                          window.setTimeout(IriSP.wrap(_this, function() { this.showStartScreen(); }), 5000);
+                          window.setTimeout(function() { _this.showStartScreen(); }, 5000);
                         }
                       }
                       // hide the slicer widget
diff -r 0dd21c298380 -r 6397a2ca3a67 test/integration/allocine_dossier_independant/allocine_test/exemple_cinecast.json
--- a/test/integration/allocine_dossier_independant/allocine_test/exemple_cinecast.json	Fri Mar 09 17:29:23 2012 +0100
+++ b/test/integration/allocine_dossier_independant/allocine_test/exemple_cinecast.json	Fri Mar 09 18:11:42 2012 +0100
@@ -1,97 +1,104 @@
 {
-  	"format": "http://advene.org/ns/cinelab/",
+    "format": "http://advene.org/ns/cinelab/",
     "medias": [
-    {
-      "id": "Au- nom-du-peuple-italien", 
-      "meta": {
-        "actors": "Ugo Tognazzi, Vittorio Gassman, Ely Galleani", 
-        "directors": "Dino Risi", 
-        "duration": 120000, 
-        "nationalities": "Italie", 
-        "productionYear": "1971", 
-        "synopsis": "Un petit juge ...", 
-        "thumbnail": "http://xxxx.jpg", 
-        "title": "Au nom du peuple italien", 
-        "version": "VOST"
-      }, 
-      "url": "http://hd.fr.mediaplayer.allocine.fr/nmedia/18/86/23/92/19282986_fa3_vost_sd_001.flv"
-    }, 
-    {
-      "id": "Avatar", 
-      "meta": {
-        "duration": 120000, 
-        "thumbnail": "http://xxxx.jpg", 
-        "title": "Avatar"
-      }, 
-      "url": "http://allocine-f.akamaihd.net/nmedia/cinecast/avatar.mp4"
-    }
-  ],
-  "annotation_types": [
-    {
-      "id": "UserAnnotation", 
-      "meta": {
-        "description": "Annotation made during the Cinecast Festival."
-      }
-    }, 
-    {
-      "id": "MovieExtract", 
-      "meta": {
-        "description": "Movie Extract."
-      }
+        {
+            "id": "Au- nom-du-peuple-italien",
+            "meta": {
+                "actors": "Ugo Tognazzi, Vittorio Gassman, Ely Galleani",
+                "directors": "Dino Risi",
+                "duration": 120000,
+                "nationalities": "Italie",
+                "productionYear": "1971",
+                "synopsis": "Un petit juge ...",
+                "thumbnail": "http://xxxx.jpg",
+                "title": "Au nom du peuple italien",
+                "version": "VOST"
+            },
+            "url": "http://hd.fr.mediaplayer.allocine.fr/nmedia/18/86/23/92/19282986_fa3_vost_sd_001.flv"
+        }, {
+            "id": "Avatar",
+            "meta": {
+                "duration": 120000,
+                "thumbnail": "http://xxxx.jpg",
+                "title": "Avatar"
+            },
+            "url": "http://allocine-f.akamaihd.net/nmedia/cinecast/avatar.mp4"
+        }
+    ],
+    "annotation_types": [
+        {
+            "id": "UserAnnotation",
+            "meta": {
+                "description": "Annotation made during the Cinecast Festival."
+            }
+        }, {
+            "id": "MovieExtract",
+            "meta": {
+                "description": "Movie Extract."
+            }
+        }
+    ],
+    "annotations": [
+        {
+            "begin": 0,
+            "content": {
+                "data": "Acte 1 Sc 1"
+            },
+            "end": 10000,
+            "id": "1",
+            "media": "cinecast:Inception",
+            "meta": {
+                "created": "2012-02-15T00:00:00+01:00",
+                "creator": "VodKaster",
+                "thumbnail": "http://xxxx.jpg"
+            },
+            "type": "cinecast:MovieExtract",
+            "tags": ["cinecast:CultScene", "cinecast:CultMusic"]
+        }, {
+            "begin": 20000,
+            "content": {
+                "data": "Acte 2 Sc 2"
+            },
+            "end": 30000,
+            "id": "2",
+            "media": "cinecast:Inception",
+            "meta": {
+                "created": "2012-02-15T00:00:00+01:00",
+                "creator": "VodKaster",
+                "thumbnail": "http://xxxx.jpg"
+            },
+            "type": "cinecast:MovieExtract",
+            "tags": ["cinecast:Funny", "cinecast:CultMusic"]
+        }
+    ],
+    "tags": [
+        {
+            "id": "Funny",
+            "meta": {
+                "description": "Tain que c'est dr!"
+            }
+        }, {
+            "id": "CultScene",
+            "meta": {
+                "description": "La sc du sie !"
+            }
+        }, {
+            "id": "CultMusic",
+            "meta": {
+                "description": "Pom pom pi dom  !"
+            }
+        }
+    ],
+    "meta": {
+        "contributor": "admin",
+        "created": "2012-02-02T18:23:48.096335",
+        "creator": "admin",
+        "main_media": {
+            "id-ref": "9e6ccd47-4dc2-11e1-b6c2-c8bcc896c290"
+        },
+        "description": "",
+        "title": "front project : pj harvey - let england shake",
+        "id": "aab75563-4dc2-11e1-8cf2-c8bcc896c290",
+        "modified": "2012-02-21T11:48:56.825124"
     }
-  ], 
-  "annotations": [
-    {
-      "begin": 0, 
-      "content": {
-        "data": "Acte 1 Sc 1"
-      }, 
-      "end": 10000, 
-      "id": "1", 
-      "media": "cinecast:Inception", 
-      "meta": {
-        "created": "2012-02-15T00:00:00+01:00", 
-        "creator": "VodKaster", 
-        "thumbnail": "http://xxxx.jpg"
-      }, 
-      "type": "cinecast:MovieExtract",
-      "tags": [ "cinecast:CultScene", "cinecast:CultMusic" ]
-    }, 
-    {
-      "begin": 20000, 
-      "content": {
-        "data": "Acte 2 Sc 2"
-      }, 
-      "end": 30000, 
-      "id": "2", 
-      "media": "cinecast:Inception", 
-      "meta": {
-        "created": "2012-02-15T00:00:00+01:00", 
-        "creator": "VodKaster", 
-        "thumbnail": "http://xxxx.jpg"
-      }, 
-      "type": "cinecast:MovieExtract",
-      "tags": [ "cinecast:Funny", "cinecast:CultMusic" ]
-    }
-  ], 
-  "tags": [
-    {
-      "id": "Funny", 
-      "meta": {
-        "description": "Tain que c'est dr!"
-      }
-    }, 
-    {
-      "id": "CultScene", 
-      "meta": {
-        "description": "La sc du sie !"
-      }
-    }, 
-    {
-      "id": "CultMusic", 
-      "meta": {
-        "description": "Pom pom pi dom  !"
-      }
-    }
-  ]
-}
+}
\ No newline at end of file
diff -r 0dd21c298380 -r 6397a2ca3a67 test/integration/allocine_dossier_independant/css/LdtPlayer.css
--- a/test/integration/allocine_dossier_independant/css/LdtPlayer.css	Fri Mar 09 17:29:23 2012 +0100
+++ b/test/integration/allocine_dossier_independant/css/LdtPlayer.css	Fri Mar 09 18:11:42 2012 +0100
@@ -416,6 +416,7 @@
   height: 10px !important;
   width: 10px !important;
   bottom: 0;
+  cursor: pointer;
 }
 
 /* tweet Widget */
@@ -634,6 +635,7 @@
     width: 590px; position: relative; clear: both;
     background: url(img-cinecast/createannbgd.png) no-repeat top left;
     padding: 20px 10px 0;
+  min-height: 150px;
 }
 /* */
 
diff -r 0dd21c298380 -r 6397a2ca3a67 test/integration/allocine_dossier_independant/css/imgs/minimize.png
Binary file test/integration/allocine_dossier_independant/css/imgs/minimize.png has changed
diff -r 0dd21c298380 -r 6397a2ca3a67 test/integration/allocine_dossier_independant/js/LdtPlayer-release.js
--- a/test/integration/allocine_dossier_independant/js/LdtPlayer-release.js	Fri Mar 09 17:29:23 2012 +0100
+++ b/test/integration/allocine_dossier_independant/js/LdtPlayer-release.js	Fri Mar 09 18:11:42 2012 +0100
@@ -3317,6 +3317,8 @@
   this.selector.find(".Ldt-createAnnotation-screen").hide();
   this.selector.find(".Ldt-createAnnotation-errorScreen").show();
   this._state = "errorScreen";
+  var _this = this;
+  window.setTimeout(function() { _this.showStartScreen(); }, 2000);
 };
 
 /** update show the final screen with links to share the created annotation */
@@ -3375,7 +3377,7 @@
                       if (_this._state == "waitScreen") {
                         _this.showEndScreen(annotation);
                         if (_this.cinecast_version) {
-                          window.setTimeout(IriSP.wrap(_this, function() { this.showStartScreen(); }), 5000);
+                          window.setTimeout(function() { _this.showStartScreen(); }, 5000);
                         }
                       }
                       // hide the slicer widget
diff -r 0dd21c298380 -r 6397a2ca3a67 test/integration/allocine_dossier_independant/polemic-allocine.htm
--- a/test/integration/allocine_dossier_independant/polemic-allocine.htm	Fri Mar 09 17:29:23 2012 +0100
+++ b/test/integration/allocine_dossier_independant/polemic-allocine.htm	Fri Mar 09 18:11:42 2012 +0100
@@ -15,7 +15,7 @@
   
  <!-- START Integration  ###################################### -->
  <!-- SIMPLE PLAYER EXPERIMENTATION -->
-  <script type="text/javascript" src="/metadataplayer/build/LdtPlayer-release.js" type="text/javascript"></script>   
+  <script type="text/javascript" src="js/LdtPlayer-release.js" type="text/javascript"></script>   
   
   <div id="video"></div>
   <div id="LdtPlayer"></div>