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

app/helpers/files_helper.rb

@@ -86,7 +86,7 @@ module FilesHelper
   def visable_attachemnts attachments
     result = []
     attachments.each do |attachment|
-      if attachment.is_public? || (attachment.container_type == "Course" && attachment.author.member_of_course?(Course.find(attachment.container_id)))|| attachment.author_id == User.current.id
+      if attachment.is_public? || (attachment.container_type == "Course" && User.current.member_of_course?(Course.find(attachment.container_id)))|| attachment.author_id == User.current.id
         result << attachment
       end
     end
@@ -106,7 +106,7 @@ module FilesHelper
   def visable_attachemnts_insite attachments,course
     result = []
     attachments.each do |attachment|
-      if attachment.is_public? || (attachment.container_type == "Course" && attachment.container_id == course.id  && attachment.author.member_of_course?(Course.find(attachment.container_id)))|| attachment.author_id == User.current.id
+      if attachment.is_public? || (attachment.container_type == "Course" && attachment.container_id == course.id  && User.current.member_of_course?(Course.find(attachment.container_id)))|| attachment.author_id == User.current.id
         result << attachment
       end
     end

app/views/files/_course_file.html.erb

@@ -31,28 +31,33 @@
             $('#insite').attr("class", "re_schbtn b_dblue");
         }
     }
+    function buttoncss()
+    {
+        $('#incourse').attr("class", "re_schbtn b_lblue");
+        $('#insite').attr("class", "re_schbtn b_lblue");
+    }
 
 </script>
 
 <div class="container">
-<div class="resource"><!--资源库内容开始--->
-<div class="re_top">
+  <div class="resource"><!--资源库内容开始--->
+    <div class="re_top">
       <%= form_tag( search_course_files_path(@course), method: 'get',:class => "re_search f_l",:remote=>true) do %>
           <%= text_field_tag 'name', params[:name], name: "name", :class => 're_schbox',:style=>"padding: 0px"%>
-          <%= submit_tag "课内搜索", :class => "re_schbtn b_lblue",:name => "incourse",:id => "incourse", :onclick => "presscss('incourse')"%>
-          <%= submit_tag "全站搜索", :class => "re_schbtn b_lblue",:name => "insite",:id => "insite",:onclick => "presscss('insite')" %>
+          <%= submit_tag "课内搜索", :class => "re_schbtn b_lblue",:name => "incourse",:id => "incourse", :onmouseover => "presscss('incourse')",:onmouseout =>"buttoncss()" %>
+          <%= submit_tag "全站搜索", :class => "re_schbtn b_lblue",:name => "insite",:id => "insite",:onmouseover => "presscss('insite')",:onmouseout =>"buttoncss()" %>
       <% end %>
       <% if is_course_teacher(User.current,@course) %>
           <a href="javascript:void(0)" class="re_fabu f_r b_lblue" onclick="show_upload()">上传资源</a>
       <% end %>
-</div><!---re_top end-->
-<div class="cl"></div>
+    </div><!---re_top end-->
+    <div class="cl"></div>
 
-<div class="re_con" id="course_list">
-<%= render :partial => 'course_list',:locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@curse_attachments}  %>
-</div><!---re_con end-->
+    <div class="re_con" id="course_list">
+      <%= render :partial => 'course_list',:locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@curse_attachments}  %>
+    </div><!---re_con end-->
 
-</div>
+  </div>
 
 </div>
 <% html_title(l(:label_attachment_plural)) -%>