Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

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?

app/views/contests/index.html.erb

@@ -38,11 +38,16 @@
 </div>
 <% if @contests.size > 0%>
     <%= sort_contest(@s_state)%>
-    <div id="bid-show">
+    <div id="bid-show" class="projects-index">
       <%= render :partial => 'contest_list', :locals => {:contests => @contests, :contest_pages => @contest_pages} %>
     </div>
-<% else %>
+<% elsif @is_search%>
     <%= render :partial => "layouts/no_content"%>
+<% else %>
+    <%= sort_contest(@s_state)%>
+    <div id="bid-show" class="projects-index">
+      <%= render :partial => 'contest_list', :locals => {:contests => @contests, :contest_pages => @contest_pages} %>
+    </div>
 <% end %>
 
 <% html_title l(:label_contest_list)%>

app/views/courses/index.html.erb

@@ -36,7 +36,7 @@
 </div>
 <%= sort_course(@s_type,  @school_id)%>
 
-<div id="courses-index">
+<div id="courses-index" class="projects-index">
   <%if @courses%>
       <%= render_course_hierarchy(@courses)%>
   <%end%>

app/views/projects/index.html.erb

@@ -31,7 +31,7 @@
 	<% end %>
 </div>
 <%= sort_project(@s_type, @project_type) %>
-<div id="projects-index">
+<div id="projects-index" class="projects-index">
 	<%= render_project_hierarchy(@projects)%>
 </div>
 

app/views/school/index.html.erb

@@ -93,7 +93,7 @@
 
 </div>
 <div style="clear: both"></div>
-<div>
+<div class="school-index">
 	<ul id="schoollist" style="line-height: 25px">
 
 	</ul>

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}

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;
 }