Merged jdong

diff --git a/app/views/layouts/frontpage.rhtml b/app/views/layouts/frontpage.rhtml
index de173c280e7560b8229113d4500ac9a89ff87a2d..d5a5f01e7cef0a36364f5e83efbfd1a3fa621dc2 100644 (file)
--- a/app/views/layouts/frontpage.rhtml
+++ b/app/views/layouts/frontpage.rhtml
@@ -24,7 +24,7 @@
       &nbsp;&nbsp;<%= link_to("sign up", :controller => "account", 
                                 :action => "signup")%>
     <% end -%>
-      &nbsp;&nbsp;<%= link_to ("help/about", :controller => "site", 
+      &nbsp;&nbsp;<%= link_to("help/about", :controller => "site", 
                                :action => 'about')%>
       </div>
          <a href="index.html"><h1>selectricity: voting machinery for the masses</h1></a>

diff --git a/app/views/layouts/main.rhtml b/app/views/layouts/main.rhtml
index 74ad018564dbdd57ec8e894ac45d2eb54d99c84e..1542b84acb84a7cad262b9f88008466dd95b5733 100644 (file)
--- a/app/views/layouts/main.rhtml
+++ b/app/views/layouts/main.rhtml
@@ -6,7 +6,8 @@
     <%= stylesheet_link_tag "main", :media => "all" %>
     <%= stylesheet_link_tag *(@stylesheets) %>
     <%= stylesheet_link_tag "ie6hacks", :media => "all" if \
-          request.user_agent =~ /msie\s(5\.[5-9]|[6]\.[0-9]*).*(win)/i %>
+      request.methods.include?(:user_agent) and \
+      request.user_agent =~ /msie\s(5\.[5-9]|[6]\.[0-9]*).*(win)/i %>
     <%= javascript_include_tag "prototype", "effects", "dragdrop", "controls" %>
   </head>
 

diff --git a/app/views/quickvote/_results_sidebar.rhtml b/app/views/quickvote/_results_sidebar.rhtml
index 37776b802f0cdbff66f125921248b3b3f4bb3a87..773db655df2f999daf7f4f2c388c8a656233f002 100644 (file)
--- a/app/views/quickvote/_results_sidebar.rhtml
+++ b/app/views/quickvote/_results_sidebar.rhtml
@@ -4,7 +4,7 @@
 <p>This election was run using:
 <strong><%= ELECTION_TYPES[@election.election_method] %></strong></p>
 
-<p>View results with other methods:<br />
+<p>View results using other methods:<br />
 <% type_hash = {}; ELECTION_TYPES.each {|k,v| type_hash[v] = k} %>
 <%= select_tag 'election_type_select', options_for_select(type_hash, @election.election_method) %></p>
 
@@ -39,6 +39,6 @@ Event.observe(method_select, 'change', show_results_for);
 
 <h2>Voter Report</h2>
 
-<p><%= link_to "[View All Voters: Map and Other Info]", :controller => "quickvote",
+<p><%= link_to "[Map/List of Voters]", :controller => "quickvote",
        :action => "list_voters", :id => @election.id %></p>
 

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index 3ba74f56b17383c35732a1730e80b625955703ec..4c91538992c3aa50850e009e28ccd8ac2d4c2d32 100644 (file)
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -25,7 +25,7 @@
 
 <p><strong>Number of voters:</strong></p>
    <blockquote>
-     <%= @election.voters.reject {|v| not v.voted? }.length %> (see below for details) 
+     <%= @election.voters.reject {|v| not v.voted? }.length %>
    </blockquote>
 
 <%= render :partial => 'result_box',