eulalie: comparison timeline/js/timeline.js

Mercurial Mercurial > eulalie / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

timeline/js/timeline.js

changeset 95	907a53a35a95
parent 94	bf8879a6470e
child 96	7d1c2c21d891

equal deleted inserted replaced

-:bf8879a6470e
+:907a53a35a95
 Tlns.Templates.Timeline = '<div class="Tl-Main"><div class="Tl-Grid"></div><div class="Tl-TopBar"></div>'
 + '<div class="Tl-BottomPart"><ul class="Tl-UniversLabels"></ul>'
 + '<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-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></div></div></div></div>'
 + '<div class="Tl-Details"></div>'
 Tlns.Templates.Univers = '<div class="Tl-UniversText">{{title}}</div>';
 Tlns.Templates.Occurrence =
 '{{#occurrences}}<div class="Tl-Occurrence Tl-OccOnGrid Tl-Occ{{type}} Tl-Occ{{status}}{{#editing}} Tl-Editing{{/editing}}" occurrence-id="{{id}}" style="left: {{x}}px; top: {{y}}px;">'
 + '{{#image}}<img src="{{image}}" />{{/image}}'
 + '</div>{{/occurrences}}';
-Tlns.Templates.OccurrenceTooltip = '<h3 class="Tl-Tooltip-Title">{{title}}</h3><p class="Tl-Tooltip-Date">{{formatted_date}} &mdash; {{translated_status}} &mdash; {{format}}</p>'
+Tlns.Templates.OccurrenceTooltip = '<h3 class="Tl-Tooltip-Title">{{title}}</h3>';
-+ '<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>';
 _occurrence = this.getOccurrence(_id);
 switch (_data.__CLASS__) {
 case "Cms\\Previously":
 case "Cms\\Chapter":
 case "Cms\\Article":
+case "Cms\\Video":
 case "Cms\\Poll":
+case "Cms\\Rule":
 case "Cms\\CallWitness":
 case "Cms\\CallCharacter":
 case "Cms\\SweetCadaver":
 if (typeof _occurrence === "undefined") {
 _occurrence = new Tlns.Classes.Occurrence(this);
 break;
 }
 return _occurrence;
 }
-Tlns.Classes.Timeline.prototype.showTooltip = function(_x, _y, _html, _isUp) {
+Tlns.Classes.Timeline.prototype.showTooltip = function(_x, _y, _html) {
 this.$.find('.Tl-Overlay-Box')
-.removeClass(_isUp ? 'Tl-Overlay-Down' : 'Tl-Overlay-Up')
-.addClass(_isUp ? 'Tl-Overlay-Up' : 'Tl-Overlay-Down')
 .show()
 .css({
 left: _x + "px",
 top: _y + "px"
 });
 var _this = this;
 _(this.occurrences).each(function(_occ) {
 _occ.x = _this.current_scale * (_occ.date - _this.start_time);
 _occ.y = _occ.univers.y;
 });
-var minT = this.timeFromX(-85),
+var minT = this.timeFromX(-38),
 minI = this.timescales[this.level].min_importance;
 var _visible = _(this.occurrences).filter(function(_occ) {
 return (_occ.date >= minT && _occ.date <= _this.end_time  && _occ.status && (_occ.importance >= minI));
 });
 var _el = $(this),
 _id = _el.attr("occurrence-id");
 if (typeof _id !== "undefined") {
 var _occurrence = _this.getOccurrence(_id);
 if (!_this.is_dragging) {
-var _html = Mustache.to_html(Tlns.Templates.OccurrenceTooltip, _occurrence),
+var _html = Mustache.to_html(Tlns.Templates.OccurrenceTooltip, _occurrence);
-isup = (_event.pageY - _this.dragging_bounds.top) >= (.4 * _this.main_height);
+_this.showTooltip(_occurrence.x + 19, _occurrence.y + 20, _html);
-_this.showTooltip(_occurrence.x + 42, _occurrence.y + (isup ? 10 : 20), _html,  isup);
 }
 }
 }).mouseout(function() {
 var _el = $(this),
 _id = _el.attr("occurrence-id");
 this.type = _data.__CLASS__;
 this.importance = _data.importance;
 switch(_data.__CLASS__) {
 case "Cms\\Previously":
 case "Cms\\Chapter":
+case "Cms\\Video":
 this.univers_id = 0;
 break;
 case "Cms\\Article":
 this.univers_id = 1;
 break;
 case "Cms\\Poll":
+case "Cms\\Rule":
 case "Cms\\CallWitness":
-case "Cms\\CallCharacter":
 this.univers_id = 2;
 break;
+case "Cms\\CallCharacter":
 case "Cms\\SweetCadaver":
 this.univers_id = 3;
 break;
 }
 this.univers = this.timeline.univers[this.univers_id];
 this.status = "a_valider";
 }
 }
 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.image = _data.contentHasMedias[0].media.carre.replace(/carre\/[\d]+\/[\d]+/,'carre/38/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;

eulalie