Mercurial > hg > soundsoftware-site

changeset 140:4272e09f4b5f cannam-pre-20110113-merge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow list of managers, if more than one row, to overlap with description rather than pushing description down
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Thu, 20 Jan 2011 10:01:33 +0000
parents ddcedb549d4e
children e47742d68d2d e7c03e1738fb
files app/helpers/application_helper.rb app/helpers/projects_helper.rb
diffstat 2 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/app/helpers/application_helper.rb	Thu Jan 20 10:00:51 2011 +0000
+++ b/app/helpers/application_helper.rb	Thu Jan 20 10:01:33 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
--- a/app/helpers/projects_helper.rb	Thu Jan 20 10:00:51 2011 +0000
+++ b/app/helpers/projects_helper.rb	Thu Jan 20 10:01:33 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