Made a large number of mostly cosmetic fixes after a detailed

run-through of quickvotes. Also added support for tracking IP addresses
into the database.

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index c3510f60bfb34a8b9775f04afe1ef310ac2b8263..9ae174800bc2ae2506bc0a5bbb6871a725732832 100644 (file)
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -11,7 +11,7 @@ class QuickvoteController < ApplicationController
                                   session.session_id, @election.id])[0]
     unless @voter 
       @voter = QuickVoter.new
-      @voter.election = Election.find_all( [ "name = ?", params[:votename] ] )[0]
+      @voter.election = QuickVote.find_all( [ "name = ?", params[:votename] ] )[0]
     end
   end
 
@@ -42,6 +42,7 @@ class QuickvoteController < ApplicationController
       @voter = QuickVoter.new()
       @voter.election = election
       @voter.session_id = session.session_id
+      @voter.ipaddress = request.env["REMOTE_ADDR"]
       @voter.save
       @voter.reload
         
@@ -53,7 +54,7 @@ class QuickvoteController < ApplicationController
   end
   
   def results
-    @election = Election.find_all( ["name = ?", params[:votename]] )[0]
+    @election = QuickVote.find_all( ["name = ?", params[:votename]] )[0]
 
     preference_tally = []
     plurality_tally = []

diff --git a/app/models/election.rb b/app/models/election.rb
index 0860a426ff137d84dc9184ac322725aec05553cf..eaf07276128b3b8b8271646aabc6f936949a9ebb 100644 (file)
--- a/app/models/election.rb
+++ b/app/models/election.rb
@@ -44,4 +44,12 @@ class Election < ActiveRecord::Base
     quickvote.to_i == 1
   end
 
+  def shortdesc
+    shortdesc = description.split(/\n/)[0]
+  end
+
+  def longdesc
+    longdesc = description.split(/\n/)[1..-1].join("")
+    longdesc.length > 0 ? longdesc : nil 
+  end
 end

diff --git a/app/models/vote.rb b/app/models/vote.rb
index 08dd1e7dd2c393bd2580eee0a02319d468a29265..014899d905ac9e07a185cd99f5abcae9db1d702f 100644 (file)
--- a/app/models/vote.rb
+++ b/app/models/vote.rb
@@ -76,4 +76,8 @@ class Vote < ActiveRecord::Base
     self.votes = rel_votes.collect { |vote| candidate_ids[ vote - 1 ] }
   end
 
+  def votestring
+    self.votes.join("")
+  end
+
 end

diff --git a/app/models/voter.rb b/app/models/voter.rb
index 44efee6e1aa7a0e7b49391955202e82d91e195b9..62466755db4790175cfbc3e1712872ab8ba4698a 100644 (file)
--- a/app/models/voter.rb
+++ b/app/models/voter.rb
@@ -6,8 +6,6 @@ class Voter < ActiveRecord::Base
     vote.destroy if vote
     super
   end
-
 end
 
 
-

diff --git a/app/views/quickvote/_result.rhtml b/app/views/quickvote/_result.rhtml
index a3264598fb776945ffa4924a478ba7b3fffe59e5..e10890a7a92d80d5fbe11534eeb944d95e2b2828 100644 (file)
--- a/app/views/quickvote/_result.rhtml
+++ b/app/views/quickvote/_result.rhtml
@@ -1,10 +1,10 @@
 <% %>
 <% if result.winner? and result.winners.length == 1%>
   <p><em>The winner is:
-     <strong><%= @candidates[result.winner].name %></strong></em></p>
+     <strong><%= @candidates[result.winner].name.capitalize %></strong></em></p>
 <% elsif result.winner? and result.winners.length > 1 %>
   <p><em>There was a tie. The winners are: <strong><%=
-  result.winners.collect {|w| @candidates[w]}.join(", ") %></strong></em></p>
+  result.winners.collect {|w| @candidates[w].to_s.capitalize}.join(", ") %></strong></em></p>
 <% else %>
   <p><em>There is no winner using this method. </em></strong></p>
 <% end %>

diff --git a/app/views/quickvote/create.rhtml b/app/views/quickvote/create.rhtml
index 7074218ecd17e5a336b9b4cd9195986a2d84f837..0a5d4aab1bb144f684403e6901adddda6c6b1dca 100644 (file)
--- a/app/views/quickvote/create.rhtml
+++ b/app/views/quickvote/create.rhtml
@@ -1,15 +1,16 @@
 <% -%>
-<h1>Create QuickVote</h1>
+<h1><%= @quickvote ? "Review and Confirm" : "Create QuickVote" %></h1>
 
 <%= error_messages_for 'quickvote' %>
 
 <% if @quickvote %>
