From 36c65d2fe3d8bea3578d89262ba9efd319677849 Mon Sep 17 00:00:00 2001 From: z9han Date: Mon, 22 Dec 2014 15:27:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?#1694=E8=AF=BE=E7=A8=8B=EF=BC=9A=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E2=80=9C=E8=AF=BE=E7=A8=8B=E5=8A=A8=E6=80=81=E2=80=9D?= =?UTF-8?q?=E6=88=96=E2=80=9C=E8=AF=BE=E7=A8=8B=E4=BD=9C=E4=B8=9A=E2=80=9D?= =?UTF-8?q?=EF=BC=8C=E5=B7=A6=E4=BE=A7=E7=9A=84=E8=AF=BE=E7=A8=8B=E5=90=8D?= =?UTF-8?q?=E9=9D=A0=E5=B7=A6=E6=98=BE=E7=A4=BA=EF=BC=8C=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E2=80=9C=E8=B5=84=E6=BA=90=E5=BA=93=E2=80=9D=EF=BC=8C=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E5=90=8D=E5=B1=85=E4=B8=AD=E6=98=BE=E7=A4=BA=E3=80=82?= =?UTF-8?q?=20=E5=8E=9F=E5=9B=A0=EF=BC=9A=E5=8F=97=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=96=B0=E6=A0=B7=E5=BC=8F=E5=BD=B1=E5=93=8D?= =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=EF=BC=9A=E5=B0=86=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=A8=A1=E5=9D=97=E7=9A=84=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=99=90=E5=AE=9A=E5=9C=A8=E8=B5=84=E6=BA=90=E6=A8=A1=E5=9D=97?= =?UTF-8?q?div=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/resource.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/stylesheets/resource.css b/public/stylesheets/resource.css index 86ff85825..5dc2bcabc 100644 --- a/public/stylesheets/resource.css +++ b/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;} From b143093e490044e30a610983676764ffb273194c Mon Sep 17 00:00:00 2001 From: z9han Date: Mon, 22 Dec 2014 15:45:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1=E3=80=81#1707=20=E8=AF=BE=E7=A8=8B--?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=EF=BC=9A=E5=85=A8=E7=AB=99=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E5=BE=97=E5=88=B0=E5=BD=93=E5=89=8D=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=9A=84=E8=B5=84=E6=BA=90=EF=BC=8C=E5=BA=94?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=BA=E2=80=9C=E9=80=89=E5=85=A5=E6=88=91?= =?UTF-8?q?=E7=9A=84=E8=AF=BE=E7=A8=8B=E2=80=9D.2=E3=80=81=E5=85=AC?= =?UTF-8?q?=E5=BC=80=E7=A7=81=E6=9C=89=E5=AD=97=E6=A0=B7=E6=9C=AA=E5=B1=85?= =?UTF-8?q?=E4=B8=AD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/files/_course_list.html.erb | 2 +- public/stylesheets/resource.css | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb index a006ef8ab..d02bf157b 100644 --- a/app/views/files/_course_list.html.erb +++ b/app/views/files/_course_list.html.erb @@ -19,7 +19,7 @@
<%= 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" %> diff --git a/public/stylesheets/resource.css b/public/stylesheets/resource.css index 5dc2bcabc..39922d6f1 100644 --- a/public/stylesheets/resource.css +++ b/public/stylesheets/resource.css @@ -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;}