Merge jdong

[selectricity] / app / views / quickvote / results.rhtml

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index 9727d81289e6690597f298f4d5a0d8bb4a545e5e..0383b5e4434c0acfba9b9e391b16e463687b91b5 100644 (file)
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -27,14 +27,17 @@
 
 <h2>Winners</h2>
 
 
 <h2>Winners</h2>
 

+<div class="mainresultbox">

 <%= render :partial => 'result_' + @election.election_method,
            :object => @results[@election.election_method] %>
 <%= render :partial => 'result_' + @election.election_method,
            :object => @results[@election.election_method] %>

-
+</div>

 
 <h3> Other Voting Methods </h3>
 <% for result_type in @election.other_methods %>
 
 <h3> Other Voting Methods </h3>
 <% for result_type in @election.other_methods %>

+<div class="resultbox">

 <%= render :partial => 'result_' + result_type, 
            :object => @results[result_type] %>
 <%= render :partial => 'result_' + result_type, 
            :object => @results[result_type] %>

+</div>

 <% end %>
 
 
 <% end %>
 
 


@@ -75,10 +78,8 @@
 <% end %>
 </table>
 
 <% end %>
 </table>
 

-<%= render :partial => 'pref_tables' %>
-

 <%=image_tag( graph_url( :action => 'votes_per_interval', :id => @election ))%>
 <br />
 <%=image_tag( graph_url( :action => 'votes_per_interval', :id => @election ))%>
 <br />

-<%= image_tag( graph_url( :action => 'borda_bar', :id => @election ) ) %><br />
+

 <%= image_tag( graph_url( :action => 'choices_positions', :id => @election ) ) %><br />
 <%= image_tag( graph_url( :action => 'choices_positions', :id => @election ) ) %><br />

-<%= image_tag(graph_url( :action => 'plurality_pie', :id => @election ) )%>
+