jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

作品列表的作品信息样式调整

This commit is contained in:
cxt 2015-11-05 09:37:56 +08:00
parent c6f365c1ac
commit 35c60c3253
5 changed files with 50 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/views/student_work/index.html.erb
View File

@ -120,14 +120,31 @@
<div class="homeworkInfo" id="homeworkInformation"> <div class="homeworkInfo" id="homeworkInformation">
<div class=""> <div class="">
<div class="homepagePostTitle fl hidden m_w500" title="<%= @homework.name %>"><%= @homework.name %></div> <div class="homepagePostTitle fl hidden m_w460" title="<%= @homework.name %>"><%= @homework.name %></div>
<% if @homework.homework_detail_manual%> <% if @homework.homework_detail_manual%>
<% if @homework.homework_detail_manual.comment_status == 1%> <% if @homework.homework_detail_manual.comment_status == 0 %>
<span class="grey_btn_cir ml10">未开启匿评</span> <span class="grey_homework_btn_cir ml5">未发布</span>
<% elsif @homework.homework_detail_manual.comment_status == 1%>
<% if @homework.anonymous_comment == 0%>
<span class="grey_homework_btn_cir ml5">未开启匿评</span>
<% else %>
<span class="grey_homework_btn_cir ml5">匿评已禁用</span>
<% end %>
<span class="green_homework_btn_cir ml5">作品提交中</span>
<% elsif @homework.homework_detail_manual.comment_status == 2%> <% elsif @homework.homework_detail_manual.comment_status == 2%>
<span class="green_btn_cir ml10">匿评中</span> <% if @homework.anonymous_comment == 0%>
<span class="green_homework_btn_cir ml5">匿评中</span>
<% else %>
<span class="grey_homework_btn_cir ml5">匿评已禁用</span>
<% end %>
<span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
<% elsif @homework.homework_detail_manual.comment_status == 3%> <% elsif @homework.homework_detail_manual.comment_status == 3%>
<span class="grey_btn_cir ml10">匿评已结束</span> <% if @homework.anonymous_comment == 0%>
<span class="grey_homework_btn_cir ml5">匿评已结束</span>
<% else %>
<span class="grey_homework_btn_cir ml5">匿评已禁用</span>
<% end %>
<span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
<% end%> <% end%>
<% end%> <% end%>
<span class="fr c_grey"> <a href="javascript:void(0);" class="linkGrey2" id="homework_info_hidden">[ 隐藏作业信息 ]</a> </span> <span class="fr c_grey"> <a href="javascript:void(0);" class="linkGrey2" id="homework_info_hidden">[ 隐藏作业信息 ]</a> </span>

18
app/views/users/_course_homework.html.erb
View File

@ -19,25 +19,25 @@
<% if activity.homework_detail_manual%> <% if activity.homework_detail_manual%>
<% if activity.homework_detail_manual.comment_status == 1%> <% if activity.homework_detail_manual.comment_status == 1%>
<% if activity.anonymous_comment == 0%> <% if activity.anonymous_comment == 0%>
<span class="grey_btn_cir ml5">未开启匿评</span> <span class="grey_homework_btn_cir ml5">未开启匿评</span>
<% else %> <% else %>
<span class="grey_btn_cir ml5">匿评已禁用</span> <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
<% end %> <% end %>
<span class="green_btn_cir ml5">作品提交中</span> <span class="green_homework_btn_cir ml5">作品提交中</span>
<% elsif activity.homework_detail_manual.comment_status == 2%> <% elsif activity.homework_detail_manual.comment_status == 2%>
<% if activity.anonymous_comment == 0%> <% if activity.anonymous_comment == 0%>
<span class="green_btn_cir ml5">匿评中</span> <span class="green_homework_btn_cir ml5">匿评中</span>
<% else %> <% else %>
<span class="grey_btn_cir ml5">匿评已禁用</span> <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
<% end %> <% end %>
<span class="green_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span> <span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
<% elsif activity.homework_detail_manual.comment_status == 3%> <% elsif activity.homework_detail_manual.comment_status == 3%>
<% if activity.anonymous_comment == 0%> <% if activity.anonymous_comment == 0%>
<span class="grey_btn_cir ml5">匿评已结束</span> <span class="grey_homework_btn_cir ml5">匿评已结束</span>
<% else %> <% else %>
<span class="grey_btn_cir ml5">匿评已禁用</span> <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
<% end %> <% end %>
<span class="green_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span> <span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
<% end%> <% end%>
<% end%> <% end%>
<div class="homepagePostSubmitContainer"> <div class="homepagePostSubmitContainer">

