Merge from jdong

[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..e37cafb60a0b9f1792313749b5c5465ef0623c02 100644 (file)
--- a/app/views/site/_user_summary.rhtml
+++ b/app/views/site/_user_summary.rhtml
@@ -1,13 +1,10 @@
-<% %>
-
-<h2>Activity Summary</h2>
-
 <% if @current_elections.length < 1 %>
   <em>You have not created any elections.</em>
 <% 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 %>