Merge remote-tracking branch 'origin/szzh' into guange_dev

app/views/courses/homework.html.erb

@@ -31,7 +31,7 @@
         <% end %>
         <div class="cl"></div>
         <script>
-            $(function(){if($("#bid_description_<%= bid.id%>_content").height()>38){$("#bid_show_more_des_button<%= bid.id%>").show();}});
+            $(function(){if($("#bid_description_<%= bid.id%>_content").height()>360){$("#bid_show_more_des_button<%= bid.id%>").show();}});
         </script>
         <div  id="bid_description_<%= bid.id%>" class="news_description mt5">
           <div id="bid_description_<%= bid.id%>_content" class="upload_img">

app/views/welcome/_course_list.html.erb

@@ -25,7 +25,7 @@
             <%= link_to course.school.name.try(:gsub, /(.+)$/, '\1'), options={:action => 'course', :school_id => course.school.id}, html_options={:method => 'get'} %>
         <% end %>
         (<%= course.members.count %>人)
-        <% files_count = course.attachments.count %>
+        <% files_count = visable_attachemnts_incourse(course).count %>
         <% if files_count > 0%>
             (<%= link_to "#{files_count.to_s}份", course_files_path(course) %>公开资料)
         <% end %>

public/stylesheets/courses.css

@@ -19,7 +19,7 @@ a:hover.project_name{ color:#016f33;}
 a.project_txt02{ color:#0781b4; width:618px; display:block; float:left;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 a:hover.project_txt{ color:#066e9a;}
 .noline{ border-bottom:none;}
-.news_description{max-height: 38px;overflow:hidden; }
+.news_description{max-height: 360px;overflow:hidden; }
 .news_description_none{max-height: none;}
 a.news_foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:600px; height:20px; padding-top:3px; cursor:pointer;}
 a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;}