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

app/views/files/_course_list.html.erb

@@ -14,6 +14,7 @@
   </p>
 </div>
 <div class="cl"></div>
+<div class="for_img_thumbnails">
 <% curse_attachments.each do |file| %>
     <div class="re_con_box">
       <div class="">
@@ -50,6 +51,7 @@
       <div class="cl"></div>
     </div><!---re_con_box end-->
 <% end %>
+</div>
 <ul class="wlist">
   <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
 </ul>

public/javascripts/application.js

@@ -632,7 +632,12 @@ function img_thumbnails() {
     if (/\.(jpg|png|gif|bmp|jpeg|PNG|BMP|GIF|JPG|JPEG)$/.test(href_value)) {
       $(element).colorbox({rel:'nofollow'});
     }
-
+  });
+  $('.for_img_thumbnails').find('a').each(function(index, element) {
+    var href_value = $(element).attr('href');
+    if (/\.(jpg|png|gif|bmp|jpeg|PNG|BMP|GIF|JPG|JPEG)$/.test(href_value)) {
+      $(element).colorbox({rel:'nofollow'});
+     }
   });
 }
 $(document).ready(img_thumbnails);