X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/ac5e3489e8b886b7b8a7252ab56ddeb3d3bdadc7..da6c29f53b3598a6d2d9959df277b0340bc54cee:/app/views/quickvote/results.rhtml diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml index e3644c8..8d8bf5f 100644 --- a/app/views/quickvote/results.rhtml +++ b/app/views/quickvote/results.rhtml @@ -1,9 +1,17 @@ -<% %> -
Description:
-<%= @election.shortdesc %> +Vote Description:
+<%=h @election.shortdesc %> <% if @election.longdesc -%>
<%= h(@election.longdesc) -%> @@ -15,63 +23,29 @@<% for candidate in @election.candidates.sort %> -
- <%= candidate.name.capitalize %>
+- <%=h candidate.name.capitalize %>
<% end %>Number of voters:
- <%= @election.voters.length %> (see below for details) + <%= @election.voters.reject {|v| not v.voted? }.length %>-Winners
- --- --<%= render :partial => 'result', :object => @ssd_result %> - Condorcet (w/ Cloneproof SSD) Results
-+<%= render :partial => 'common/result_box', + :locals => { :method => @election.election_method } %> -Plurality Results
-<%= render :partial => 'result', :object => @plurality_result %> --+<% for result_type in @election.other_methods %> -Approval Result
-(Assuming top two choices are "approved.")
-<%= render :partial => 'result', :object => @approval_result %> --+<%= render :partial => 'common/result_box', + :locals => { :method => result_type } %> -Simple Condorcet Results
-<%= render :partial => 'result', :object => @condorcet_result %> --+<% end %> -Borda Count Results
-<%= render :partial => 'result', :object => @borda_result %> --- + -Instant Runoff (IRV) Results
-<%= render :partial => 'result', :object => @runoff_result %> -Voters
+ --
- -<% for voter in @election.voters %> -IP Address -DNS/Host -Vote -- -<% end %> -<%= voter.ipaddress %> -<%= `host #{voter.ipaddress}`.sub(/^.*pointer (.*)\.$/, '\1') %> -<%= voter.vote.votestring %> -