Merge from Justin

[selectricity-live] / app / views / site / _user_summary.rhtml

diff --git a/app/views/site/_user_summary.rhtml b/app/views/site/_user_summary.rhtml
index a23149794caed1a3c853b8d14d91ef3a260dd80e..310d98cb6fe37a3f5701e85e3595d35902e2b3c1 100644 (file)
--- a/app/views/site/_user_summary.rhtml
+++ b/app/views/site/_user_summary.rhtml
@@ -7,7 +7,8 @@
 <% else %>
   <ul>
   <% for election in @current_elections %>
-    <li><%= election.name %> (ends <em><%= election.enddate %></em>)</li> 
+    <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> 
   <% end %>
   </ul>
 <% end %>