Put in a pie graph for Plurality votes. ALso slimmed down victories_and_ties method...

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

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index 0cbd6d00e5f84b6091d19ca1bb55848518aa5c26..3d5468ce7782bd2d9095033fcde95a545abde31d 100644 (file)
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -1,9 +1,10 @@
+<% %>

 <%require 'whois/whois' %>
 <h1>Results</h1>
 
 <% if @election.shortdesc %>
   <p><strong>Description:</strong></p>
 <%require 'whois/whois' %>
 <h1>Results</h1>
 
 <% if @election.shortdesc %>
   <p><strong>Description:</strong></p>

-  <blockquote><em><%= @election.shortdesc %></em>
+  <blockquote><em><%=h @election.shortdesc %></em>

     <% if @election.longdesc -%>
       <br />
       <%= h(@election.longdesc) -%>
     <% if @election.longdesc -%>
       <br />
       <%= h(@election.longdesc) -%>


@@ -15,7 +16,7 @@
 
 <ol>
   <% for candidate in @election.candidates.sort %>
 
 <ol>
   <% for candidate in @election.candidates.sort %>

-    <li><%= candidate.name.capitalize %></li>
+    <li><%=h candidate.name.capitalize %></li>

   <% end %>
 </ol>
 
   <% end %>
 </ol>
 


@@ -30,7 +31,7 @@
 <h3>Schulze Method Results</h3>
 <%= render :partial => 'result', :object => @election.ssd_result %>
 
 <h3>Schulze Method Results</h3>
 <%= render :partial => 'result', :object => @election.ssd_result %>
 

-<div class="rbmoreinfo"
+<div class="rbmoreinfo">

 <h4>About the Schulze Method</h4>
 
 <p>The <%= link_to "Schulze method",
 <h4>About the Schulze Method</h4>
 
 <p>The <%= link_to "Schulze method",


@@ -49,7 +50,7 @@ Beatpath Winner, Path Voting, and Path Winner.</p>
 <h3>Plurality Results</h3>
 <%= render :partial => 'result', :object => @election.plurality_result %>
 
 <h3>Plurality Results</h3>
 <%= render :partial => 'result', :object => @election.plurality_result %>
 

-<div class="rbmoreinfo"
+<div class="rbmoreinfo">

 <h4>About Plurality Voting</h4>
 
 <p><%= link_to "Plurality voting",
 <h4>About Plurality Voting</h4>
 
 <p><%= link_to "Plurality voting",


@@ -69,7 +70,7 @@ voting.</p>
 <p><font size="-1">(This algorithm assumes that top two choices are "approved.")</font></p>
 <%= render :partial => 'result', :object => @election.approval_result %>
 
 <p><font size="-1">(This algorithm assumes that top two choices are "approved.")</font></p>
 <%= render :partial => 'result', :object => @election.approval_result %>
 

-<div class="rbmoreinfo"
+<div class="rbmoreinfo">

 <h4>About Approval Voting</h4>
 
 <p><%= link_to "Approval voting",
 <h4>About Approval Voting</h4>
 
 <p><%= link_to "Approval voting",


@@ -87,7 +88,7 @@ accept or not.</p>
 <h3>Simple Condorcet Results</h3>
 <%= render :partial => 'result', :object => @election.condorcet_result %>
 
 <h3>Simple Condorcet Results</h3>
 <%= render :partial => 'result', :object => @election.condorcet_result %>
 

-<div class="rbmoreinfo"
+<div class="rbmoreinfo">

 <h4>About Simple Cordorcet Voting</h4>
 
 <p><%= link_to "Condorcet",
 <h4>About Simple Cordorcet Voting</h4>
 
 <p><%= link_to "Condorcet",


@@ -107,7 +108,7 @@ another Condorcet system.</p>
 <h3>Borda Count Results</h3>
 <%= render :partial => 'result', :object => @election.borda_result %>
 
 <h3>Borda Count Results</h3>
 <%= render :partial => 'result', :object => @election.borda_result %>
 

-<div class="rbmoreinfo"
+<div class="rbmoreinfo">

 <h4>About Borda Count</h4>
 
 <p><%= link_to "Borda count",
 <h4>About Borda Count</h4>
 
 <p><%= link_to "Borda count",


@@ -124,7 +125,7 @@ points is the winner.</p>
 <div class="resultbox">
 <h3>Instant Runoff (IRV) Results</h3>
 
 <div class="resultbox">
 <h3>Instant Runoff (IRV) Results</h3>
 

-<div class="rbmoreinfo"
+<div class="rbmoreinfo">

 <h4>About Instant Runoff Voting</h4>
 
 <p><%= link_to "Instant runoff voting",
 <h4>About Instant Runoff Voting</h4>
 
 <p><%= link_to "Instant runoff voting",


@@ -158,16 +159,16 @@ by several other names.</p>
         <% 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)%>
         <% 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.host == nil or w.host.empty?) ? voter.ipaddress : w.host%>
+        <%=h((w.host == nil or w.host.empty?) ? voter.ipaddress : w.host)%>

       </td>
       <td>
         <%w.search_whois%>
       </td>
       <td>
         <%w.search_whois%>

-        <%= (w.all.grep(/^(OrgName|org-name)/)[0] or "").sub(/^(OrgName|org-name)\:/,'').strip -%> - <%=  (w.all.grep(/^(NetName|netname)/)[0] or "").sub(/^(NetName|netname)\:/,'').strip %>
+        <%=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 %>
     
     <% rescue ArgumentError => err %>

-      <%= err %>
+      <%=h err %>

     </td>
     </td>

-    <td><%= err%>
+    <td><%=h err%>

     <% end %>
     </td>
   <td><%= voter.vote.votestring %></td>
     <% end %>
     </td>
   <td><%= voter.vote.votestring %></td>


@@ -175,10 +176,10 @@ by several other names.</p>
 <% end %>
 </table>
 
 <% end %>
 </table>
 

-<%= render :partial => 'defeats_list' %>
-<%= render :partial => 'pref_table' %>
+<%= render :partial => 'pref_tables' %>

 
 

-<%= image_tag( graph_url( :action => 'votes_per_day', :id => @election ) ) %><br />
-<%= image_tag( graph_url( :action => 'votes_per_interval', :id => @election ))%><br />
+<%=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 => 'borda_bar', :id => @election ) ) %><br />

-<%= image_tag( graph_url( :action => 'choices_positions', :id => @election ) ) %>
+<%= image_tag( graph_url( :action => 'choices_positions', :id => @election ) ) %><br />
+<%= image_tag(graph_url( :action => 'plurality_pie', :id => @election ) )%>