From 4e4829c5cc739af00d57b805005e6784a4a93429 Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Sun, 24 Jun 2012 12:59:58 +0200 Subject: [PATCH 1/2] Remove trailing whitespaces --- app/helpers/chart_helper.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/helpers/chart_helper.rb b/app/helpers/chart_helper.rb index ea136147c1d..9fb01b46b10 100644 --- a/app/helpers/chart_helper.rb +++ b/app/helpers/chart_helper.rb @@ -34,7 +34,7 @@ def downloads_over_time_chart(versions, days_ago = 90) end image_tag(chart.to_url(:chf => 'bg,s,FFFFFF00'), :alt => 'title') end - + def downloads_over_time_labels [60, 40, 20, 0].map { |t| t.days.ago.to_date } end @@ -49,9 +49,9 @@ def downloads_over_time(versions, days_ago = 90) counts << count end { - :slug => version.slug, - :counts => counts.reverse, - :color => color_from_cycle(idx, versions.size) + :slug => version.slug, + :counts => counts.reverse, + :color => color_from_cycle(idx, versions.size) } end end From eea22e18c56fdf8edc1989b33dfb450d56190495 Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Sun, 24 Jun 2012 13:22:41 +0200 Subject: [PATCH 2/2] Fix date label intervals on download charts. Closes #418 --- app/helpers/chart_helper.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/helpers/chart_helper.rb b/app/helpers/chart_helper.rb index 9fb01b46b10..be5fb4042c8 100644 --- a/app/helpers/chart_helper.rb +++ b/app/helpers/chart_helper.rb @@ -26,7 +26,7 @@ def downloads_over_time_chart(versions, days_ago = 90) range = [0, max] lc.axis :y, :range => range - lc.axis :x, :labels => downloads_over_time_labels + lc.axis :x, :labels => downloads_over_time_labels(days_ago) lc.grid :x_step => 100.0 / 12.0, :y_step => 100.0 / 15.0, :length_segment => 1, @@ -35,8 +35,8 @@ def downloads_over_time_chart(versions, days_ago = 90) image_tag(chart.to_url(:chf => 'bg,s,FFFFFF00'), :alt => 'title') end - def downloads_over_time_labels - [60, 40, 20, 0].map { |t| t.days.ago.to_date } + def downloads_over_time_labels(days_ago = 90) + [days_ago, days_ago*2/3, days_ago/3, 0].map { |t| t.days.ago.to_date } end def downloads_over_time(versions, days_ago = 90)