From: <mako@atdot.cc>
Date: Mon, 11 Feb 2008 15:49:18 +0000 (-0500)
Subject: fix typos and minor issues
X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/1633d6c9b98f425d1ad33c1dd61a63b7365ff54c

fix typos and minor issues
---

diff --git a/app/views/common/_methodinfo_ssd.rhtml b/app/views/common/_methodinfo_ssd.rhtml
index 0c8dc95..6b6d42f 100644
--- 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 ce65bba..30b3799 100644
--- 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 570a4f3..2ebf153 100644
--- 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',