diff --git a/app/views/student_work/_work_information.html.erb b/app/views/student_work/_work_information.html.erb index 2b5e3b67a..f8a55a03d 100644 --- a/app/views/student_work/_work_information.html.erb +++ b/app/views/student_work/_work_information.html.erb @@ -9,13 +9,11 @@

件: - <% if @student_work.attachments.count == 0%> + <% if @student_work.attachments.empty? %> <%= "无附件"%> <% else %> -

- <% @student_work.attachments.each do |attachment| %> - <%=attachment.filename %> - <% end %> +
+ <%= render :partial => 'work_attachments_status', :locals => {:attachments => @student_work.attachments, :status => 2} %>
<% end %>

diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 1cff7e07a..8b5e2fba3 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -480,7 +480,7 @@ a.xls{ margin-left:5px; color:#136b3b;} /* 开启匿评弹框 */ .anonymos{width:480px;height:180px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-215px 0 0 -300px; background:#fff; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:0px 0px 8px #194a81; overflow:auto;} .anonymos_work {position:fixed !important;left:60%;top:60%;margin:-215px 0 0 -300px; box-shadow:0px 0px 8px #194a81; overflow:auto;} -.ni_con { width:425px; margin:25px 30px;} +.ni_con { width:425px; margin:25px 30px;font-family:"微软雅黑","宋体";} .ni_con h2{ display:block; height:40px; width:425px; text-align:center; color:#3a3a3a;} .ni_con p{ color:#808181; } .ni_con a:hover{ text-decoration:none;} @@ -491,6 +491,7 @@ a:hover.tijiao{ background:#0f99a9;} .ni_con_work { width:300px; margin:25px 20px;} .ni_con_work p{ color:#808181; } a.xls{ margin-left:5px; color:#136b3b;} +.grey_c{ color:#808181;} /* 学生列表*/ .st_list{ width:670px;} .st_search{ } diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css index 6114c1b4d..b740436f9 100644 --- a/public/stylesheets/css.css +++ b/public/stylesheets/css.css @@ -152,11 +152,12 @@ a:hover.tijiao{ background:#0f99a9 !important;} /* 匿名评分弹框 */ .alert_praise{width:480px;height:200px;position:fixed;z-index:100;left:50%;top:50%;margin:-215px 0 0 -300px; background:#fff; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:0px 0px 8px #194a81; overflow:auto;} .alert .close02{width:26px;height:26px;overflow:hidden;position:absolute;top:-10px;right:-490px;background:url(images/close.png) no-repeat;cursor:pointer;} -.ni_con { width:425px; margin:25px 30px;} +.ni_con { width:425px; margin:25px 30px;font-family:"微软雅黑","宋体";} .ni_con h2{ display:block; height:40px; width:188px; margin:0 auto;} .ni_con p{ color:#808181;} .ni_con a:hover{ text-decoration:none;} +.grey_c{ color:#808181;} /*弹框*/ .black_overlay{display:none;position:absolute;top:0%;left:0%;width:100%;height:100%;background-color:black;z-index:1001;-moz-opacity:0.3;opacity:.30;filter:alpha(opacity=30);} .upload_box{display:none;position:absolute;top:25%;left:35%;width:30%;height: auto;padding:5px;border:3px solid #15bccf; background:#fff;z-index:1002;overflow:auto;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 0308ee748..7263c2f58 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -1297,7 +1297,7 @@ a:hover.SetUpIcon{background: url(../images/homepage_icon.png) 0px -486px no-rep /* 开启匿评弹框 */ .anonymos{width:480px;height:180px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-215px 0 0 -300px; background:#fff; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:0px 0px 8px #194a81; overflow:auto;} .anonymos_work {position:fixed !important;left:60%;top:60%;margin:-215px 0 0 -300px; box-shadow:0px 0px 8px #194a81; overflow:auto;} -.ni_con { width:425px; margin:15px;} +.ni_con { width:425px; margin:15px;font-family:"微软雅黑","宋体";} .ni_con h2{ display:block; height:40px; width:425px; text-align:center; color:#3a3a3a;} .ni_con p{ color:#808181; } .ni_con a:hover{ text-decoration:none;} @@ -1307,7 +1307,7 @@ a:hover.tijiao{ background:#297fb8;} .c_pink{ color:#e65d5e;} .ni_con_work { width:300px; margin:25px 20px;} .ni_con_work p{ color:#808181; } - +.grey_c{ color:#808181;} a.link_file_a{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; } a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;} .link_file_a{ display:block; max-width:450px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}