refactored the results page

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

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index c45fd2a5f147478a0edabd86f16b79908adc2163..f4f6f2d812aa93e98ad46c453d728a7c9900a79d 100644 (file)
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -1,6 +1,6 @@
 <% require 'whois/whois' %>
 
-<div id="page-title">
+<div id="title-header">
   <span class="header">Quickvote</span>
   <span class="subheader">Results</span>
 </div>
@@ -28,33 +28,25 @@
      <%= @election.voters.reject {|v| not v.voted? }.length %> (see below for details) 
    </blockquote>
 
-<div class="plain-header">
-  <span class="header">Winner</span>
-  <span class="subheader">The chosen method is: 
-  <%= @election.election_method.capitalize %></span>
-</div>
+<%= render :partial => 'result_box',
+           :locals => { :method => @election.election_method } %>
 
-<div class="mainresultbox">
-<%= render :partial => 'result_' + @election.election_method,
-           :object => @results[@election.election_method] %>
-</div>
+<% for result_type in @election.other_methods %>
 
-<div class="plain-header">
-  <span class="header">Other Voting Methods</span>
-  <span class="subheader"></span>
-</div>
+<%= render :partial => 'result_box',
+           :locals => { :method => result_type } %>
 
-<% for result_type in @election.other_methods %>
-<div class="resultbox">
-<%= render :partial => 'result_' + result_type, 
-           :object => @results[result_type] %>
-</div>
 <% end %>
 
 
 <div class="clear-div"></div>
 
-<h2>Voters <%= link_to "[Stalk Voters]", :controller => "quickvote", :action => "mapvoters", :id => @election.id %></h2>
+<div class="normal-header">
+  <span class="header">Voter Report</span>
+  <span class="subheader"></span>
+</div>
+
+<p><%= link_to "[Stalk Voters]", :controller => "quickvote", :action => "mapvoters", :id => @election.id %></p>
 <table class="voterbox">
 <tr>
 <th>IP/Host</th>