Expand coverage of IE regex to cover all versions 5-6

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

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index e3644c87c2b7627c88398d5c8e45b23119789d63..c45fd2a5f147478a0edabd86f16b79908adc2163 100644 (file)
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -1,9 +1,13 @@
-<% %>
-<h1>Results</h1>
+<% require 'whois/whois' %>
+
+<div id="page-title">
+  <span class="header">Quickvote</span>
+  <span class="subheader">Results</span>
+</div>
 
 <% if @election.shortdesc %>
-  <p><strong>Description:</strong></p>
-  <blockquote><em><%= @election.shortdesc %></em>
+  <p><strong>Vote Description:</strong></p>
+  <blockquote><em><%=h @election.shortdesc %></em>
     <% if @election.longdesc -%>
       <br />
       <%= h(@election.longdesc) -%>
@@ -15,63 +19,79 @@
 
 <ol>
   <% for candidate in @election.candidates.sort %>
-    <li><%= candidate.name.capitalize %></li>
+    <li><%=h candidate.name.capitalize %></li>
   <% end %>
 </ol>
 
 <p><strong>Number of voters:</strong></p>
    <blockquote>
-     <%= @election.voters.length %> (see below for details) 
+     <%= @election.voters.reject {|v| not v.voted? }.length %> (see below for details) 
    </blockquote>
 
-<h2>Winners</h2>
-
-<div class="mainresultbox">
-<center><h3>Condorcet (w/ Cloneproof SSD) Results</h3></center>
-<%= render :partial => 'result', :object => @ssd_result %>
+<div class="plain-header">
+  <span class="header">Winner</span>
+  <span class="subheader">The chosen method is: 
+  <%= @election.election_method.capitalize %></span>
 </div>
 
-<div class="resultbox">
-<h3>Plurality Results</h3>
-<%= render :partial => 'result', :object => @plurality_result %>
-</div>
-
-<div class="resultbox">
-<h3>Approval Result</h3>
-<p><font size="-1">(Assuming top two choices are "approved.")</font></p>
-<%= render :partial => 'result', :object => @approval_result %>
-</div>
-
-<div class="resultbox">
-<h3>Simple Condorcet Results</h3>
-<%= render :partial => 'result', :object => @condorcet_result %>
+<div class="mainresultbox">
+<%= render :partial => 'result_' + @election.election_method,
+           :object => @results[@election.election_method] %>
 </div>
 
-<div class="resultbox">
-<h3>Borda Count Results</h3>
-<%= render :partial => 'result', :object => @borda_result %>
+<div class="plain-header">
+  <span class="header">Other Voting Methods</span>
+  <span class="subheader"></span>
 </div>
 
+<% for result_type in @election.other_methods %>
 <div class="resultbox">
-<h3>Instant Runoff (IRV) Results</h3>
-<%= render :partial => 'result', :object => @runoff_result %>
+<%= render :partial => 'result_' + result_type, 
+           :object => @results[result_type] %>
 </div>
+<% end %>
 
-<div class="clearbox"></div>
 
-<h2>Voters</h2>
+<div class="clear-div"></div>
 
-<table border="1">
+<h2>Voters <%= link_to "[Stalk Voters]", :controller => "quickvote", :action => "mapvoters", :id => @election.id %></h2>
+<table class="voterbox">
 <tr>
-<th>IP Address</th>
-<th>DNS/Host</th>
+<th>IP/Host</th>
+<th>Origin</th>
 <th>Vote</th>
 </tr>
 <% for voter in @election.voters %>
+  <% next unless voter.voted? %>
   <tr>
-  <td><%= voter.ipaddress %></td>
-  <td><%= `host #{voter.ipaddress}`.sub(/^.*pointer (.*)\.$/, '\1') %></td>
+    <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>
+
+<br />
+
+<!--
+<%= image_tag( graph_url( :action => 'choices_positions', :id => @election ) ) %><br />
+-->
+