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

app/views/bids/_bid_homework_show.html.erb

@@ -165,7 +165,7 @@
             <tr>
               <td colspan="2" width="580px" >
                 <span class="font_description">
-                  <%= textilizable bid, :description %>
+                  <%= bid.description %>
                 </span>
               </td>
             </tr>

app/views/files/create.js.erb

@@ -31,4 +31,5 @@ closeModal();
 $("#resource_list").html('<%= j(render partial:  "course_file" ,locals: {course: @course}) %>');
 <%end%>
 <% end %>
+$(document).ready(img_thumbnails);
 

app/views/projects/invite_members_by_mail.html.erb

@@ -4,7 +4,7 @@
         var filter = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
         if(email == "")
         {
-            $("#valid_email").html("电子邮件不能为空");
+            $("#valid_email").html("邮箱地址不能为空！");
         }
         else if (filter.test(email)) {
             $("#valid_email").html("");