--- a/timeline/js/timeline.js	Fri Sep 20 17:34:07 2013 +0200
+++ b/timeline/js/timeline.js	Mon Sep 23 12:42:30 2013 +0200
@@ -159,7 +159,7 @@
     api_method: "searchForTimelineEdito",
     occurrences: [],
     grid_spacing: 12,
-    tooltip_date_format: '{{dayOfMonth}} {{shortMonthName}} {{year}} {{0hours}}:{{0minutes}}',
+    tooltip_date_format: '{{dayOfMonth}} {{monthName}} {{year}} à {{0hours}}:{{0minutes}}',
     class_info: {
         "Cms\\Previously": {
             label: "Précédemment",
@@ -239,9 +239,9 @@
 
 Tlns.Templates.OccurrenceTooltip = '<h3 class="Tl-Tooltip-Title">{{title}}</h3>';
 
-Tlns.Templates.OccurrenceDetails = '<div class="Tl-Detail"><img class="Tl-Detail-Image" src="{{detail_image}}" />'
+Tlns.Templates.OccurrenceDetails = '<div class="Tl-Detail"><div class="Tl-Detail-X"></div><img class="Tl-Detail-Image" src="{{detail_image}}" />'
     + '<h2 class="Tl-Detail-Title">{{title}}</h2><p class="Tl-Detail-Description">{{detail_description}}</p>'
-    + '<div class="Tl-Detail-Bottom"><span class="Tl-Detail-Date">{{formatted_date}}</span><a class="Tl-Detail-Read" href="{{url}}" target="_blank">Lire la suite</a></div></div>';
+    + '<div class="Tl-Detail-Bottom"><span class="Tl-Detail-Date">Publié le {{formatted_date}}</span><a class="Tl-Detail-Read" href="{{url}}" target="_blank">Lire la suite</a></div></div>';
 
 /* Classes */
 
@@ -614,6 +614,15 @@
         }
     });
     
+    if (this.editing_occurrence) {
+        $(".Tl-Grid-Editing, .Tl-Detail-X").css("left", this.editing_occurrence.x);
+        if (this.editing_occurrence.date > this.end_time || this.editing_occurrence.date < this.start_time) {
+            $(".Tl-Detail-X").hide();
+        } else {
+            $(".Tl-Detail-X").show();
+        }
+    }
+    
 };
 
 Tlns.Classes.Timeline.prototype.getUnivers = function(_id) {
@@ -654,7 +663,7 @@
     this.original_data = _data;
     this.id = _data.id;
     this.date = new Date(1000 * (_data.dateFirstPublication || _data.dateCreate) || Date.now);
-    this.formatted_date = Tlns.Utils.dateFormat(this.date,Tlns.Defaults.Timeline.tooltip_date_format);
+    this.formatted_date = Tlns.Utils.dateFormat(this.date,this.timeline.tooltip_date_format);
     this.title = _data.title;
     this.type = _data.__CLASS__;
     this.importance = _data.importance;