kevinli
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_cs' into develop

This commit is contained in:
cxt 2017-09-30 16:54:50 +08:00
parent af3ca949dc 5ee2755dd2
commit d0010977dd
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/views/courses/_course_activity_content.html.erb
View File

@ -23,20 +23,23 @@
</li>
<% end %>
<div class="ml10 edu-dropdown">
<span class="mr10 color-orange03">新建</span><i class="fa fa-sort-down fl fr mt3 color-orange03"></i>
<ul class="edu-dropdown-menu" id="all_status_list" style="top:29px;left: -5px;width: 90px;">
<li>
<span class="mr8 color-orange03">新建</span><i class="fa fa-sort-down fl fr mt3 color-orange03"></i>
<ul class="edu-dropdown-menu" id="all_status_list" style="top:29px;left: -12px;width: 90px;text-align: center">
<li style="text-align:center;">
<%= link_to '普通作业'.html_safe, new_homework_common_path(:course => @course.id, :homework_type => 1),:class => "color-grey" %>
</li>
<li>
<li style="text-align:center;">
<%= link_to '实训作业'.html_safe, shixuns_homework_common_index_path(:course => @course.id),:class => "color-grey", :remote => true %>
</li>
<li>
<a class="color-grey" onclick="course_files_upload();" style="cursor: pointer">资源</a>
<li style="text-align:center;">
<a class="color-grey" href="javascript:void(0)">试&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;卷</a>
</li>
<li>
<li style="text-align:center;">
<a class="color-grey" onclick="course_files_upload();" style="cursor: pointer">资&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;源</a>
</li>
<li style="text-align:center;">
<% course_board = @course.boards.where("parent_id is NULL").first %>
<%= link_to '帖子'.html_safe, new_board_message_path(:board_id => course_board.id),:class => "color-grey" %>
<%= link_to '帖&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;子'.html_safe.html_safe, new_board_message_path(:board_id => course_board.id),:class => "color-grey" %>
</li>
</ul>
</div>

2
app/views/courses/settings/_student_table.html.erb
View File

@ -15,6 +15,7 @@
<th>姓名</th>
<th>学号</th>
<th>分班</th>
<th>作业成绩</th>
<th>发布资源</th>
<th>发布帖子</th>
<th>回复评论</th>
@ -40,6 +41,7 @@
<td><%= link_to user.show_real_name, user_path(user), :class => 'edu-txt-w140 task-hide mt5 alink-name', :target => '_blank' %></td>
<td><span class="edu-txt-w140 task-hide mt5"><%= user.user_extensions ? user.user_extensions.student_id : '' %></span></td>
<td><%= member.course_group_id == 0 ? '未分班' : member.course_group.name %></td>
<td><%#= student_course_resource_num @course, user %></td><!--作业成绩-->
<td><%= student_course_resource_num @course, user %></td>
<td><%= student_course_message_num @course, user %></td>
<td><%= student_course_reply_num @course, user %></td>

2
app/views/games/_games_list.html.erb
View File

@ -52,7 +52,7 @@
<% gold_score = @myshixun.shixun.status <= 1 ? 0 : (game.answer_open? ? -challenge.score.to_i : game.final_score.to_i) %>
<span class="color-dark-grey font-12 mr15 info-partly" id="shixun_exp_<%=challenge.id %>">经验值<span class="color-light-green ml5">+<%= final_score %></span></span>
<span class="color-dark-grey font-12 mr15 info-partly" id="shixun_grade_<%=challenge.id %>">金币<span class="<%= gold_score < 0 ? "u-color-light-red" : "color-light-green" %> ml5"><%= gold_score < 0 ? gold_score : "+"+gold_score.to_s %></span></span>
<span class="color-dark-grey font-12 mr15 info-partly" id="shixun_tag_<%=challenge.id %>">技能标签<span class="color-light-green ml5">+<%= (game.answer_open? || @myshixun.shixun.status <= 1) ? 0 : challenge.challenge_tags.count %></span></span>
<span class="color-dark-grey font-12 mr15 info-partly" id="shixun_tag_<%=challenge.id %>">技能标签<span class="<%= (game.answer_open? || @myshixun.shixun.status <= 1) ? "color-grey" : "color-light-green" %> ml5"><%= (game.answer_open? || @myshixun.shixun.status <= 1) ? "无" : "+"+challenge.challenge_tags.count.to_s %></span></span>
<% end %>
</div>
</div>

2
public/stylesheets/css/structure.css
View File

@ -535,7 +535,7 @@ a.user_editinfo{border-top:1px solid #e5e5e5; height:30px; line-height:30px; tex
.flex-cell_homepage:hover{ background-color:#3b94d6;}
.feedback_error p{display: inline;}
.activities_btn .activities_item,.activities_btn div{float: left;text-align: center;border-radius: 4px;border: 1px solid #FF7500;padding: 1px 16px;}
.activities_btn .activities_item,.activities_btn div{float: left;text-align: center;border-radius: 4px;border: 1px solid #FF7500;padding: 1px 10px;}
.activities_btn .activities_item:hover{color:#fff!important;background: #FF7500;}
.activities_btn .activities_item:hover .color-orange03{color: #fff!important;}
.activities_btn .activities_item .edu-cir-orange{color: #fff!important;}