X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/47fdfaba5a11570f2d7d720ee1c80d616d502c74..7f5300ee1b7788329d4bf369ea3f9a756f41647c:/app/views/quickvote/results.rhtml?ds=sidebyside

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index 9727d81..52810fe 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,60 +28,28 @@
      <%= @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>
 
-<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>
+<div class="normal-header">
+  <span class="header">Voter Report</span>
+  <span class="subheader"></span>
+</div>
 
-<%= render :partial => 'pref_tables' %>
-
-<%=image_tag( graph_url( :action => 'votes_per_interval', :id => @election ))%>
+<p><%= link_to "[View All Voters]", :controller => "quickvote", :action => "list_voters", :id => @election.id %></p>
 <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 ) )%>
+-->
+