X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/e7df11018ea1e15f8671f948126632be3ac86e84..19a1975ef6170d77997da210512b370cc883af64:/app/views/quickvote/results.rhtml?ds=sidebyside diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml index a51ca1d..78e74e8 100644 --- a/app/views/quickvote/results.rhtml +++ b/app/views/quickvote/results.rhtml @@ -5,6 +5,10 @@ Results +
+<%= render :partial => 'common/result', :object => @results[@election.election_method] %> +
+ <% if @election.shortdesc %>

Vote Description:

<%=h @election.shortdesc %> @@ -19,78 +23,28 @@
    <% for candidate in @election.candidates.sort %> -
  1. <%=h candidate.name.capitalize %>
  2. +
  3. <%= white_list(candidate.name.capitalize) %>
  4. <% end %>

Number of voters:

- <%= @election.voters.reject {|v| not v.voted? }.length %> (see below for details) + <%= @election.voters.reject {|v| not v.voted? }.length %>
-
- Winner - Computed with - <%= ELECTION_TYPES[@election.election_method] %> -
+<%= render :partial => 'common/result_box', + :locals => { :method => @election.election_method } %> -
-<%= render :partial => 'result_' + @election.election_method, - :object => @results[@election.election_method] %> -
+<% for result_type in @election.other_methods %> -
- Other Voting Methods - -
+<%= render :partial => 'common/result_box', + :locals => { :method => result_type } %> -<% for result_type in @election.other_methods %> -
-<%= render :partial => 'result_' + result_type, - :object => @results[result_type] %> -
<% end %>
-

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

- - - - - - -<% for voter in @election.voters %> - <% next unless voter.voted? %> - - - - - - - -<% end %> -
IP/HostOriginVote
<% 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),true)%> - <%=h((w.host == nil or w.host.empty?) ? voter.ipaddress : w.host)%> - - <%w.search_whois%> - <%=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 %> - <%=h err %> - <%=h err%> - <% rescue NoMethodError %> - DNS Unreachable - DNS Unreachable - <% end %> - <%= voter.vote.votestring %>
- -
-