fixed up the results page in a number of ways

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

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index 0383b5e4434c0acfba9b9e391b16e463687b91b5..5fd5f9e4bc0d15cf5cd8defe0a71a97be85a167b 100644 (file)
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -1,9 +1,16 @@
-<% %>
-<%require 'whois/whois' %>
-<h1>Results</h1>
+<% require 'whois/whois' %>
+
+<div id="title-header">
+  <span class="header">Quickvote</span>
+  <span class="subheader">Results</span>
+</div>
+
+<div id="winner_box">
+<%= render :partial => 'result', :object => @results[@election.election_method] %>
+</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 />
@@ -22,64 +29,23 @@
 
 <p><strong>Number of voters:</strong></p>
    <blockquote>
-     <%= @election.voters.reject {|v| not v.voted? }.length %> (see below for details) 
+     <%= @election.voters.reject {|v| not v.voted? }.length %>
    </blockquote>
 
-<h2>Winners</h2>
-
-<div class="mainresultbox">
-<%= render :partial => 'result_' + @election.election_method,
-           :object => @results[@election.election_method] %>
-</div>
+<%= render :partial => 'result_box',
+           :locals => { :method => @election.election_method } %>
 
-<h3> Other Voting Methods </h3>
 <% for result_type in @election.other_methods %>
-<div class="resultbox">
-<%= render :partial => 'result_' + result_type, 
-           :object => @results[result_type] %>
-</div>
-<% end %>
 
+<%= render :partial => 'result_box',
+           :locals => { :method => result_type } %>
 
-<div class="clearbox"></div>
-
-<h2>Voters <%= link_to "[Stalk Voters]", :controller => "quickvote", :action => "mapvoters", :id => @election.id %></h2>
-<table class="voterbox">
-<tr>
-<th>IP/Host</th>
-<th>Origin</th>
-<th>Vote</th>
-</tr>
-<% for voter in @election.voters %>
-  <% next unless voter.voted? %>
-  <tr>
-    <td><% begin %>
-        <% raise ArgumentError.new, "Local Server" if voter.ipaddress == "127.0.0.1" %>
-        <% raise ArgumentError.new, "XML-RPC Voter" if voter.ipaddress == "XMLRPC Request" %>
-        <% w= Whois::Whois.new(IPAddr.new(voter.ipaddress),true)%>
-        <%=h((w.host == nil or w.host.empty?) ? voter.ipaddress : w.host)%>
-      </td>
-      <td>
-        <%w.search_whois%>
-        <%=h (w.all.grep(/^(OrgName|org-name)/)[0] or "").sub(/^(OrgName|org-name)\:/,'').strip -%> - <%=  (w.all.grep(/^(NetName|netname)/)[0] or "").sub(/^(NetName|netname)\:/,'').strip %>
-    
-    <% rescue ArgumentError => err %>
-      <%=h err %>
-    </td>
-    <td><%=h err%>
-    <% rescue NoMethodError %>
-      DNS Unreachable
-    </td>
-    <td> DNS Unreachable
-    <% end %>
-    </td>
-  <td><%= voter.vote.votestring %></td>
-  </tr>
 <% end %>
-</table>
 
-<%=image_tag( graph_url( :action => 'votes_per_interval', :id => @election ))%>
-<br />
 
+<div class="clear-div"></div>
+
+<!--
 <%= image_tag( graph_url( :action => 'choices_positions', :id => @election ) ) %><br />
+-->