Merge jdong

[selectricity] / app / views / quickvote / results.rhtml

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index 3d5468ce7782bd2d9095033fcde95a545abde31d..52810fe543d228a1b43391b82ddce41feffeab2f 100644 (file)
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -1,9 +1,12 @@
-<% %>
-<%require 'whois/whois' %>
-<h1>Results</h1>
+<% require 'whois/whois' %>
+
+<div id="title-header">
+  <span class="header">Quickvote</span>
+  <span class="subheader">Results</span>
+</div>

 
 <% if @election.shortdesc %>
 
 <% if @election.shortdesc %>

-  <p><strong>Description:</strong></p>
+  <p><strong>Vote Description:</strong></p>

   <blockquote><em><%=h @election.shortdesc %></em>
     <% if @election.longdesc -%>
       <br />
   <blockquote><em><%=h @election.shortdesc %></em>
     <% if @election.longdesc -%>
       <br />


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

-<h2>Winners</h2>
-
-<div class="mainresultbox">
-<h3>Schulze Method Results</h3>
-<%= render :partial => 'result', :object => @election.ssd_result %>
-
-<div class="rbmoreinfo">
-<h4>About the Schulze Method</h4>
-
-<p>The <%= link_to "Schulze method",
-"http://en.wikipedia.org/wiki/Schulze_method" %> is a preferential
-voting system. It is based on the Condorcet method but includes a set of
-methods for resolving "circular" defeats.</p>
-
-<p>The Schulze method is also known as Schwartz Sequential Dropping
-(SSD), Cloneproof Schwartz Sequential Dropping (CSSD), Beatpath Method,
-Beatpath Winner, Path Voting, and Path Winner.</p>
-</div>
-
-</div>
-
-<div class="resultbox">
-<h3>Plurality Results</h3>
-<%= render :partial => 'result', :object => @election.plurality_result %>
-
-<div class="rbmoreinfo">
-<h4>About Plurality Voting</h4>
+<%= render :partial => 'result_box',
+           :locals => { :method => @election.election_method } %>

 
 

-<p><%= link_to "Plurality voting",
-"http://en.wikipedia.org/wiki/Plurality_electoral_system" %> selects the
-winner who has received the most "number one" votes, regardless of
-whether or not he or she has a majority of votes.</p>
-
-<p>Plurality voting is also variously referred to as, "first past the
-post," "winner-take-all," "majoritarian" or "simple majority"
-voting.</p>
-
-</div>
-</div>
-
-<div class="resultbox">
-<h3>Approval Result</h3>
-<p><font size="-1">(This algorithm assumes that top two choices are "approved.")</font></p>
-<%= render :partial => 'result', :object => @election.approval_result %>
-
-<div class="rbmoreinfo">
-<h4>About Approval Voting</h4>
-
-<p><%= link_to "Approval voting",
-"http://en.wikipedia.org/wiki/Approval_voting" %> is a voting system in
-which each voter can vote for as many or as few candidates as the voter
-chooses.  Approval voting is a limited form of range voting, where the
-range that voters are allowed to express is extremely constrained:
-accept or not.</p>
-
-</div>
-
-</div>
+<% for result_type in @election.other_methods %>

 
 

-<div class="resultbox">
-<h3>Simple Condorcet Results</h3>
-<%= render :partial => 'result', :object => @election.condorcet_result %>
+<%= render :partial => 'result_box',
+           :locals => { :method => result_type } %>

 
 

-<div class="rbmoreinfo">
-<h4>About Simple Cordorcet Voting</h4>
-
-<p><%= link_to "Condorcet",
-"http://en.wikipedia.org/wiki/Condorcet_method" %> allows voters to rank
-candidates in order of preference.  If there is a choice whom voters
-prefer to each other choice when compared to one at a time, that choice
-will be the winner.</p>
-
-<p>There is a family of Condorcet methods. This method is referred to as
-"Simple Condorcet" to distinguish it from the Schulze method which is
-another Condorcet system.</p>
-
-</div>
-</div>
-
-<div class="resultbox">
-<h3>Borda Count Results</h3>
-<%= render :partial => 'result', :object => @election.borda_result %>
-
-<div class="rbmoreinfo">
-<h4>About Borda Count</h4>
-
-<p><%= link_to "Borda count",
-"http://en.wikipedia.org/wiki/Borda_count" %> 
-is an election method in which voters rank
-candidates in order of preference. The Borda count determines the winner
-of an election by giving each candidate a certain number of points
-corresponding to the position in which he or she is ranked by each
-voter. Once all votes have been counted the candidate with the most
-points is the winner.</p>
-</div>
-</div>
-
-<div class="resultbox">
-<h3>Instant Runoff (IRV) Results</h3>
-
-<div class="rbmoreinfo">
-<h4>About Instant Runoff Voting</h4>
+<% end %>

 
 

-<p><%= link_to "Instant runoff voting",
-"http://en.wikipedia.org/wiki/Instant_Runoff_Voting" %> is an electoral
-system in which voters rank candidates in order of preference. In an IRV
-election, if no candidate receives an overall majority of first
-preferences the candidates with fewest votes are eliminated one by one,
-and their votes transferred according to their second and third
-preferences (and so on), until one candidate achieves a majority.</p>

 
 

-<p>Instant-runoff voting (IRV) is also known as the Alternative Vote (AV) and
-by several other names.</p>
+<div class="clear-div"></div>

 
 

+<div class="normal-header">
+  <span class="header">Voter Report</span>
+  <span class="subheader"></span>

 </div>
 
 </div>
 

-</div>
-
-<div class="clearbox"></div>
-
-<h2>Voters <%= link_to "[Stalk Voters]", :controller => "quickvote", :action => "mapvoters", :id => @election.id %></h2>
-<table class="voterbox">
-<tr>
-<th>IP/Host</th>
-<th>Origin</th>
-<th>Vote</th>
-</tr>
-<% for voter in @election.voters %>
-  <% next unless voter.voted? %>
-  <tr>
-    <td><% 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)%>
-        <%=h((w.host == nil or w.host.empty?) ? voter.ipaddress : w.host)%>
-      </td>
-      <td>
-        <%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 %>
-    </td>
-    <td><%=h err%>
-    <% end %>
-    </td>
-  <td><%= voter.vote.votestring %></td>
-  </tr>
-<% end %>
-</table>
-
-<%= render :partial => 'pref_tables' %>
-
-<%=image_tag( graph_url( :action => 'votes_per_interval', :id => @election ))%>
+<p><%= link_to "[View All Voters]", :controller => "quickvote", :action => "list_voters", :id => @election.id %></p>

 <br />
 <br />

-<%= image_tag( graph_url( :action => 'borda_bar', :id => @election ) ) %><br />
+
+<!--

 <%= image_tag( graph_url( :action => 'choices_positions', :id => @election ) ) %><br />
 <%= image_tag( graph_url( :action => 'choices_positions', :id => @election ) ) %><br />

-<%= image_tag(graph_url( :action => 'plurality_pie', :id => @election ) )%>
+-->
+