diff --git a/app/assets/images/timeline/date_connector.png b/app/assets/images/timeline/date_connector.png new file mode 100644 index 000000000..66ee903b6 Binary files /dev/null and b/app/assets/images/timeline/date_connector.png differ diff --git a/app/assets/images/timeline/ruler.png b/app/assets/images/timeline/ruler.png new file mode 100644 index 000000000..35f38afa6 Binary files /dev/null and b/app/assets/images/timeline/ruler.png differ diff --git a/app/assets/javascripts/orbitTimeline.js b/app/assets/javascripts/orbitTimeline.js index 46beffc36..cc85edb29 100644 --- a/app/assets/javascripts/orbitTimeline.js +++ b/app/assets/javascripts/orbitTimeline.js @@ -63,12 +63,12 @@ var orbitTimeline = function(dom){ t.events.push(bubbleData); if(cur_year != year){ year = cur_year; - scale.append($("
"+(year+1)+"
")); + scale.append($("
"+(year+1)+"
")); } if(cur_mon != mon){ mon = cur_mon; var yr = scale.find("div[data-content="+year+"]"); - yr.append($("
"+t.monthList[parseInt(formname)]+"
")) + yr.append($("
"+t.monthList[parseInt(formname)]+"
")) } }); }); @@ -78,6 +78,7 @@ var orbitTimeline = function(dom){ callbackFn.call(this,scale); } }) + } this.makeBubble = function(bubbleData){ var totalul = $("#scale_wrapper").find("div[data-content="+bubbleData.timestamp+"] ul").length; @@ -95,7 +96,7 @@ var orbitTimeline = function(dom){ } } var bt = (bubbleData.title.length > 70? bubbleData.title.substr(0,70) + "..." : bubbleData.title); - var bubble = $("
  • "+bt+" - "+bubbleData.fulldate+"
  • "); + var bubble = $("
  • "+bt+""+bubbleData.fulldate+"
  • "); targetul.prepend(bubble); bubble.show(); bubble.click(function(){ diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktopmain.css index 6dfd69d23..f997db40b 100644 --- a/app/assets/stylesheets/desktopmain.css +++ b/app/assets/stylesheets/desktopmain.css @@ -728,7 +728,7 @@ a:focus { outline: none; } } /* Timeline */ -#orbit .holder .admbg { +#orbit #holder > .admbg { background-color: #efefef; } diff --git a/app/assets/stylesheets/orbitTimeline.css b/app/assets/stylesheets/orbitTimeline.css deleted file mode 100644 index 32c1bbb1c..000000000 --- a/app/assets/stylesheets/orbitTimeline.css +++ /dev/null @@ -1,47 +0,0 @@ -.t_scale{ - height: 516px; -} -#scale_wrapper { - overflow: hidden; -} -#timline_marker{ - width:100px; - height:140px; - opacity:0.4; - cursor: move; - border-style:solid; - border-width:5px; - border-radius:5px; -} -#t_container{ - height:366px; -} -.scale_region { -} -.group { - margin-right: 48px; -} -.month{ - -} -.year{ -} -.bubble{ - cursor: pointer; - width:300px; - float: left; - font-size:15px; - display: none; -} -.month_heading{ - color: #333; - font-family: 'Open sans', sans-serif; - font-size: 21px; - background-color: #efefef; -} - -.bubble_list ul{ - float:left; - width: 300px; - height: 440px; -} \ No newline at end of file diff --git a/app/assets/stylesheets/orbitTimeline.css.erb b/app/assets/stylesheets/orbitTimeline.css.erb new file mode 100644 index 000000000..6a0042a1d --- /dev/null +++ b/app/assets/stylesheets/orbitTimeline.css.erb @@ -0,0 +1,55 @@ +.t_scale { + height: 516px; + background: 0 0 url(<%= asset_path "timeline/ruler.png" %>) repeat-x; +} +#scale_wrapper { + overflow: hidden; + padding: 36px 0 0 12px; + background: 0 60px url(<%= asset_path "timeline/date_connector.png" %>) repeat-x; +} +#timline_marker { + width:100px; + height:140px; + opacity:0.4; + cursor: move; + border-style:solid; + border-width:5px; + border-radius:5px; +} +#t_container { + height:366px; +} +.scale_region { +} +.group { + margin-right: 48px; +} +.month {} +.year { + font-size: 30px; + margin-right: 24px; + border-right: solid 12px #efefef; +} +.month_heading { + color: #333; + font-family: 'Open sans', sans-serif; + font-size: 21px; + background-color: #efefef; + display: inline-block; +} + +.bubble_list ul { + float:left; + width: 324px; + height: 440px; + margin-right: 12px; +} +.bubble { + cursor: pointer; + width: 300px; + height: 50px; + float: left; + font-size: 12px; + font-family: Arial, sans-serif; + margin-bottom: 12px; +} \ No newline at end of file