diff --git a/app/helpers/stores_helper.rb b/app/helpers/stores_helper.rb index e987367ad..0ae91a644 100644 --- a/app/helpers/stores_helper.rb +++ b/app/helpers/stores_helper.rb @@ -156,11 +156,11 @@ module StoresHelper klass = project.class.to_s case klass when "Project" - project_list = link_to l(:label_project_plural), projects_path + project_list = "#{l(:label_project_plural)}" project_item = link_to project.to_s, project_path(project) [project_list, project_item] when "Course" - course_list = link_to l(:label_new_course), courses_path + course_list = "#{l(:label_new_course)}" course_item = link_to project.name, course_path(project) [course_list, course_item] else diff --git a/app/views/tags/_show_projects.html.erb b/app/views/tags/_show_projects.html.erb index 2b6b42189..de8e10018 100644 --- a/app/views/tags/_show_projects.html.erb +++ b/app/views/tags/_show_projects.html.erb @@ -4,9 +4,15 @@ <% projects_results.each do |prj| %>

- <%= l(:label_tags_project_name) %><%= link_to "#{prj.name}",:controller => "projects",:action => "show",:id => prj.id %> + + <%= l(:label_tags_project_name) %> + <%= link_to "#{prj.name}",:controller => "projects",:action => "show",:id => prj.id %> +
- <%= l(:label_tags_project_description) %><%= textilizable prj.description %> + + <%= l(:label_tags_project_description) %> + + <%= textilizable prj.description %>

diff --git a/app/views/tags/_tag_search_results.html.erb b/app/views/tags/_tag_search_results.html.erb index 84a672617..591a86a70 100644 --- a/app/views/tags/_tag_search_results.html.erb +++ b/app/views/tags/_tag_search_results.html.erb @@ -2,32 +2,50 @@ <% unless show_flag.nil? %> <% case %> <% when show_flag == '1' %> - <%=l(:label_user)%>(<%= @results_count %>) + + <%=l(:label_user)%> + ( + <%= @results_count %> + ) + <%= render :partial => "show_users",:locals => {:users_results => users_results}%> <% when show_flag == '2'%> - <%=l(:label_project)%>(<%= @results_count %>) + + <%=l(:label_project)%>(<%= @results_count %>) + <%= render :partial => "show_projects",:locals => {:projects_results => projects_results }%> <% when show_flag == '3'%> <%=l(:label_issue)%>(<%= @results_count %>) <%= render :partial => "show_issues",:locals => {:issues_results => issues_results }%> <% when show_flag == '4'%> - <%= l(:label_requirement)%>(<%= @results_count %>) + + <%= l(:label_requirement)%>(<%= @results_count %>) + <%= render :partial => "show_bids",:locals => {:bids_results => bids_results}%> <% when show_flag == '5'%> - <%= l(:label_forum)%>(<%= @results_count %>) + + <%= l(:label_forum)%>(<%= @results_count %>) + <%= render :partial => "show_forums",:locals => {:forums_results => forums_results}%> <% when show_flag == '6'%> - <%= l(:label_attachment)%>(<%= @results_count %>) + + <%= l(:label_attachment)%>(<%= @results_count %>) + <%= render :partial => "show_attachments",:locals => {:attachments_results => attachments_results}%> <% when show_flag == '7'%> - <%= l(:label_contest_innovate)%>(<%= @results_count %>) + + <%= l(:label_contest_innovate)%>(<%= @results_count %>) + <%= render :partial => "show_contests",:locals => {:contests_results => contests_results}%> <% when show_flag == '8'%> <%#= l(:label_attachment)%> - 开源项目:(<%= @results_count %>) + 开源项目:(<%= @results_count %>) + <%= render :partial => "show_open_source_projects",:locals => {:projects_results => open_source_projects_results}%> <% when show_flag == '9'%> - <%= l(:label_course)%>(<%= @results_count %>) + + <%= l(:label_course)%>(<%= @results_count %>) + <%= render :partial => "show_courses",:locals => {:courses_results => courses_results}%> <% else %> <%= l(:label_tags_all_objects)%>