# HG changeset patch
# User Chris Cannam
# Date 1297088251 0
# Node ID 55c3f4afe85de9d2b6d20c437d0a7cc678a04b73
# Parent 2eaccf99a7b0263723eb510287309a5225e70965# Parent 5d8c3fe4e7e2cc9dc76aa214c27799e0023c6852
Merge from branch "live"
diff -r 2eaccf99a7b0 -r 55c3f4afe85d app/helpers/projects_helper.rb
--- a/app/helpers/projects_helper.rb Mon Feb 07 14:07:12 2011 +0000
+++ b/app/helpers/projects_helper.rb Mon Feb 07 14:17:31 2011 +0000
@@ -195,8 +195,17 @@
classes = (ancestors.empty? ? 'root' : 'child')
s << "
"
- s << "" << link_to_project(project, {}, :class => "project #{User.current.member_of?(project) ? 'my-project' : nil}") << " | "
- s << ""
+ s << " | " << link_to_project(project, {}, :class => "project #{User.current.member_of?(project) ? 'my-project' : nil}");
+ s << " "
+ unless project.description.blank?
+ s << ""
+ s << textilizable(project.short_description, :project => project)
+ s << " "
+ end
+
+ s << " | "
u = project.users_by_role
if u
@@ -216,15 +225,10 @@
end
s << " | "
- s << "" << format_date(project.created_on) << " | "
- s << "" << format_date(project.updated_on) << " | "
+ s << "" << format_date(project.created_on) << " | "
+ s << "" << format_date(project.updated_on) << " | "
s << "
"
- s << "