From 35c60c325339bc1e2416a2123beb794a6ae0169e Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 5 Nov 2015 09:37:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E4=BF=A1=E6=81=AF=E6=A0=B7=E5=BC=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/index.html.erb | 27 +++++++++++++++---- app/views/users/_course_homework.html.erb | 18 ++++++------- .../users/_user_homework_detail.html.erb | 20 +++++++------- public/stylesheets/courses.css | 5 +++- public/stylesheets/new_user.css | 7 +++-- 5 files changed, 50 insertions(+), 27 deletions(-) diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb index 78f11737b..8f1f0033e 100644 --- a/app/views/student_work/index.html.erb +++ b/app/views/student_work/index.html.erb @@ -120,14 +120,31 @@
- + <% if @homework.homework_detail_manual%> - <% if @homework.homework_detail_manual.comment_status == 1%> - 未开启匿评 + <% if @homework.homework_detail_manual.comment_status == 0 %> + 未发布 + <% elsif @homework.homework_detail_manual.comment_status == 1%> + <% if @homework.anonymous_comment == 0%> + 未开启匿评 + <% else %> + 匿评已禁用 + <% end %> + 作品提交中 <% elsif @homework.homework_detail_manual.comment_status == 2%> - 匿评中 + <% if @homework.anonymous_comment == 0%> + 匿评中 + <% else %> + 匿评已禁用 + <% end %> + 教师评阅中 <% elsif @homework.homework_detail_manual.comment_status == 3%> - 匿评已结束 + <% if @homework.anonymous_comment == 0%> + 匿评已结束 + <% else %> + 匿评已禁用 + <% end %> + 教师评阅中 <% end%> <% end%> [ 隐藏作业信息 ] diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index be7945cc0..f442e34e4 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -19,25 +19,25 @@ <% if activity.homework_detail_manual%> <% if activity.homework_detail_manual.comment_status == 1%> <% if activity.anonymous_comment == 0%> - 未开启匿评 + 未开启匿评 <% else %> - 匿评已禁用 + 匿评已禁用 <% end %> - 作品提交中 + 作品提交中 <% elsif activity.homework_detail_manual.comment_status == 2%> <% if activity.anonymous_comment == 0%> - 匿评中 + 匿评中 <% else %> - 匿评已禁用 + 匿评已禁用 <% end %> - 教师评阅中 + 教师评阅中 <% elsif activity.homework_detail_manual.comment_status == 3%> <% if activity.anonymous_comment == 0%> - 匿评已结束 + 匿评已结束 <% else %> - 匿评已禁用 + 匿评已禁用 <% end %> - 教师评阅中 + 教师评阅中 <% end%> <% end%>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb index f9743d7c3..1947c8ce8 100644 --- a/app/views/users/_user_homework_detail.html.erb +++ b/app/views/users/_user_homework_detail.html.erb @@ -16,28 +16,28 @@ <% if homework_common.homework_detail_manual%> <% if homework_common.homework_detail_manual.comment_status == 0 %> - 未发布 + 未发布 <% elsif homework_common.homework_detail_manual.comment_status == 1%> <% if homework_common.anonymous_comment == 0%> - 未开启匿评 + 未开启匿评 <% else %> - 匿评已禁用 + 匿评已禁用 <% end %> - 作品提交中 + 作品提交中 <% elsif homework_common.homework_detail_manual.comment_status == 2%> <% if homework_common.anonymous_comment == 0%> - 匿评中 + 匿评中 <% else %> - 匿评已禁用 + 匿评已禁用 <% end %> - 教师评阅中 + 教师评阅中 <% elsif homework_common.homework_detail_manual.comment_status == 3%> <% if homework_common.anonymous_comment == 0%> - 匿评已结束 + 匿评已结束 <% else %> - 匿评已禁用 + 匿评已禁用 <% end %> - 教师评阅中 + 教师评阅中 <% end%> <% end%> diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 22560f0aa..7a3d43469 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -178,7 +178,9 @@ a.f_grey:hover {color:#000000;} /*.upbtn{ margin:42px 0 0 10px; border:none; color:#999; width:150px;}*/ .red_btn_cir{ background:#e74c3c; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} .green_btn_cir{ background:#28be6c; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} -.grey_btn_cir{ background:#b2b2b2; padding:1px 3px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} +.green_homework_btn_cir{ background:#28be6c; padding:1px 3px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} +.grey_btn_cir{ background:#b2b2b2; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} +.grey_homework_btn_cir{ background:#b2b2b2; padding:1px 3px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} .blue_btn_cir{ background:#3498db; padding:1px 3px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} .orange_btn_cir{ background:#e67e22; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} .sticky_btn_cir{ background:#269ac9; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} @@ -966,6 +968,7 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r .ProResultCon{ padding:10px; color:#888888; line-height:24px; border-bottom:1px solid #dddddd; } .W50{ width:50px;} .W200{ width:200px;} +.m_w460{max-width: 460px;} .m_w505{max-width: 505px;} .m_w500{max-width: 500px;} .m_w530{max-width: 530px;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 061ad0561..0b45685ee 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -293,8 +293,10 @@ a:hover.bgreen_n_btn{background:#08a384;} .more_btn{-moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #9DCEFF; color:#9DCEFF; border-radius:3px; padding:0px 3px;} .upbtn{ margin:42px 0 0 10px; border:none; color:#999; width:150px;} .red_btn_cir{ background:#e74c3c; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} -.green_btn_cir{ background:#28be6c; padding:1px 3px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} -.grey_btn_cir{ background:#b2b2b2; padding:1px 3px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} +.green_btn_cir{ background:#28be6c; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} +.green_homework_btn_cir{ background:#28be6c; padding:1px 3px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} +.grey_btn_cir{ background:#b2b2b2; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} +.grey_homework_btn_cir{ background:#b2b2b2; padding:1px 3px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} .blue_btn_cir{ background:#3498db; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} .orange_btn_cir{ background:#e67e22; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} .sticky_btn_cir{ background:#269ac9; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} @@ -1073,6 +1075,7 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r .ProResultCon{ padding:10px; color:#888888; line-height:24px; border-bottom:1px solid #dddddd; } .W50{ width:50px;} .W200{ width:200px;} +.m_w460{max-width: 460px;} .m_w505{max-width: 505px;} .m_w530{max-width: 530px;} .ProResultTable{ color:#888888;}