--- a/timeline/js/timeline.js Mon Aug 19 12:54:37 2013 +0200
+++ b/timeline/js/timeline.js Mon Aug 19 18:04:32 2013 +0200
@@ -126,7 +126,7 @@
span : 7 * 86400 * 1000,
grid_interval : 86400 * 1000,
grid_date_format : '{{dayOfMonth}} {{monthName}}',
- min_importance : 1
+ min_importance : 0
}, {
label : "3 jours",
span : 3 * 86400 * 1000,
@@ -171,7 +171,8 @@
"Cms\\Video": "Vidéo",
"Cms\\SweetCadaver": "Cadavre exquis"
},
- maxtime: false
+ maxtime: false,
+ url_base: ""
}
for (var _i = 0; _i < Tlns.Defaults.Timeline.timescales.length; _i++) {
@@ -185,6 +186,7 @@
+ '<div class="Tl-MainPart"><div class="Tl-Occurrences"></div>'
+ '</div>'
+ '<div class="Tl-Overlay-Container"><div class="Tl-Overlay-Box"><div class="Tl-Overlay"><div class="Tl-Overlay-Tip-Top"></div><div class="Tl-Overlay-Main"></div><div class="Tl-Overlay-Tip-Bottom"></div></div></div></div></div></div>'
+ + '<div class="Tl-Details"></div>'
Tlns.Templates.Univers = '<div class="Tl-UniversText">{{title}}</div>';
@@ -197,6 +199,10 @@
+ '<p class="Tl-Tooltip-Description">{{description}}</p>'
// + '<p class="Tl-Tooltip-Characters">{{univers.mainCharacter}}{{#characters}}, {{.}}{{/characters}}</p>'
+Tlns.Templates.OccurrenceDetails = '<div class="Tl-Detail"><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>';
+
/* Classes */
Tlns.Classes.Timeline = function(_options) {
@@ -516,6 +522,7 @@
_occ.editing = false;
});
_this.editing_occurrence.editing = true;
+ _this.$.find(".Tl-Details").html(Mustache.to_html(Tlns.Templates.OccurrenceDetails, _this.editing_occurrence));
}
_this.throttledDrawGrid();
}
@@ -620,13 +627,17 @@
this.format = this.timeline.class_labels[this.type];
if (_data.contentHasMedias && _data.contentHasMedias.length) {
this.image = _data.contentHasMedias[0].media.cinema.replace(/cinema\/[\d]+\/[\d]+/,'cinema/85/38');
+ this.detail_image = _data.contentHasMedias[0].media.carre.replace(/carre\/[\d]+\/[\d]+/,'carre/135/135');
}
this.translated_status = Tlns.Defaults.Timeline.statuses[this.status];
// this.published = (_data.publication && _data.publication == "En ligne");
// this.locked = _data.verrouille || false;
// this.characters = _data.personnagesSecondaires || [];
var _tmp = $('<p>').html(_data.resume || "");
- this.description = _tmp.text().trim().replace(/(\n|\r|\r\n)/mg,' ').replace(/(^.{60,80})[\s].+$/m,'$1…');
+ var trimmedDesc = _tmp.text().trim().replace(/(\n|\r|\r\n)/mg,' ');
+ this.description = trimmedDesc.replace(/(^.{60,80})[\s].+$/m,'$1…');
+ this.detail_description = trimmedDesc.replace(/(^.{360,380})[\s].+$/m,'$1…');
+ this.url = this.timeline.url_base + _data.url;
}
Tlns.Classes.Occurrence.prototype.addDependency = function(_id) {