-<p>Please review the data you've entered and confirm. The candidates for
-the election submitted include:</p>
+
+<p>Please review the data you've entered and confirm it. The candidates
+for the vote you've submitted include:</p>
 
 <ul>
 <% for candidate in @quickvote.raw_candidates %>
-  <li><%= candidate %></li>
+  <li><%= candidate.capitalize %></li>
 <% end %>
 </ul>
 
@@ -18,27 +19,27 @@ the election submitted include:</p>
 <%= form_tag :action => 'create' %>
 <!--[form:election]-->
 
-<p><label for="quickvote_name">Vote Name<br />
+<p><label for="quickvote_name">Super-short name (for URL)<br />
 
-<em><font size="-1">Required; 5-12 characters; only letters and numbers; no spaces</font></em></label><br/>
+<em><font size="-1">required; 5-12 characters; only letters and numbers; no spaces</font></em></label><br/>
 
-<%= text_field 'quickvote', 'name'  %></p>
+<%= text_field 'quickvote', 'name', :size => 15, :maxsize => 12  %></p>
 
-<p><label for="quickvote_description">Description <em><font
-size="-1">Optional</font></em></label><br/>
+<p><label for="quickvote_description">Description<em><br />
+<font size="-1">optional; one line summary on the first line</font></em></label><br/>
 
-<%= text_area 'quickvote', 'description', :rows => 2 %></p>
+<%= text_area 'quickvote', 'description', :cols => 50, :rows => 4 %></p>
 
 <p><label for="quickvote_candidatelist">Choices/Candidates<em><br />
-<font size="-1">Seperate choices with a ";". At least two are required.</font></em></label><br/>
+<font size="-1">seperate choices with a ";"; at least two are required</font></em></label><br/>
 
-<%= text_area 'quickvote', 'candidatelist', :rows => 3 %></p>
+<%= text_area 'quickvote', 'candidatelist', :cols => 50, :rows => 2 %></p>
 
 <p><% if @quickvote -%>
      <%= submit_tag "Confirm" -%>
      <%= hidden_field :quickvote, :reviewed, :value => 1 %>
    <% else %>
-     <%= submit_tag "Create QuickVote" -%>
+     <%= submit_tag "Submit" -%>
    <%- end -%>
 </p>
 

diff --git a/app/views/quickvote/index.rhtml b/app/views/quickvote/index.rhtml
index 2c5bcd147067e28f9676a1c61041c380cb2f2117..84211ff77eb4c25e55bb324630769d57145f7b96 100644 (file)
--- a/app/views/quickvote/index.rhtml
+++ b/app/views/quickvote/index.rhtml
@@ -1,10 +1,18 @@
 <% %>
-<h1>QuickVote: <em><%= @voter.election.name %></em></h1>
 
-<p><strong>Description:</strong></p>
-<blockquote><%= @voter.election.description %></blockquote>
+<% if @voter.election.shortdesc %>
+  <h1><%= @voter.election.shortdesc %></h1>
+<% else %>
+  <h1>QuickVote</h1>
+<% end %>
+
+<% if @voter.election.longdesc %>
+  <p><strong>Description:</strong></p>
+  <blockquote><%= @voter.election.longdesc %></blockquote>
+
+<h2>Vote</h2>
+<% end %>
 
-<h2>Vote in Election</h2>
 <% if @voter.session_id %>
   <p>You have already voted. You can:</p>
   

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index ad71fa65b686bc1fd3da70dba2f409bcfd207ced..e3644c87c2b7627c88398d5c8e45b23119789d63 100644 (file)
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -1,36 +1,77 @@
 <% %>
+<h1>Results</h1>
 
-<h1><em><%= @election.name %></em> Results</h1>
+<% if @election.shortdesc %>
+  <p><strong>Description:</strong></p>
+  <blockquote><em><%= @election.shortdesc %></em>
+    <% if @election.longdesc -%>
+      <br />
+      <%= h(@election.longdesc) -%>
+    <% end -%>
+  </blockquote>
+<% end %>
+
+<p><strong>Candidates/choices:</strong></p>
+
+<ol>
+  <% for candidate in @election.candidates.sort %>
+    <li><%= candidate.name.capitalize %></li>
+  <% end %>
+</ol>
+
+<p><strong>Number of voters:</strong></p>
+   <blockquote>
+     <%= @election.voters.length %> (see below for details) 
+   </blockquote>
+
+<h2>Winners</h2>
 
-<p>Total Votes: <strong><%= @election.voters.length %></strong></p>
 <div class="mainresultbox">
