# HG changeset patch # User luisf # Date 1342014238 -3600 # Node ID 03975ec7378dbb0034215fe2d5f1cf66d03592b3 # Parent 9b10514b9248fd8005df357807c8432e05b00028# Parent 1affbc7f4b30117d2a951fe8777dd4f68d676771 Merge diff -r 9b10514b9248 -r 03975ec7378d app/helpers/projects_helper.rb --- a/app/helpers/projects_helper.rb Wed Jul 11 14:04:57 2012 +0100 +++ b/app/helpers/projects_helper.rb Wed Jul 11 14:43:58 2012 +0100 @@ -110,9 +110,9 @@ s << "
  • " + link_to_project(project, {}, :class => "project my-project") if project.is_public? - s << " " << l("field_is_public") << "" + s << " " << l(:field_is_public) << "" else - s << " " << l("field_is_private") << "" + s << " " << l(:field_is_private) << "" end s << render_project_short_description(project) s << "
    \n" @@ -177,8 +177,8 @@ s << "" s << "" - s << sort_header_tag('name', :caption => l("field_name")) - s << "" + s << sort_header_tag('name', :caption => l(:field_name)) + s << "" s << sort_header_tag('created_on', :default_order => 'desc') s << sort_header_tag('updated_on', :default_order => 'desc') diff -r 9b10514b9248 -r 03975ec7378d app/views/search/index.html.erb --- a/app/views/search/index.html.erb Wed Jul 11 14:04:57 2012 +0100 +++ b/app/views/search/index.html.erb Wed Jul 11 14:43:58 2012 +0100 @@ -21,7 +21,7 @@ <% end %> -<% if @project_matches and !@project_matches.empty? and (@project_matches.count < 6) and !@pagination_previous_date %> +<% if @project_matches and !@project_matches.empty? and !@pagination_previous_date %>

    <%= l(:label_matching_project_plural) %> (<%= @project_matches.count %>)

    <% @project_matches.each do |e| %> diff -r 9b10514b9248 -r 03975ec7378d app/views/welcome/index.html.erb --- a/app/views/welcome/index.html.erb Wed Jul 11 14:04:57 2012 +0100 +++ b/app/views/welcome/index.html.erb Wed Jul 11 14:43:58 2012 +0100 @@ -27,10 +27,20 @@
      <% for project in @projects %> <% @project = project %> -
    • - <%= link_to_project project %> - <%= format_time(project.created_on)%> - <%= render_project_short_description project %> +
    • + + <% if !project.root? %> + <% project.ancestors.each do |p| %> + <%= h(p) %> » + <% end %> + <% end %> + <%= link_to_project project %> + + <% if !project.is_public? %> + <%= l(:field_is_private) %> + <% end %> + <%= format_time(project.created_on)%> + <%= render_project_short_description project %>
    • <% end %> <% @project = nil %>
    " << l("label_managers") << "" << l(:label_managers) << "