# HG changeset patch
# User Chris Cannam
# Date 1342013771 -3600
# Node ID 6d4cafba946859675e41a7919d6a933316513406
# Parent  fe0249c097f6f3a357c26f48c8fb5fd4c15dffd7# Parent  1affbc7f4b30117d2a951fe8777dd4f68d676771
Merge from the default branch

diff -r fe0249c097f6 -r 6d4cafba9468 app/helpers/projects_helper.rb
--- a/app/helpers/projects_helper.rb	Wed Jul 11 13:33:14 2012 +0100
+++ b/app/helpers/projects_helper.rb	Wed Jul 11 14:36:11 2012 +0100
@@ -110,9 +110,9 @@
       s << "<li class='#{classes}'><div class='#{classes}'>" +
         link_to_project(project, {}, :class => "project my-project")
       if project.is_public?
-        s << " <span class='public'>" << l("field_is_public") << "</span>"
+        s << " <span class='public'>" << l(:field_is_public) << "</span>"
       else
-        s << " <span class='private'>" << l("field_is_private") << "</span>"
+        s << " <span class='private'>" << l(:field_is_private) << "</span>"
       end
       s << render_project_short_description(project)
       s << "</div>\n"
@@ -177,8 +177,8 @@
     s << "<table class='list projects'>"
     s << "<thead><tr>"
     
-    s << sort_header_tag('name', :caption => l("field_name"))
-    s << "<th class='managers'>" << l("label_managers") << "</th>"
+    s << sort_header_tag('name', :caption => l(:field_name))
+    s << "<th class='managers'>" << l(:label_managers) << "</th>"
     s << sort_header_tag('created_on', :default_order => 'desc')
     s << sort_header_tag('updated_on', :default_order => 'desc')
 
diff -r fe0249c097f6 -r 6d4cafba9468 app/views/search/index.html.erb
--- a/app/views/search/index.html.erb	Wed Jul 11 13:33:14 2012 +0100
+++ b/app/views/search/index.html.erb	Wed Jul 11 14:36:11 2012 +0100
@@ -21,7 +21,7 @@
 <% end %>
 </div>
 
-<% 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 %>
    <h3><%= l(:label_matching_project_plural) %> (<%= @project_matches.count %>)</h3>
     <dl id="search-results">
       <% @project_matches.each do |e| %>
diff -r fe0249c097f6 -r 6d4cafba9468 app/views/welcome/index.html.erb
--- a/app/views/welcome/index.html.erb	Wed Jul 11 13:33:14 2012 +0100
+++ b/app/views/welcome/index.html.erb	Wed Jul 11 14:36:11 2012 +0100
@@ -27,10 +27,20 @@
     <ul>
     <% for project in @projects %>
       <% @project = project %>
-			<li class="latest">
-			<span class="title"><%= link_to_project project %></span>
-			<span class="time"><%= format_time(project.created_on)%></span>
-			<%= render_project_short_description project %>
+	<li class="latest">
+	<span class="title">
+	  <% if !project.root? %>
+	    <% project.ancestors.each do |p| %>
+	      <%= h(p) %>&nbsp;&#187;
+	    <% end %>
+	  <% end %>
+	<%= link_to_project project %>
+	</span>
+	<% if !project.is_public? %>
+	   <span class="private"><%= l(:field_is_private) %></span>
+	<% end %>
+	<span class="time"><%= format_time(project.created_on)%></span>
+	<%= render_project_short_description project %>
       </li>
     <% end %>
     <% @project = nil %>