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

Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course

This commit is contained in:
cxt 2016-03-08 09:13:27 +08:00
parent 40754bff0e 56372fbdd5
commit f0e3fe8ff7
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/views/layouts/base_courses.html.erb
View File

@ -143,18 +143,19 @@
<% unless contributor_course_scor(@course.id).count == 0 %> <% unless contributor_course_scor(@course.id).count == 0 %>
<ul class="rankList"> <ul class="rankList">
<h4>课程活跃度 <h4>课程活跃度
<a class="contributor_course" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))">积分规则</a> <a class="contributor_course" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))" style="cursor: pointer; position:relative;">积分规则</a>
</h4> </h4>
<div style="display: none;padding: 5px;" class="numIntro color_888"> <div class="numIntro undis" style="cursor:pointer;">
<div class="contributor_course_innor">积分规则</div> <div class="active-degree-rule">
资源发布：资源数 x 5 </br> 积分规则<br/>
问答发布：发帖数 x 2 </br> 资源发布：资源数 x 5 <br/>
通知发布：通知数 x 1 </br> 问答发布：发帖数 x 2 <br/>
问答回复：回复数 x 1 </br> 通知发布：通知数 x 1 <br/>
作业留言：留言数 x 1 </br> 问答回复：回复数 x 1 <br/>
通知留言：留言数 x 1 </br> 作业留言：留言数 x 1 <br/>
课程留言：留言数 x 1 </br> 通知留言：留言数 x 1 <br/>
总得分为以上得分之和 课程留言：留言数 x 1 <br/>
总得分为以上得分之和</div>
</div> </div>
<% contributor_course_scor(@course.id).each do |contributor_score| %> <% contributor_course_scor(@course.id).each do |contributor_score| %>
@ -168,8 +169,8 @@
<p><span class="c_green" style="cursor:pointer"> <p><span class="c_green" style="cursor:pointer">
<a onmouseover ="message_titile_show($(this),event)" onmouseout ="message_titile_hide($(this))" class="c_green"> <a onmouseover ="message_titile_show($(this),event)" onmouseout ="message_titile_hide($(this))" class="c_green">
<%=total_score %></a></span></p> <%=total_score %></a></span></p>
<div style="display: none" class="numIntro color_888"> <div style="display: none" class="numIntro">
<div class="contributor_course_calculate">积分计算</div> <div class="contributor-course-calculate">积分计算</div>
<%# unless contributor_score.resource_num.to_i == 0 %> <%# unless contributor_score.resource_num.to_i == 0 %>
<div style="padding-left: 2px;padding-bottom: 2px;padding-right: 2px"> <div style="padding-left: 2px;padding-bottom: 2px;padding-right: 2px">
资源发布数 x 5 = <%= contributor_score.resource_num.to_i %> x 5 = <%= contributor_score.resource_num.to_i * 5 %></br> 资源发布数 x 5 = <%= contributor_score.resource_num.to_i %> x 5 = <%= contributor_score.resource_num.to_i * 5 %></br>
@ -208,10 +209,11 @@
<% unless hero_homework_scores.map(&:score).detect{|s| s.to_i != 0}.nil? %> <% unless hero_homework_scores.map(&:score).detect{|s| s.to_i != 0}.nil? %>
<ul class="rankList"> <ul class="rankList">
<h4><span>课程英雄榜</span> <h4><span>课程英雄榜</span>
<a class="contributor_course" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))">积分规则</a></h4> <a class="contributor_course" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))" style="cursor:pointer;">积分规则</a></h4>
<div style="display: none" class="numIntro color_888"> <div style="cursor:pointer;" class="numIntro undis">
<div class="hero_course_innor">积分规则</div> <div class="hero-degree-rule">积分规则<br/>
英雄榜的得分是每个同学作业的得分总和 英雄榜的得分是每个同学作业的得分总和
</div>
</div> </div>
<% hero_homework_scores.each do |student_score| %> <% hero_homework_scores.each do |student_score| %>
<% if student_score.score.to_i != 0 %> <% if student_score.score.to_i != 0 %>

1
db/schema.rb
View File

@ -1387,7 +1387,6 @@ ActiveRecord::Schema.define(:version => 20160304234903) do
t.integer "changeset_num", :default => 0 t.integer "changeset_num", :default => 0
t.integer "board_message_num", :default => 0 t.integer "board_message_num", :default => 0
t.integer "board_num", :default => 0 t.integer "board_num", :default => 0
t.integer "act_num", :default => 0
t.integer "attach_num", :default => 0 t.integer "attach_num", :default => 0
t.datetime "commit_time" t.datetime "commit_time"
end end

7
public/stylesheets/courses.css
View File

@ -1286,7 +1286,6 @@ a.chooseActive {background-color:#269ac9; color:#ffffff;}
.subjectType {width:70px; text-align:center;} .subjectType {width:70px; text-align:center;}
.subjectCount {width:65px; text-align:center;} .subjectCount {width:65px; text-align:center;}
a.contributor_course{float: right; color: #888; font-size: 12px; font-weight: normal;} a.contributor_course{float: right; color: #888; font-size: 12px; font-weight: normal;}
.contributor_course_innor{font-size: 12px;color: #888;padding-left: 36px;} .active-degree-rule{font-size: 12px;color: #888; text-align: center; cursor: pointer;}
.hero_course_innor{font-size: 12px;color: #888;padding-left:77px;} .hero-degree-rule{font-size: 12px;color: #888;text-align: center;}
.contributor_course_calculate{padding-left: 54px; font-size: 12px;color: #888} .contributor-course-calculate{padding-left: 54px; font-size: 12px;color: #888}
.color_888{color: #888}