Revision 809:7429d10cc491 vendor/plugins/redmine_tags/lib/redmine_tags/patches

View differences:

vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_helper_patch.rb
29 29
            s << "<thead><tr>"
30 30
        
31 31
            s << sort_header_tag('name', :caption => l("field_name"))
32
            s << "<th class='tags'>" << l("tags") << "</th>"
32 33
            s << "<th class='managers'>" << l("label_managers") << "</th>"
33
            s << "<th class='tags'>" << l("tags") << "</th>"
34 34
            s << sort_header_tag('created_on', :default_order => 'desc')
35 35
            s << sort_header_tag('updated_on', :default_order => 'desc')
36 36
        
......
65 65
          s << "'>" << link_to( highlight_tokens(project.name, tokens), {:controller => 'projects', :action => 'show', :id => project}, :class => "project #{User.current.member_of?(project) ? 'my-project' : nil}")
66 66
          s << "</div>"
67 67
          s << highlight_tokens(render_project_short_description(project), tokens)
68
          s << "</td>"
69

  
70
          # taglist
71
          s << "<td class='tags' align=top>" << project.tag_counts.collect{ |t| render_project_tag_link(t) }.join(', ') << "</td>"
72

  
68 73
          s << "<td class='managers' align=top>"
69 74
           
70 75
          u = project.users_by_role
......
86 91

  
87 92
          s << "</td>"
88 93
          
89
          # taglist
90
          s << "<td class='tags' align=top>" << project.tag_counts.collect{ |t| render_project_tag_link(t) }.join(', ') << "</td>"
91 94
          s << "<td class='created_on' align=top>" << format_date(project.created_on) << "</td>"
92 95
          s << "<td class='updated_on' align=top>" << format_date(project.updated_on) << "</td>"
93 96

  
......
207 210
            s << "<li class='#{classes}'><div class='#{classes}'>" +
208 211
              link_to_project(project, {}, :class => "project my-project")
209 212
            if project.is_public?
210
              s << " <span class='public'>" << l("field_is_public") << "</span>"
213
              s << " <span class='public'>" << l(:field_is_public) << "</span>"
211 214
            else
212
              s << " <span class='private'>" << l("field_is_private") << "</span>"
215
              s << " <span class='private'>" << l(:field_is_private) << "</span>"
213 216
            end
217
           
218
            tc = project.tag_counts
219
            if tc.empty?
220
              s << " <span class='no-tags'>" << l(:field_no_tags) << "</span>"
221
            else
222
              s << " <span class='tags'>" << tc.collect{ |t| render_project_tag_link(t) }.join(', ') << "</span>"
223
            end
224

  
214 225
            s << render_project_short_description(project)
215 226

  
216
            s << l(:tags) << ":&nbsp"
217
            s << project.tag_counts.collect{ |t| render_project_tag_link(t) }.join(', ')
218

  
219 227
            s << "</div>\n"
220 228

  
221 229
            cs = ''
222 230
            project.children.each do |child|
223
              cs << render_my_project_in_hierarchy(child)
231
              cs << render_my_project_in_hierarchy_with_tags(child)
224 232
            end
225 233

  
226 234
            if cs != ''

Also available in: Unified diff