diff --git a/app/views/welcome/_search_project.html.erb b/app/views/welcome/_search_project.html.erb index a082a6dcf..df5ce7ad3 100644 --- a/app/views/welcome/_search_project.html.erb +++ b/app/views/welcome/_search_project.html.erb @@ -3,5 +3,12 @@ <%= text_field_tag 'name', params[:name], placeholder:'请输入要搜索的关键字', :size => 30 %> <%= hidden_field_tag 'project_type', project_type %> <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> - + +
+ <%= if project_type == 0 + "全站项目搜索。不会搜索私有项目" + else + "全站课程搜索。" + end %> +
<% end %> \ No newline at end of file diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index eae4cba2a..c88f7e0e2 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -87,7 +87,7 @@
@@ -106,41 +106,13 @@ <%= stylesheet_link_tag 'welcome' %> -

热门项目

- <%= link_to "更多>>", {:controller => 'projects', :action => 'course', :project_type => 1}, :target => "_blank" %> + <%= link_to "更多>>", { :controller => 'projects', :action => 'index', :project_type => 0, :host => Setting.project_domain}, :target => "_blank" %>
    - <% find_miracle_project(11, 7).map do |project| %> -
  • + <% find_miracle_project(10, 7).map do |project| %> +
  • <%= image_tag(get_project_avatar(project), :class => "avatar-4") %>
    @@ -150,7 +122,7 @@ (<%= link_to "#{projectCount(project)}人", project_member_path(project) ,:course =>'0' %>)
- ><%=project.description.truncate(35, omission: '...')%> + ><%=project.description.truncate(50, omission: '...')%>
<%= content_tag "span", show_grade(project),