Mercurial > hg > soundsoftware-site
comparison app/helpers/projects_helper.rb @ 331:4ed4207d81c5 live
Merge
| author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
|---|---|
| date | Tue, 29 Mar 2011 18:04:17 +0100 |
| parents | f1a12c3b4587 |
| children | e665cc1fdf07 |
comparison
equal
deleted
inserted
replaced
| 327:c73f512810a9 | 331:4ed4207d81c5 |
|---|---|
| 125 if project.is_public? | 125 if project.is_public? |
| 126 s << " <span class='public'>" << l("field_is_public") << "</span>" | 126 s << " <span class='public'>" << l("field_is_public") << "</span>" |
| 127 else | 127 else |
| 128 s << " <span class='private'>" << l("field_is_private") << "</span>" | 128 s << " <span class='private'>" << l("field_is_private") << "</span>" |
| 129 end | 129 end |
| 130 s << "<div class='wiki description'>#{textilizable(project.short_description, :project => project)}</div>" unless project.description.blank? | 130 desc = textilizable(project.short_description, :project => project).gsub(/<[^>]+>/, '') |
| 131 s << "<div class='wiki description'>#{desc}</div>" unless project.description.blank? | |
| 131 s << "</div>\n" | 132 s << "</div>\n" |
| 132 ancestors << project | 133 ancestors << project |
| 133 end | 134 end |
| 134 end | 135 end |
| 135 s << ("</li></ul>\n" * ancestors.size) | 136 s << ("</li></ul>\n" * ancestors.size) |