fix typos and minor issues

diff --git a/app/views/common/_methodinfo_ssd.rhtml b/app/views/common/_methodinfo_ssd.rhtml
index 0c8dc9560d5f02d37e3e0fe851328a97334393f7..6b6d42f13327e6fb589366ec5bdc42d1877717a7 100644 (file)
--- a/app/views/common/_methodinfo_ssd.rhtml
+++ b/app/views/common/_methodinfo_ssd.rhtml
@@ -3,7 +3,7 @@ preference (from most preferred to least preferred):</p>
 
 <ol>
 <% @election.ssd_result.ranked_candidates.each do |place|  %>
-  <li><%= h(place.collect {|c| @names[c].capitalize}.join( " <em>and</em> " )) %>
+  <li><%= h(place.collect {|c| @names[c].capitalize}.join( " and " )) %>
       <%= "<strong>(TIE)</strong>" if place.length > 1 %></li>
 <% end %>
 </ol>

diff --git a/app/views/front/_user_summary.rhtml b/app/views/front/_user_summary.rhtml
index ce65bbac698f7207bca27446e0a6e081b17a4468..30b3799b6157c4beb914bac3590ec1f452a5a383 100644 (file)
--- a/app/views/front/_user_summary.rhtml
+++ b/app/views/front/_user_summary.rhtml
@@ -3,8 +3,12 @@
 <% else %>
   <ul>
   <% for election in @current_elections %>
-    <li><%= link_to election.name, :controller => 'election', :action => 'show', :id => election.id %> (ends in <em><%=
-    distance_of_time_in_words Time.now, election.enddate %></em>)</li> 
+    <li><%= link_to election.name, :controller => 'election', :action => 'show', :id => election.id %>
+    <% if Time.now > election.enddate %>
+      (election over)
+    <% else %>
+      (ends in <em><%= distance_of_time_in_words Time.now, election.enddate %></em>)</li> 
+    <% end %>
   <% end %>
   </ul>
 <% end %>

diff --git a/app/views/layouts/frontpage.rhtml b/app/views/layouts/frontpage.rhtml
index 570a4f3942cf8314bddbede177a9281488302b37..2ebf153290e7e5179464a6a4f5dec9af534f17e7 100644 (file)
--- a/app/views/layouts/frontpage.rhtml
+++ b/app/views/layouts/frontpage.rhtml
@@ -13,7 +13,7 @@
     <div id="header">
       <div id="top-bar">
        <% if session[:user]%>
-       <%= link_to User.find(session[:user]).login.dowcase,
+       <%= link_to User.find(session[:user]).login.downcase,
                   :controller => "account",
                   :action => "summary", :id => session[:user][:id] %>
        &nbsp;&nbsp;<%= link_to( 'log out', :controller => 'account',