X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/ad5ca8bbfbef358919aa877e78dceb27fdc6387a..3a0cee8424956a5c2d0466175222cacd271da098:/app/views/quickvote/results.rhtml?ds=sidebyside diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml index 7ab73ef..0383b5e 100644 --- a/app/views/quickvote/results.rhtml +++ b/app/views/quickvote/results.rhtml @@ -27,14 +27,17 @@

Winners

+
<%= render :partial => 'result_' + @election.election_method, :object => @results[@election.election_method] %> - +

Other Voting Methods

<% for result_type in @election.other_methods %> +
<%= render :partial => 'result_' + result_type, :object => @results[result_type] %> +
<% end %> @@ -53,7 +56,7 @@ <% 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).to_s,true)%> + <% w= Whois::Whois.new(IPAddr.new(voter.ipaddress),true)%> <%=h((w.host == nil or w.host.empty?) ? voter.ipaddress : w.host)%> @@ -64,6 +67,10 @@ <%=h err %> <%=h err%> + <% rescue NoMethodError %> + DNS Unreachable + + DNS Unreachable <% end %> <%= voter.vote.votestring %> @@ -71,10 +78,8 @@ <% end %> -<%= render :partial => 'pref_tables' %> - <%=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 => 'plurality_pie', :id => @election ) )%> +