X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/47fdfaba5a11570f2d7d720ee1c80d616d502c74..da6c29f53b3598a6d2d9959df277b0340bc54cee:/app/views/quickvote/results.rhtml diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml index 9727d81..8d8bf5f 100644 --- a/app/views/quickvote/results.rhtml +++ b/app/views/quickvote/results.rhtml @@ -1,9 +1,16 @@ -<% %> -<%require 'whois/whois' %> -

Results

+<% require 'whois/whois' %> + +
+ Quickvote + Results +
+ +
+<%= render :partial => 'common/result', :object => @results[@election.election_method] %> +
<% if @election.shortdesc %> -

Description:

+

Vote Description:

<%=h @election.shortdesc %> <% if @election.longdesc -%>
@@ -22,63 +29,23 @@

Number of voters:

- <%= @election.voters.reject {|v| not v.voted? }.length %> (see below for details) + <%= @election.voters.reject {|v| not v.voted? }.length %>
-

Winners

- -<%= render :partial => 'result_' + @election.election_method, - :object => @results[@election.election_method] %> - +<%= render :partial => 'common/result_box', + :locals => { :method => @election.election_method } %> -

Other Voting Methods

<% for result_type in @election.other_methods %> -<%= render :partial => 'result_' + result_type, - :object => @results[result_type] %> -<% end %> - -
+<%= render :partial => 'common/result_box', + :locals => { :method => result_type } %> -

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