# HG changeset patch
# User Chris Cannam
# Date 1295877793 0
# Node ID e47742d68d2d9323d204683ba7e7f3a68949988d
# Parent  5f4f786486d109104bc0d6b5291f39ac3b2e34ee# Parent  4272e09f4b5fd1bf93eb86fa4b3888e219810c9d
Merge from branch "cannam-pre-20110113-merge"

diff -r 5f4f786486d1 -r e47742d68d2d app/helpers/application_helper.rb
--- a/app/helpers/application_helper.rb	Mon Jan 24 13:51:20 2011 +0000
+++ b/app/helpers/application_helper.rb	Mon Jan 24 14:03:13 2011 +0000
@@ -52,7 +52,7 @@
     if user.is_a?(User)
       name = h(user.name(options[:format]))
       if user.active?
-        link_to name, :controller => 'users', :action => 'show', :id => user
+        link_to(name, :controller => 'users', :action => 'show', :id => user)
       else
         name
       end
diff -r 5f4f786486d1 -r e47742d68d2d app/helpers/projects_helper.rb
--- a/app/helpers/projects_helper.rb	Mon Jan 24 13:51:20 2011 +0000
+++ b/app/helpers/projects_helper.rb	Mon Jan 24 14:03:13 2011 +0000
@@ -196,7 +196,7 @@
 
       s << "<tr class='#{oddeven} #{classes} level#{level}'>"
       s << "<td class='firstcol name hosted_here'>" << link_to_project(project, {}, :class => "project #{User.current.member_of?(project) ? 'my-project' : nil}") << "</td>"
-      s << "<td class='managers'>"
+      s << "<td class='managers' rowspan=2 align=top>"
 
       u = project.users_by_role
       if u
@@ -216,15 +216,14 @@
       end
 
       s << "</td>"
-      s << "<td class='created_on'>" << format_date(project.created_on) << "</td>"
-      s << "<td class='updated_on'>" << format_date(project.updated_on) << "</td>"
+      s << "<td class='created_on' rowspan=2 align=top>" << format_date(project.created_on) << "</td>"
+      s << "<td class='updated_on' rowspan=2 align=top>" << format_date(project.updated_on) << "</td>"
 
       s << "</tr>"
       s << "<tr class='#{oddeven} #{classes}'>"
       s << "<td class='firstcol wiki description'>"
       s << textilizable(project.short_description, :project => project) unless project.description.blank?
       s << "</td>"
-      s << "<td colspan=3>&nbsp;</td>"
       s << "</tr>"
 
       ancestors << project