diff --git a/app/controllers/contests_controller.rb b/app/controllers/contests_controller.rb index 5cdbda5a7..d7a79457a 100644 --- a/app/controllers/contests_controller.rb +++ b/app/controllers/contests_controller.rb @@ -42,6 +42,7 @@ class ContestsController < ApplicationController @offset, @limit = api_offset_and_limit(:limit => 10) #@contests = Contest.visible #@contests = @contests.like(params[:name]) if params[:name].present? + @is_search = params[:name] ? true:false @contests = Contest.visible.where("name like '%#{params[:name]}%'") if params[:contests_search] (redirect_to contests_url, :notice => l(:label_sumbit_empty);return) if params[:name].blank? diff --git a/app/views/contests/index.html.erb b/app/views/contests/index.html.erb index 115b154e6..b8033f89f 100644 --- a/app/views/contests/index.html.erb +++ b/app/views/contests/index.html.erb @@ -38,11 +38,16 @@ <% if @contests.size > 0%> <%= sort_contest(@s_state)%> -
+
<%= render :partial => 'contest_list', :locals => {:contests => @contests, :contest_pages => @contest_pages} %>
-<% else %> +<% elsif @is_search%> <%= render :partial => "layouts/no_content"%> +<% else %> + <%= sort_contest(@s_state)%> +
+ <%= render :partial => 'contest_list', :locals => {:contests => @contests, :contest_pages => @contest_pages} %> +
<% end %> <% html_title l(:label_contest_list)%> diff --git a/app/views/courses/index.html.erb b/app/views/courses/index.html.erb index f781ab5c4..6b75bee67 100644 --- a/app/views/courses/index.html.erb +++ b/app/views/courses/index.html.erb @@ -36,7 +36,7 @@
<%= sort_course(@s_type, @school_id)%> -
+
<%if @courses%> <%= render_course_hierarchy(@courses)%> <%end%> diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb index 5d479bced..721fa5eaf 100644 --- a/app/views/projects/index.html.erb +++ b/app/views/projects/index.html.erb @@ -31,7 +31,7 @@ <% end %>
<%= sort_project(@s_type, @project_type) %> -
+
<%= render_project_hierarchy(@projects)%>
diff --git a/app/views/school/index.html.erb b/app/views/school/index.html.erb index 37febe309..15a76a3d4 100644 --- a/app/views/school/index.html.erb +++ b/app/views/school/index.html.erb @@ -93,7 +93,7 @@
-
+
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 1f53d9903..aed928ebe 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -2832,3 +2832,6 @@ div.repos_explain{ } .list .tableth{background-color:#EEEEEE; padding: 4px; white-space:pre;} + +.projects-index{min-height: 350px} +.school-index{min-height: 400px} \ No newline at end of file diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css index 7b35559e6..71b739ad8 100644 --- a/public/stylesheets/nyan.css +++ b/public/stylesheets/nyan.css @@ -864,7 +864,7 @@ table.content-text-list tbody tr td.locked, div.memo-section .locked { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; -box-sizing: border-box; - min-height: 200px; + min-height: 180px; }