X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/ad5ca8bbfbef358919aa877e78dceb27fdc6387a..64b49c1b5806419a887dbe1a59c72073b943ead4:/app/views/quickvote/results.rhtml?ds=sidebyside

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index 7ab73ef..c45fd2a 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="page-title">
+  <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,20 +28,31 @@
      <%= @election.voters.reject {|v| not v.voted? }.length %> (see below for details) 
    </blockquote>
 
-<h2>Winners</h2>
+<div class="plain-header">
+  <span class="header">Winner</span>
+  <span class="subheader">The chosen method is: 
+  <%= @election.election_method.capitalize %></span>
+</div>
 
+<div class="mainresultbox">
 <%= render :partial => 'result_' + @election.election_method,
            :object => @results[@election.election_method] %>
+</div>
 
+<div class="plain-header">
+  <span class="header">Other Voting Methods</span>
+  <span class="subheader"></span>
+</div>
 
-<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 %>
 
 
-<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">
@@ -53,7 +67,7 @@
     <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).to_s,true)%>
+        <% w= Whois::Whois.new(IPAddr.new(voter.ipaddress),true)%>
         <%=h((w.host == nil or w.host.empty?) ? voter.ipaddress : w.host)%>
       </td>
       <td>
@@ -64,6 +78,10 @@
       <%=h err %>
     </td>
     <td><%=h err%>
+    <% rescue NoMethodError %>
+      DNS Unreachable
+    </td>
+    <td> DNS Unreachable
     <% end %>
     </td>
   <td><%= voter.vote.votestring %></td>
@@ -71,10 +89,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 ) )%>
+-->
+