-<h2>Condorcet (w/ Cloneproof SSD) Results</h2>
+<center><h3>Condorcet (w/ Cloneproof SSD) Results</h3></center>
 <%= render :partial => 'result', :object => @ssd_result %>
 </div>
 
 <div class="resultbox">
-<h2>Plurality Results</h2>
+<h3>Plurality Results</h3>
 <%= render :partial => 'result', :object => @plurality_result %>
 </div>
 
 <div class="resultbox">
-<h2>Approval Result</h2>
+<h3>Approval Result</h3>
 <p><font size="-1">(Assuming top two choices are "approved.")</font></p>
 <%= render :partial => 'result', :object => @approval_result %>
 </div>
 
 <div class="resultbox">
-<h2>Simple Condorcet Results</h2>
+<h3>Simple Condorcet Results</h3>
 <%= render :partial => 'result', :object => @condorcet_result %>
 </div>
 
 <div class="resultbox">
-<h2>Borda Count Results</h2>
+<h3>Borda Count Results</h3>
 <%= render :partial => 'result', :object => @borda_result %>
 </div>
 
 <div class="resultbox">
-<h2>Instant Runoff (IRV) Results</h2>
+<h3>Instant Runoff (IRV) Results</h3>
 <%= render :partial => 'result', :object => @runoff_result %>
 </div>
-</div>
+
+<div class="clearbox"></div>
+
+<h2>Voters</h2>
+
+<table border="1">
+<tr>
+<th>IP Address</th>
+<th>DNS/Host</th>
+<th>Vote</th>
+</tr>
+<% for voter in @election.voters %>
+  <tr>
+  <td><%= voter.ipaddress %></td>
+  <td><%= `host #{voter.ipaddress}`.sub(/^.*pointer (.*)\.$/, '\1') %></td>
+  <td><%= voter.vote.votestring %></td>
+  </tr>
+<% end %>
+</table>

diff --git a/app/views/quickvote/success.rhtml b/app/views/quickvote/success.rhtml
index 982fd1236484a0f4e9bf8cadd3570b9b4ec87608..93d688208b212d7a87f51aff22c5b72feec65a6b 100644 (file)
--- a/app/views/quickvote/success.rhtml
+++ b/app/views/quickvote/success.rhtml
@@ -1,14 +1,16 @@
-<% %>
+<% -%>
+<h2>Your QuickVote Was Created</h2>
 
-<h2>Vote Created</h2:>
+<p>Please direct voters to:</p>
+
+<blockquote><strong>
+  <%= quickvote_url( :votename => @quickvote.name ) -%>
+</strong></blockquote>
+
+<p>This vote will close on <em><%= @quickvote.enddate %></em></p>
 
 <p>QuickVotes are open to the public but are not publicly listed on the
 HyperChad site. Voters do not need to log in or authenticate to
 participate in this election.</p>
 
-<p>Direct voters to:</p>
-<blockquote><strong><%= quickvote_url( :votename => @quickvote.name ) %></strong></blockquote>
-
-<p>This vote will expire on <em><%= @quickvote.enddate %></em></p>
-
-<p><%= link_to "Visit in or vote in your QuickVote", quickvote_url( :votename => @quickvote.name ) %></p>
+<p><%= link_to "Jump to your QuickVote.", quickvote_url( :votename => @quickvote.name ) %></p>

diff --git a/app/views/quickvote/thanks.rhtml b/app/views/quickvote/thanks.rhtml
index 794f412093b40623e1ee20b460aa5328520f5966..4104612c9761dee799102911465e9c496e199a76 100644 (file)
--- a/app/views/quickvote/thanks.rhtml
+++ b/app/views/quickvote/thanks.rhtml
@@ -1,11 +1,11 @@
 <% %>
-
+<h1>Vote Recorded</h1>
 <p>Your vote has been recorded with the following ranked
 preferences:</p>
 
 <ol>
   <% for rank in @voter.vote.rankings.sort %>
-    <li><%= rank.candidate.name %> </li>
+    <li><%= rank.candidate.name.capitalize %> </li>
   <% end %>
 </ol>
 

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index b005cb5ccd109facebb79bf52beb65542eefc7ec..92c38cc80eb01002ce3b3ab125175e2f9adf55c4 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -6,11 +6,10 @@
 
 <h2>QuickVotes</h2>
 
-<p><em>QuickVotes</em> are unstructured votes, more like polls, without
-the voter verifiability, anonymity, and other more complex features of
-HyperChad. They are the quickest way to make a decision using a variety
-of preferential and non-preficial election methods, or to compare
-between methods.</p>
+<p><em>QuickVotes</em> are like polls: unstructured, non-anonymous and
+without the complex features of <em>HyperChad</em>. They are the
+quickest way to make a decision or to compare between voting
+methods.</p>
 
 <p><%= link_to "Create QuickVote.", :controller => 'quickvote', :action => 'create' %></p>
 

