Mercurial > hg > soundsoftware-site
changeset 939:1affbc7f4b30
#501 "new projects" on front page should list hierarchy for non-top-level projects
#493 Projects box in front page should label private projects as such
| author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
|---|---|
| date | Wed, 11 Jul 2012 14:35:31 +0100 |
| parents | 598d53decdd8 |
| children | 9fda6880be81 6d4cafba9468 aa5332ba7874 03975ec7378d |
| files | app/helpers/projects_helper.rb app/views/welcome/index.html.erb |
| diffstat | 2 files changed, 18 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/app/helpers/projects_helper.rb Wed Jul 11 14:05:56 2012 +0100 +++ b/app/helpers/projects_helper.rb Wed Jul 11 14:35:31 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')
--- a/app/views/welcome/index.html.erb Wed Jul 11 14:05:56 2012 +0100 +++ b/app/views/welcome/index.html.erb Wed Jul 11 14:35:31 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) %> » + <% 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 %>