Mercurial > hg > soundsoftware-site
changeset 944:03975ec7378d luisf
Merge
author | luisf <luis.figueira@eecs.qmul.ac.uk> |
---|---|
date | Wed, 11 Jul 2012 14:43:58 +0100 |
parents | 9b10514b9248 (current diff) 1affbc7f4b30 (diff) |
children | 75351d69e2ba 83866d58f2dd 64d990177cda |
files | |
diffstat | 3 files changed, 19 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- 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 << "<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/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 %> </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| %>
--- 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 @@ <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 %>