From d478efdd011f395d89cc6ab8903fdbe853bc90ab Mon Sep 17 00:00:00 2001 From: Katrina Owen Date: Thu, 28 Feb 2013 22:26:57 -0500 Subject: [PATCH] Move font calculation into tag cloud --- app/models/stats/tag_cloud.rb | 12 ++++++++++-- app/views/stats/_tags.html.erb | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/models/stats/tag_cloud.rb b/app/models/stats/tag_cloud.rb index 1d9a1c42..400400e4 100644 --- a/app/models/stats/tag_cloud.rb +++ b/app/models/stats/tag_cloud.rb @@ -10,10 +10,20 @@ module Stats @levels = 10 end + def empty? + tags.empty? + end + + def font_size(tag) + (9 + 2*(tag.count.to_i-min)/divisor) + end + def tags @tags ||= top_tags end + private + def max @max ||= tag_counts.max end @@ -30,8 +40,6 @@ module Stats @divisor ||= ((max - min) / levels) + 1 end - private - def tag_counts @tag_counts ||= tags.map {|t| t.count.to_i} end diff --git a/app/views/stats/_tags.html.erb b/app/views/stats/_tags.html.erb index df4c763b..e512c4e2 100755 --- a/app/views/stats/_tags.html.erb +++ b/app/views/stats/_tags.html.erb @@ -8,7 +8,7 @@ else tag_cloud.tags.each do |t| %> <%= link_to t.name, tag_path(t.name), { - :style => "font-size: " + (9 + 2*(t.count.to_i-tag_cloud.min)/tag_cloud.divisor).to_s + "pt", + :style => "font-size: " + "#{tag_cloud.font_size(t)}pt", :title => t.count.to_s+" #{t('common.actions_midsentence', :count => t.count)}"} -%> <% end