comparison app/helpers/projects_helper.rb @ 335:7acd282bee3c cannam-pre-20110113-merge

Introduce render_project_short_description into projects helper; use it in welcome page (latest projects) as well as project lists, to avoid text formatting appearing in these lists

     
     options = ''
     options << "<option value=''></option>" if project.allowed_parents.include?(nil)
     options << project_tree_options_for_select(project.allowed_parents.compact, :selected => selected)
     content_tag('select', options, :name => 'project[parent_id]', :id => 'project_parent_id')
+  end
+
+  def render_project_short_description(project)
+    s = ''
+    if (project.short_description)
+      s << "<div class='description'>"
+      s << textilizable(project.short_description, :project => project).gsub(/<[^>]+>/, '')
+      s << "</div>"
+    end
+    s
   end
   
   # Renders a tree of projects as a nested set of unordered lists
   # The given collection may be a subset of the whole project tree
   # (eg. some intermediate nodes are private and can not be seen)

           end
         end
         classes = (ancestors.empty? ? 'root' : 'child')
         s << "<li class='#{classes}'><div class='#{classes}'>" +
                link_to_project(project, {}, :class => "project #{User.current.member_of?(project) ? 'my-project' : nil}")
-        s << "<div class='wiki description'>#{textilizable(project.short_description, :project => project)}</div>" unless project.description.blank?
+        s << render_project_short_description(project)
         s << "</div>\n"
         ancestors << project
       end
       s << ("</li></ul>\n" * ancestors.size)
       @project = original_project

           if project.is_public?
             s << " <span class='public'>" << l("field_is_public") << "</span>"
           else
             s << " <span class='private'>" << l("field_is_private") << "</span>"
           end
-          desc = textilizable(project.short_description, :project => project).gsub(/<[^>]+>/, '')
-          s << "<div class='wiki description'>#{desc}</div>" unless project.description.blank?
+          s << render_project_short_description(project)
           s << "</div>\n"
           ancestors << project
         end
        end
         s << ("</li></ul>\n" * ancestors.size)

     s << "<tr class='#{oddeven} #{classes} level#{level}'>"
     s << "<td class='firstcol' align=top><div class='name hosted_here"
     s << " no_description" if project.description.blank?
     s << "'>" << link_to_project(project, {}, :class => "project #{User.current.member_of?(project) ? 'my-project' : nil}");
     s << "</div>"
-    unless project.description.blank?
-      s << "<div class='wiki description'>"
-      s << textilizable(project.short_description, :project => project).gsub(/<[^>]+>/, '')
-      s << "</div>"
-    end
+    s << render_project_short_description(project)
       
     s << "<td class='managers' align=top>"
 
     u = project.users_by_role
     if u