Merge branch 'production'

nanounanue · Apr 20, 2011 · c1c0ade · c1c0ade
2 parents f76aeef + 16430e5
commit c1c0ade
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/app/views/votes/_vote.html.haml b/app/views/votes/_vote.html.haml
@@ -34,7 +34,7 @@
       %span.other-votes.rounded= vote.other_count.round
       %span.small-label other votes
 
-    .vote-bar.grid_8.alpha
+    .vote-bar.grid_8.alpha{:'data-vote-count' => vote.total_count}
       %span{:class => 'vote-yes-block', :style => "width: #{vote.yes_pct}%;"} &nbsp;
       %span{:class => 'vote-no-block', :style => "width: #{vote.no_pct}%;"} &nbsp;
       %span{:class => 'vote-other-block', :style => "width: #{vote.other_pct}%;"} &nbsp;

diff --git a/public/javascripts/application.js b/public/javascripts/application.js
@@ -106,6 +106,18 @@ $(document).ready(function() {
     }
   );
 
+  // On pages with votes, resize the vote bar to show votes relative to one another.
+  if ($('.vote-bar')) {
+    vote_counts = $('.vote-bar').map(function () { return $(this).data('vote-count'); });
+
+    max_vote_count = 0
+    vote_counts.each(function () { if (this > max_vote_count) { max_vote_count = this; } });
+
+    $('.vote-bar').each(function () {
+      $(this).width( (($(this).data('vote-count') / max_vote_count) * 100).toString() + "%" );
+    });
+  }
+
 });
 
 function replaceURLWithHTMLLinks(text) {