X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/47fdfaba5a11570f2d7d720ee1c80d616d502c74..a6c1e9a2e0cb4243fd48b83af0281eccef408b04:/app/views/quickvote/results.rhtml

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index 9727d81..f4f6f2d 100644
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -1,9 +1,12 @@
-<% %>
-<%require 'whois/whois' %>
-<h1>Results</h1>
+<% require 'whois/whois' %>
+
+<div id="title-header">
+  <span class="header">Quickvote</span>
+  <span class="subheader">Results</span>
+</div>
 
 <% if @election.shortdesc %>
-  <p><strong>Description:</strong></p>
+  <p><strong>Vote Description:</strong></p>
   <blockquote><em><%=h @election.shortdesc %></em>
     <% if @election.longdesc -%>
       <br />
@@ -25,22 +28,25 @@
      <%= @election.voters.reject {|v| not v.voted? }.length %> (see below for details) 
    </blockquote>
 
-<h2>Winners</h2>
+<%= render :partial => 'result_box',
+           :locals => { :method => @election.election_method } %>
 
-<%= render :partial => 'result_' + @election.election_method,
-           :object => @results[@election.election_method] %>
+<% for result_type in @election.other_methods %>
 
+<%= render :partial => 'result_box',
+           :locals => { :method => result_type } %>
 
-<h3> Other Voting Methods </h3>
-<% for result_type in @election.other_methods %>
-<%= render :partial => 'result_' + result_type, 
-           :object => @results[result_type] %>
 <% end %>
 
 
-<div class="clearbox"></div>
+<div class="clear-div"></div>
+
+<div class="normal-header">
+  <span class="header">Voter Report</span>
+  <span class="subheader"></span>
+</div>
 
-<h2>Voters <%= link_to "[Stalk Voters]", :controller => "quickvote", :action => "mapvoters", :id => @election.id %></h2>
+<p><%= link_to "[Stalk Voters]", :controller => "quickvote", :action => "mapvoters", :id => @election.id %></p>
 <table class="voterbox">
 <tr>
 <th>IP/Host</th>
@@ -75,10 +81,9 @@
 <% end %>
 </table>
 
-<%= render :partial => 'pref_tables' %>
-
-<%=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 => 'plurality_pie', :id => @election ) )%>
+-->
+