diff --git a/app/views/voter/_vote.rhtml b/app/views/voter/_vote.rhtml
index b9a2688c9c001d8b59f26a03051cd9cb7706c081..dc240af61ea0d3e81e308f3c6db2dd36c0bdb37c 100644 (file)
--- a/app/views/voter/_vote.rhtml
+++ b/app/views/voter/_vote.rhtml
@@ -3,12 +3,13 @@
 <p><strong>Candidates or choices:</strong></p>
 <ol>
 <% for candidate in @voter.election.candidates.sort %>
-  <li><%= candidate.name %></li>
+  <li><%= candidate.name.capitalize %></li>
 <% end %>
 </ol>
 
 <p>In the box below, list each choice in order of most preferred to
-least preferred.  <em>(For example, 123 or 321 or 213, etc.)</em></p>
+least preferred. Please list <em>all</em> choices in every vote.
+<em>(For example, 123 or 321 or 213, etc.)</em></p>
 
 <% if @voter.election.quickvote? %>
   <%= form_tag quickaction_url( :votename => @voter.election.name, :action => 'confirm') %>

diff --git a/config/environment.rb b/config/environment.rb
index dcc9fad3b4ee5a7d2a514c3533ba74394ad85b31..9eb4d577520bf0a0b9e88f03194f77398807d4ab 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -57,6 +57,16 @@ require 'uniq_token'
 require 'randarray'
 require 'rubyvote'
 
+class String
+  def capitalize
+    if self.length <= 1
+      self.upcase
+    else
+      self.split(//)[0].upcase + self..split(//)[1..-1].join("")
+    end
+  end
+end
+
 module LoginEngine
   config :salt, "voothingboat"
   config :email_from, MAIL_CONFIG[:from]

diff --git a/db/create.sql b/db/create.sql
index a9d430cf83dbc1b8d753f80762052ed61ea6d7d0..e0c264fabaf50b755d0b0bac4400e0b7f33b23e1 100644 (file)
--- a/db/create.sql
+++ b/db/create.sql
@@ -42,6 +42,7 @@ create table voters (
  contacted tinyint NOT NULL DEFAULT 0, 
  election_id int NOT NULL, 
  session_id varchar(32) DEFAULT NULL,
+ ipaddress varchar(32) DEFAULT NULL,
  constraint fk_election_voter foreign key (election_id) references election(id),
  primary key (id)
 );

diff --git a/public/stylesheets/vb.css b/public/stylesheets/vb.css
index e6940698d22a755868476fb5624bb5ef7827b1d4..0a9f362d53e45cef2d9371c8bf8316f6feac14cb 100644 (file)
--- a/public/stylesheets/vb.css
+++ b/public/stylesheets/vb.css
@@ -14,8 +14,9 @@ h1, h2, h3, h4 {
     text-shadow: #999999 0.2em 0.2em 3px;
 
 }
+
 a:link { font-weight: bold; color: #BD7589; text-decoration: underline; } 
-a:visited { color: #BD7589; text-decoration: underline; }
+a:visited { font-weight: bold; color: #BD7589; text-decoration: underline; }
 a:hover { color: #FFFFFF; text-decoration: none; background: #0063DC; }
 a:active { color: #FFFFFF; text-decoration: none; background: #0259C4; }
 
@@ -67,8 +68,8 @@ a:active { color: #FFFFFF; text-decoration: none; background: #0259C4; }
 
 #top h3 { font-size: 30px; }
 #links { text-align : right; }
-#links a { color: #FFF; }
-#links a:visited { font-weight: bold; }
+#links a { color: #FFF; font-weight: bold; }
+#links a:visited { color: #FFF; font-weight: bold; }
 
 .ListLine0 {
        background:  #e0f8f8;
@@ -112,8 +113,8 @@ a:active { color: #FFFFFF; text-decoration: none; background: #0259C4; }
 .mainresultbox {
     width: 100%;
     padding: 7px;
-    margin-right: 10px;
-    margin-bottom: 10px;
+    margin-right: 30px;
+    margin-bottom: 30px;
     border-style: dotted;
     border-width: 1px;
 }
@@ -131,4 +132,8 @@ a:active { color: #FFFFFF; text-decoration: none; background: #0259C4; }
     border-width: 1px;
 }
 
+.clearbox {
+   clear: both;
+   margin: 30px;
+}