From:
Date: Sat, 12 Apr 2008 20:04:29 +0000 (-0400)
Subject: Fixed minor spelling errors on results pages, tried to fix quickvotes bug but unsucce...
X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/5459df3cc567b3fd1bd11e365c928fd6a16dc49e
Fixed minor spelling errors on results pages, tried to fix quickvotes bug but unsuccesful. NO changes made to application and quickvote controller
---
diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index d8b2560..7a725ba 100644
--- 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
+
@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 f7ad5ff..fbf53d3 100644
--- 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
+
# 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 d6ed8e0..5845448 100644
--- a/app/views/quickvote/thanks.rhtml
+++ b/app/views/quickvote/thanks.rhtml
@@ -12,7 +12,7 @@ preferences:
<% end %>
-Thanks you voting! You can:
+Thank you for voting! You can:
- <%= link_to "Change Your Vote", quickaction_url( :ident => @voter.election.name, :action => 'change' ) %>
diff --git a/app/views/voter/review.rhtml b/app/views/voter/review.rhtml
index 657c075..425c952 100644
--- a/app/views/voter/review.rhtml
+++ b/app/views/voter/review.rhtml
@@ -27,7 +27,7 @@ preferred to least preferred:
<%= button_to 'Confirm This Vote', :action => 'confirm', :id => @password %>
If you choose, you will be able to go back
and change it up until
- the end of hte voting period.
+ the end of the voting period.
<%= button_to 'Discard This Vote', votepassword_url(
:action => 'index', :urlpassword => @password) %>