# HG changeset patch # User veltr # Date 1379932950 -7200 # Node ID abead2de633240910551c39797c939852fea61ff # Parent 0444ad28e6ba251abe544ea27442d1bbe8a7f17a Some fixes diff -r 0444ad28e6ba -r abead2de6332 timeline/css/timeline.css --- a/timeline/css/timeline.css Fri Sep 20 17:34:07 2013 +0200 +++ b/timeline/css/timeline.css Mon Sep 23 12:42:30 2013 +0200 @@ -29,7 +29,8 @@ .Tl-UniversLabels { list-style: none; margin: 0; padding: 0; border: none; - font-size: 13px; width: 54px; float: left; height: 100%; + font-size: 15px; width: 54px; float: left; height: 100%; + font-family: 'goudy_old_styleregular'; color: #999999; } .Tl-UniversLabels li { @@ -83,7 +84,7 @@ } .Tl-Grid-Editing { - position: absolute; top: 0; bottom: -20px; margin-left: -1px; width: 2px; background: #c00000; + position: absolute; top: 0; bottom: -20px; margin-left: -2px; width: 2px; background: #c00000; } .Tl-Occurrence { @@ -139,8 +140,8 @@ /**************/ .Tl-Detail { - border: 1px solid #cccccc; margin: 10px 36px 0 54px; padding: 10px; text-align: left; - min-height: 135px; font-size: 12px; + border: 1px solid #cccccc; margin: 15px 36px 0 54px; padding: 10px; text-align: left; + min-height: 135px; font-size: 12px; position: relative; } .Tl-Detail-Image { @@ -148,15 +149,15 @@ } .Tl-Detail-Title { - font-size: 18px; font-weight: bold; margin-left: 145px; + font-size: 18px; font-weight: bold; margin-left: 145px; font-family: 'goudy_old_styleregular'; } .Tl-Detail-Description { - margin: 5px 0 5px 145px; + margin: 5px 0 20px 145px; } .Tl-Detail-Bottom { - margin-left: 145px; text-align: right; + position: absolute; left: 155px; right: 10px; bottom: 10px; text-align: right; } .Tl-Detail-Date { @@ -171,6 +172,11 @@ text-decoration: underline; } +.Tl-Detail-X { + position: absolute; top: -20px; color: #f00; margin-left: -8px; + width: 11px; height: 25px; background: url(../img/detail-cross.png) bottom; +} + .Tl-Slider-Container { width: 36px; float: left; height: 100%; } diff -r 0444ad28e6ba -r abead2de6332 timeline/fonts/GoudyOldStyleRegular/goudyoldstylet-regular-webfont.eot Binary file timeline/fonts/GoudyOldStyleRegular/goudyoldstylet-regular-webfont.eot has changed diff -r 0444ad28e6ba -r abead2de6332 timeline/fonts/GoudyOldStyleRegular/goudyoldstylet-regular-webfont.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/timeline/fonts/GoudyOldStyleRegular/goudyoldstylet-regular-webfont.svg Mon Sep 23 12:42:30 2013 +0200 @@ -0,0 +1,240 @@ + + + \ No newline at end of file diff -r 0444ad28e6ba -r abead2de6332 timeline/fonts/GoudyOldStyleRegular/goudyoldstylet-regular-webfont.ttf Binary file timeline/fonts/GoudyOldStyleRegular/goudyoldstylet-regular-webfont.ttf has changed diff -r 0444ad28e6ba -r abead2de6332 timeline/fonts/GoudyOldStyleRegular/goudyoldstylet-regular-webfont.woff Binary file timeline/fonts/GoudyOldStyleRegular/goudyoldstylet-regular-webfont.woff has changed diff -r 0444ad28e6ba -r abead2de6332 timeline/fonts/GoudyOldStyleRegular/stylesheet.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/timeline/fonts/GoudyOldStyleRegular/stylesheet.css Mon Sep 23 12:42:30 2013 +0200 @@ -0,0 +1,15 @@ +/* Generated by Font Squirrel (http://www.fontsquirrel.com) on June 11, 2013 */ + + + +@font-face { + font-family: 'goudy_old_styleregular'; + src: url('goudyoldstylet-regular-webfont.eot'); + src: url('goudyoldstylet-regular-webfont.eot?#iefix') format('embedded-opentype'), + url('goudyoldstylet-regular-webfont.woff') format('woff'), + url('goudyoldstylet-regular-webfont.ttf') format('truetype'), + url('goudyoldstylet-regular-webfont.svg#goudy_old_styleregular') format('svg'); + font-weight: normal; + font-style: normal; + +} \ No newline at end of file diff -r 0444ad28e6ba -r abead2de6332 timeline/img/detail-cross.png Binary file timeline/img/detail-cross.png has changed diff -r 0444ad28e6ba -r abead2de6332 timeline/js/timeline.js --- 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 = ''; -Tlns.Templates.OccurrenceDetails = '

' +Tlns.Templates.OccurrenceDetails = '

' + '

' - + '

{{formatted_date}}Lire la suite

'; + + '

Publié le {{formatted_date}}Lire la suite

'; /* 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; diff -r 0444ad28e6ba -r abead2de6332 timeline/local-data.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/timeline/local-data.html Mon Sep 23 12:42:30 2013 +0200 @@ -0,0 +1,49 @@ + + + + + + Tests Timeline + + + + + + + + + + + + + + + + + +

Tests Timeline

+ + diff -r 0444ad28e6ba -r abead2de6332 timeline/timeline.html --- a/timeline/timeline.html Fri Sep 20 17:34:07 2013 +0200 +++ b/timeline/timeline.html Mon Sep 23 12:42:30 2013 +0200 @@ -7,6 +7,7 @@ +

{{title}}

{{title}}

Tests Timeline