diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 1e0bf0c60..85c9c74b4 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -7,7 +7,7 @@
<% homework_num = @course.homework_commons.where("publish_time <= '#{Date.today}'").count %>
<% end %>
-
+
@@ -142,32 +142,55 @@
<div class="cl"></div>
<% unless contributor_course_scor(@course.id).count == 0 %>
<ul class="rankList">
- <h4>课程活跃度</h4>
+ <h4>课程活跃度<a style="float: right; color: #7f7f7f; font-size: 12px;" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))">积分规则</a></h4>
+ <div style="display: none" class="numIntro">
+ <div style="padding-left: 35px; font-size: 14px;color: #3b3b3b">积分规则</div>
+ 资源得分：资源数 x 5 </br>
+ 讨论得分：发帖数 x 2 </br>
+ 回复得分：回复数 x 1 </br>
+ 课程留言得分：留言数 x 1 </br>
+ 作业留言得分：留言数 x 1 </br>
+ 通知得分：通知数 x 1 </br>
+ 总得分为以上得分之和
+ </div>
+
<% contributor_course_scor(@course.id).each do |contributor_score| %>
<% unless contributor_score.total_score ==0 %>
<li> <a href="javascript:void:(0);"><%=link_to image_tag(url_to_avatar(contributor_score.user), :width => "35", :height => "35", :class=> "rankPortrait"),user_path(contributor_score.user) %></a>
<p><a href="javascript:void:(0);"><%=link_to contributor_score.user.show_name, user_path(contributor_score.user), :title => contributor_score.user.show_name %></a></p>
<p><span class="c_green" style="cursor:pointer">
- <a onmouseover ="message_titile_show($(this),event)" onmouseout ="message_titile_hide($(this))" class="c_green"><%= contributor_score.total_score.to_i %></a></span></p>
+ <a onmouseover ="message_titile_show($(this),event)" onmouseout ="message_titile_hide($(this))" class="c_green">
+ <%=total_score = contributor_score.resource_num.to_i * 5 + contributor_score.message_num.to_i * 2 +
+ contributor_score.message_reply_num.to_i * 1 + contributor_score.journal_num.to_i * 1 +
+ + contributor_score.homework_journal_num * 1 + contributor_score.news_reply_num.to_i * 1 %></a></span></p>
<div style="display: none" class="numIntro">
- <% unless contributor_score.resource_num == 0 %>
- 课程资源：<%= contributor_score.resource_num %><br />
- <% end %>
- <% unless contributor_score.message_num == 0 %>
- 课程讨论：<%= contributor_score.message_num %><br />
- <% end %>
- <% unless contributor_score.message_reply_num == 0 %>
- 评论回复：<%= contributor_score.message_reply_num %><br />
- <% end %>
- <% unless contributor_score.journal_num == 0 %>
- 课程留言：<%= contributor_score.journal_num %><br />
- <% end %>
- <% unless contributor_score.homework_journal_num == 0 %>
- 作业留言：<%= contributor_score.homework_journal_num %><br />
- <% end %>
- <% unless contributor_score.news_reply_num == 0 %>
- 课程通知：<%= contributor_score.news_reply_num %><br />
- <% end %>
+ <!--<div style="display: none" class="message_title_red system_message_style">-->
+ <!--<p><strong>评论对象：</strong><%#= ma.course_message.commented.title %></p>-->
+ <!--<%# unless ma.course_message.comments.nil? %>-->
+ <!--<div class="fl"><strong>评论内容：</strong></div>-->
+ <!--<div class="ml60"><%#= ma.course_message.comments.html_safe %></div>-->
+ <!--<%# end %>-->
+ <!--</div>-->
+ <div style="padding-left: 65px; font-size: 14px;color: #3b3b3b">积分计算</div>
+ <%# unless contributor_score.resource_num.to_i == 0 %>
+ 课程资源：资源数 x 5 = <%= contributor_score.resource_num.to_i %> x 5 = <%= contributor_score.resource_num.to_i * 5 %></br>
+ <%# end %>
+ <%# unless contributor_score.message_num.to_i == 0 %>
+ 课程讨论：发帖数 x 2 = <%= contributor_score.message_num.to_i %> x 2 = <%= contributor_score.message_num.to_i * 2 %></br>
+ <%# end %>
+ <%# unless contributor_score.message_reply_num.to_i == 0 %>
+ 评论回复：回复数 x 1 = <%= contributor_score.message_reply_num.to_i %> x 1 = <%= contributor_score.message_reply_num.to_i %></br>
+ <%# end %>
+ <%# unless contributor_score.journal_num.to_i == 0 %>
+ 课程留言：留言数 x 1 = <%= contributor_score.journal_num.to_i %> x 1 = <%= contributor_score.journal_num.to_i %></br>
+ <%# end %>
+ <%# unless contributor_score.homework_journal_num.to_i == 0 %>
+ 作业留言：留言数 x 1 = <%= contributor_score.homework_journal_num.to_i %> x 1 = <%= contributor_score.homework_journal_num.to_i %></br>
+ <%# end %>
+ <%# unless contributor_score.news_reply_num.to_i == 0 %>
+ 课程通知：通知数 x 1 = <%= contributor_score.news_reply_num.to_i %> x 1 = <%= contributor_score.news_reply_num.to_i %></br>
+ <%# end %>
+ 总得分：<%=total_score %>
</div>
</li>
<% end %>
@@ -179,12 +202,12 @@
<% hero_homework_scores = hero_homework_score(@course, "desc") %>
<% unless hero_homework_scores.map(&:score).detect{|s| s.to_i != 0}.nil? %>
<ul class="rankList">
- <h4>课程英雄榜</h4>
+ <h4><span>课程英雄榜</span><a style="float: right; color: #7f7f7f; font-size: 12px;" title="英雄榜的得分是每个同学作业的得分总和">积分规则</a></h4>
<% hero_homework_scores.each do |student_score| %>
<% if student_score.score.to_i != 0 %>
<li> <a href="javascript:void:(0);"><%=link_to image_tag(url_to_avatar(student_score.user), :width => "35", :height => "35", :class=> "rankPortrait"),user_path(student_score.user) %></a>
<p><a href="javascript:void:(0);"><%=link_to student_score.user.show_name, user_path(student_score.user), :title => student_score.user.show_name %></a></p>
- <p><span class="c_red" style="cursor:pointer" title="作业总分：<%= format("%.1f",student_score.score<0 ? 0 : student_score.score) %>"><%= student_score.score<0 ? 0 : student_score.score.to_i %></span></p>
+ <p><span class="c_red" style="cursor:pointer" title="英雄榜的得分是每个同学作业的得分总和"><%= student_score.score<0 ? 0 : student_score.score.to_i %></span></p>
</li>
<% end %>
<% end %>
@@ -303,6 +326,16 @@
obj.parent().parent().next("div").hide();
}
+ function message_titile_show2(obj,e)
+ {
+ obj.parent().next("div").show();
+ obj.parent().next("div").css("top",e.pageY).css("left",e.pageX).css("position","absolute");
+ }
+ function message_titile_hide2(obj)
+ {
+ obj.parent().next("div").hide();
+ }
+
$("#expand_tools_expand").click(function(){
$("#navContentCourse").toggle();
});