X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/05b5b421b24810c17b05c7aaca08a93c4ececad5..1fcd2d064dfef0dff9b07a40d0f5d30e662d1d86:/app/views/quickvote/results.rhtml diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml index b82d5e3..3d5468c 100644 --- a/app/views/quickvote/results.rhtml +++ b/app/views/quickvote/results.rhtml @@ -1,9 +1,10 @@ +<% %> <%require 'whois/whois' %>

Results

<% if @election.shortdesc %>

Description:

-
<%= @election.shortdesc %> +
<%=h @election.shortdesc %> <% if @election.longdesc -%>
<%= h(@election.longdesc) -%> @@ -15,7 +16,7 @@
    <% for candidate in @election.candidates.sort %> -
  1. <%= candidate.name.capitalize %>
  2. +
  3. <%=h candidate.name.capitalize %>
  4. <% end %>
@@ -30,7 +31,7 @@

Schulze Method Results

<%= render :partial => 'result', :object => @election.ssd_result %> -

About the Schulze Method

The <%= link_to "Schulze method", @@ -49,7 +50,7 @@ Beatpath Winner, Path Voting, and Path Winner.

Plurality Results

<%= render :partial => 'result', :object => @election.plurality_result %> -

About Plurality Voting

<%= link_to "Plurality voting", @@ -69,7 +70,7 @@ voting.

(This algorithm assumes that top two choices are "approved.")

<%= render :partial => 'result', :object => @election.approval_result %> -

About Approval Voting

<%= link_to "Approval voting", @@ -87,7 +88,7 @@ accept or not.

Simple Condorcet Results

<%= render :partial => 'result', :object => @election.condorcet_result %> -

About Simple Cordorcet Voting

<%= link_to "Condorcet", @@ -107,7 +108,7 @@ another Condorcet system.

Borda Count Results

<%= render :partial => 'result', :object => @election.borda_result %> -

About Borda Count

<%= link_to "Borda count", @@ -124,7 +125,7 @@ points is the winner.

Instant Runoff (IRV) Results

-

About Instant Runoff Voting

<%= link_to "Instant runoff voting", @@ -144,7 +145,7 @@ by several other names.

-

Voters

+

Voters <%= link_to "[Stalk Voters]", :controller => "quickvote", :action => "mapvoters", :id => @election.id %>

@@ -158,16 +159,16 @@ by several other names.

<% 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?) ? "Unknown voter" : w.host%> + <%=h((w.host == nil or w.host.empty?) ? voter.ipaddress : w.host)%> - @@ -175,9 +176,10 @@ by several other names.

<% end %>
IP/Host <%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 %> - <%= err %> + <%=h err %> <%= err%> + <%=h err%> <% end %> <%= voter.vote.votestring %>
-<%= render :partial => 'pref_table' %> +<%= render :partial => 'pref_tables' %> -<%= image_tag( graph_url( :action => 'votes_per_day', :id => @election ) ) %>
-<%= image_tag( graph_url( :action => 'votes_per_interval', :id => @election ))%>
+<%=image_tag( graph_url( :action => 'votes_per_interval', :id => @election ))%> +
<%= image_tag( graph_url( :action => 'borda_bar', :id => @election ) ) %>
-<%= image_tag( graph_url( :action => 'choices_positions', :id => @election ) ) %> +<%= image_tag( graph_url( :action => 'choices_positions', :id => @election ) ) %>
+<%= image_tag(graph_url( :action => 'plurality_pie', :id => @election ) )%>