diff --git a/app/controllers/stores_controller.rb b/app/controllers/stores_controller.rb index 8225697d..e1af58b9 100644 --- a/app/controllers/stores_controller.rb +++ b/app/controllers/stores_controller.rb @@ -12,6 +12,7 @@ class StoresController < ApplicationController reorder("created_on DESC") result = resultSet.to_a.dup + @result_all_count = result.count; resultSet.to_a.map { |res| if(res.container.nil? || diff --git a/app/views/stores/_search_bar.html.erb b/app/views/stores/_search_bar.html.erb index 32caa11a..e7ec939d 100644 --- a/app/views/stores/_search_bar.html.erb +++ b/app/views/stores/_search_bar.html.erb @@ -1,6 +1,8 @@ -
+
<%= form_tag( search_stores_path, method: 'post') do %> - <%= text_field_tag 'name', params[:name], size:"100", placeholder:'请输入要搜索的关键字', name: "name", :class => 'blueinputbar'%> + <%= text_field_tag 'name', params[:name], size:"58", placeholder:'请输入要搜索的关键字', name: "name", :class => 'blueinputbar'%> +
<%= submit_tag l(:label_search), :class => "enterprise"%> + 全站文件搜索。不会搜索私有项目中的内容、学生已经提交的作业。 <% end %>
\ No newline at end of file diff --git a/app/views/stores/search.html.erb b/app/views/stores/search.html.erb index f3e2085b..f65f0464 100644 --- a/app/views/stores/search.html.erb +++ b/app/views/stores/search.html.erb @@ -3,6 +3,7 @@ <% content_for :top_field do%> <%= render 'search_bar' %> + 找到约 <%= number_with_delimiter(@result_all_count, delimiter:',') %> 条结果 <% end %> <% @searched_attach.each do |result| %> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 31ec3d1d..82406f3d 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1647,7 +1647,7 @@ zh: label_course_student: 学生 label_homework: 课程作业 label_course_file: 资源库 #资料共享 - label_stores_index: 资源索引 + label_stores_index: 资源搜索 label_course_new_homework: 新建作业 label_course_homework_list: 作业列表 label_course_homework_new: 发布作业 diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css index a2a079ba..cfe1efb7 100644 --- a/public/stylesheets/nyan.css +++ b/public/stylesheets/nyan.css @@ -487,7 +487,7 @@ input.blueinputbar:focus { line-height: 1.7em; overflow-wrap: break-word; padding-bottom: 20px; - padding-left: 20px; + /*padding-left: 20px;*/ /*width: 50em;*/ } .r1 .cb {