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

app/views/files/_course_list.html.erb

@@ -19,7 +19,7 @@
       <div class=" ">
         <%= link_to_attachment file, :download => true,:text => truncate(file.filename,length: 35, omission: '...'), :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l" %>
         <% if User.current.logged? %>
-          <% if is_course_teacher(User.current,@course) && file.author_id == User.current.id %>
+          <% if is_course_teacher(User.current,@course) && file.author_id == User.current.id && course_contains_attachment?(@course,file) %>
             <%= link_to("选入我的其他课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select",:remote => true) if has_course?(User.current,file) %>
 
             <% if delete_allowed && file.container_id == @course.id && file.container_type == "Course"  %>

public/stylesheets/resource.css

@@ -1,10 +1,10 @@
-body{ font-size:12px !important; font-family:"微软雅黑","宋体" !important; line-height:1.9 !important; background:#fff !important; font-style:normal !important;}
+.resource{ font-size:12px !important; font-family:"微软雅黑","宋体" !important; line-height:1.9 !important; background:#fff !important; font-style:normal !important;}
 div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,form,span,textarea{ margin:0; padding:0;}
 div,img,tr,td,textarea{ border:0;}
 table,tr,td{border:0; cellspacing:0; cellpadding:0;}
 ul,li{ list-style-type:none}
 .cl{ clear:both; overflow:hidden; }
-a{ text-decoration:none; text-align:center; }
+#resource a{ text-decoration:none; text-align:center; }
 a:hover{ text-decoration:underline;}
 /**** 常用***/
 .f_l{ float:left;}
@@ -72,12 +72,14 @@ a:hover.re_select{
     border: 1px solid #64bdd9 !important;
     color: #64bdd9 !important;
     margin-left: 10px !important;
+    text-align: center;
 }
 a:hover.re_open
 {
     background: #64bdd9;
     color: #fff !important;
     text-decoration: none !important;
+    text-align: center;
 }
 a.re_de{ color:#6883b6; margin-left:15px;}
 .re_con_box{ border-bottom:1px dashed #dadada; padding:10px 0;}