20
app/views/users/_user_homework_detail.html.erb
View File

@ -16,28 +16,28 @@
<% if homework_common.homework_detail_manual%> <% if homework_common.homework_detail_manual%>
<% if homework_common.homework_detail_manual.comment_status == 0 %> <% if homework_common.homework_detail_manual.comment_status == 0 %>
<span class="grey_btn_cir ml5">未发布</span> <span class="grey_homework_btn_cir ml5">未发布</span>
<% elsif homework_common.homework_detail_manual.comment_status == 1%> <% elsif homework_common.homework_detail_manual.comment_status == 1%>
<% if homework_common.anonymous_comment == 0%> <% if homework_common.anonymous_comment == 0%>
<span class="grey_btn_cir ml5">未开启匿评</span> <span class="grey_homework_btn_cir ml5">未开启匿评</span>
<% else %> <% else %>
<span class="grey_btn_cir ml5">匿评已禁用</span> <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
<% end %> <% end %>
<span class="green_btn_cir ml5">作品提交中</span> <span class="green_homework_btn_cir ml5">作品提交中</span>
<% elsif homework_common.homework_detail_manual.comment_status == 2%> <% elsif homework_common.homework_detail_manual.comment_status == 2%>
<% if homework_common.anonymous_comment == 0%> <% if homework_common.anonymous_comment == 0%>
<span class="green_btn_cir ml5">匿评中</span> <span class="green_homework_btn_cir ml5">匿评中</span>
<% else %> <% else %>
<span class="grey_btn_cir ml5">匿评已禁用</span> <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
<% end %> <% end %>
<span class="green_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span> <span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
<% elsif homework_common.homework_detail_manual.comment_status == 3%> <% elsif homework_common.homework_detail_manual.comment_status == 3%>
<% if homework_common.anonymous_comment == 0%> <% if homework_common.anonymous_comment == 0%>
<span class="grey_btn_cir ml5">匿评已结束</span> <span class="grey_homework_btn_cir ml5">匿评已结束</span>
<% else %> <% else %>
<span class="grey_btn_cir ml5">匿评已禁用</span> <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
<% end %> <% end %>
<span class="green_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span> <span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
<% end%> <% end%>
<% end%> <% end%>

5
public/stylesheets/courses.css
View File

@ -178,7 +178,9 @@ a.f_grey:hover {color:#000000;}
/*.upbtn{ margin:42px 0 0 10px; border:none; color:#999; width:150px;}*/ /*.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;} .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;} .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;} .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;} .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;} .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; } .ProResultCon{ padding:10px; color:#888888; line-height:24px; border-bottom:1px solid #dddddd; }
.W50{ width:50px;} .W50{ width:50px;}
.W200{ width:200px;} .W200{ width:200px;}
.m_w460{max-width: 460px;}
.m_w505{max-width: 505px;} .m_w505{max-width: 505px;}
.m_w500{max-width: 500px;} .m_w500{max-width: 500px;}
.m_w530{max-width: 530px;} .m_w530{max-width: 530px;}

7
public/stylesheets/new_user.css
View File

@ -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;} .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;} .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;} .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;} .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 10px; -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;} .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;} .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; } .ProResultCon{ padding:10px; color:#888888; line-height:24px; border-bottom:1px solid #dddddd; }
.W50{ width:50px;} .W50{ width:50px;}
.W200{ width:200px;} .W200{ width:200px;}
.m_w460{max-width: 460px;}
.m_w505{max-width: 505px;} .m_w505{max-width: 505px;}
.m_w530{max-width: 530px;} .m_w530{max-width: 530px;}
.ProResultTable{ color:#888888;} .ProResultTable{ color:#888888;}