From: John Dong Date: Mon, 20 Aug 2007 21:32:37 +0000 (-0400) Subject: Merge from head X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/ee7a5c7130df812e96922e9f47ed9355cc78e72c?hp=-c Merge from head --- ee7a5c7130df812e96922e9f47ed9355cc78e72c diff --combined app/views/quickvote/_pref_table.rhtml index a3ba63d,01de22b..011fcbe --- a/app/views/quickvote/_pref_table.rhtml +++ b/app/views/quickvote/_pref_table.rhtml @@@ -1,6 -1,6 +1,6 @@@ <% candidates = @election.candidates.sort.collect {|candidate| candidate.id}-%> <% voters = @election.voters.size %> - + <% matrix = @election.condorcet_result.matrix %> <% names = Hash.new -%> <% candidates.each do |candidate| -%> <%names[candidate] = Candidate.find(candidate).name -%> @@@ -9,19 -9,17 +9,19 @@@ <% candidates.each do |candidate| -%> - <%= names[candidate] -%> - <% end -%> + <%=h names[candidate] -%> + <% end -%> + + <% candidates.each do |winner| -%> - <%= names[winner] %> + <%=h names[winner] %> <% candidates.each do |loser| -%> <% if winner == loser -%> -- - <% else %> - <% wins = @election.condorcet_result.matrix[winner][loser]%> - <%=h wins %> + <% else %> + <% wins = matrix[winner][loser] unless matrix[winner].nil?%> + <%= wins %> <%= sparkline_tag [(wins.to_f/voters.to_f)*100.0], :type => 'pie', :diameter => 25, :share_color => '#74ce00' %> @@@ -29,4 -27,4 +29,4 @@@ <% end -%> <% end -%> - + diff --combined app/views/quickvote/results.rhtml index 799459d,bc33d07..2999e6b --- a/app/views/quickvote/results.rhtml +++ b/app/views/quickvote/results.rhtml @@@ -4,7 -4,7 +4,7 @@@ <% if @election.shortdesc %>

Description:

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

Schulze Method Results

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

About the Schulze Method

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

Plurality Results

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

About Plurality Voting

<%= link_to "Plurality voting", @@@ -70,7 -70,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", @@@ -88,7 -88,7 +88,7 @@@ accept or not.

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

About Simple Cordorcet Voting

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

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

About Borda Count

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

Instant Runoff (IRV) Results

-

About Instant Runoff Voting

<%= link_to "Instant runoff voting", @@@ -159,16 -159,16 +159,16 @@@ by several other names.

<% 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)%> <%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 %> @@@ -179,7 -179,7 +179,7 @@@ <%= render :partial => 'victories_ties' %> <%= render :partial => 'pref_table' %> - <%= 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 ) ) %>