Fixed minor spelling errors on results pages, tried to fix quickvotes bug but unsucce...

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index d8b256094b3436b1dc6e26d0c0f7aa41ae6ff321..7a725ba0f5e6df21d2585be0a6cfe3791040e1da 100644 (file)
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -47,6 +47,7 @@ class ApplicationController < ActionController::Base
 
   #both election_controller and quickvote_controller need this method
   def sort_candidates
 
   #both election_controller and quickvote_controller need this method
   def sort_candidates

+    

     @vote = Vote.find(params[:id])
 
     @vote.rankings.each do |ranking|
     @vote = Vote.find(params[:id])
 
     @vote.rankings.each do |ranking|

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index f7ad5ff33f3105dd589a94ea37b2b418b7e01024..fbf53d3f0f3347e06c18dc61ec92a42a27f6f5fa 100644 (file)
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -157,6 +157,7 @@ class QuickvoteController < ApplicationController
       redirect_to quickvote_url( :ident => params[:ident] )
       
     else
       redirect_to quickvote_url( :ident => params[:ident] )
       
     else

+      

       # record the ip address for posterity
       @voter.ipaddress = request.env["REMOTE_ADDR"]
       @voter.save
       # record the ip address for posterity
       @voter.ipaddress = request.env["REMOTE_ADDR"]
       @voter.save

diff --git a/app/views/quickvote/thanks.rhtml b/app/views/quickvote/thanks.rhtml
index d6ed8e0afeded815eb021b842223de8f95141681..58454485a2aa53eb22a13a208e59abba2b55c4b0 100644 (file)
--- a/app/views/quickvote/thanks.rhtml
+++ b/app/views/quickvote/thanks.rhtml
@@ -12,7 +12,7 @@ preferences:</p>
   <% end %>
 </ol>
 
   <% end %>
 </ol>
 

-<p>Thanks you voting! You can:</p>
+<p>Thank you for voting! You can:</p>

 
 <ul>
   <li><%= link_to "Change Your Vote", quickaction_url( :ident => @voter.election.name, :action => 'change' ) %></li>
 
 <ul>
   <li><%= link_to "Change Your Vote", quickaction_url( :ident => @voter.election.name, :action => 'change' ) %></li>

diff --git a/app/views/voter/review.rhtml b/app/views/voter/review.rhtml
index 657c075702d2aacfcfbb4bd95107d9e5c9721920..425c952fff4099bd7a1b37ec26529bad85b44ea6 100644 (file)
--- a/app/views/voter/review.rhtml
+++ b/app/views/voter/review.rhtml
@@ -27,7 +27,7 @@ preferred to least preferred:</p>
   <p><%= button_to 'Confirm This Vote', :action => 'confirm', :id => @password %></p>
 
   <p>If you choose, you will be able to go back<br />and change it up until
   <p><%= button_to 'Confirm This Vote', :action => 'confirm', :id => @password %></p>
 
   <p>If you choose, you will be able to go back<br />and change it up until

-  the end of hte voting period.</p>
+  the end of the voting period.</p>

   <p><%= button_to 'Discard This Vote', votepassword_url(
                    :action => 'index', :urlpassword => @password) %></p>
 
   <p><%= button_to 'Discard This Vote', votepassword_url(
                    :action => 'index', :urlpassword => @password) %></p>