From e06695b56b5c4d40cb8905f91144934ce416cec7 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 21 Mar 2016 16:45:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=B4=BB=E8=B7=83=E5=BA=A6?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/_course_activity_users.html.erb   | 59 ++++++++++++++++
 app/views/layouts/base_courses.html.erb       | 67 +------------------
 2 files changed, 61 insertions(+), 65 deletions(-)
 create mode 100644 app/views/courses/_course_activity_users.html.erb

diff --git a/app/views/courses/_course_activity_users.html.erb b/app/views/courses/_course_activity_users.html.erb
new file mode 100644
index 000000000..a0cac45f7
--- /dev/null
+++ b/app/views/courses/_course_activity_users.html.erb
@@ -0,0 +1,59 @@
+<% unless contributor_course_scor(course.id).count == 0 %>
+    <ul class="rankList">
+      <h4>课程活跃度
+        <a class="contributor_course" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))" style="cursor: pointer; position:relative;">积分规则</a>
+      </h4>
+      <div  class="numIntro undis" style="cursor:pointer;">
+        <div class="active-degree-rule">
+          积分规则<br/>
+          资源发布：资源数 x 5 <br/>
+          问答发布：发帖数 x 2 <br/>
+          通知发布：通知数 x 1 <br/>
+          问答回复：回复数 x 1 <br/>
+          作业留言：留言数 x 1 <br/>
+          通知留言：留言数 x 1 <br/>
+          课程留言：留言数 x 1  <br/>
+          总得分为以上得分之和</div>
+      </div>
+      <% contributor_course_scor(course.id).each do |contributor_score| %>
+          <% 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.to_i * 1 + contributor_score.news_reply_num.to_i * 1 +
+                  contributor_score.news_num.to_i * 1 %>
+          <% unless total_score ==0 %>
+              <li><%=link_to image_tag(url_to_avatar(contributor_score.user), :width => "35", :height => "35", :class=> "rankPortrait"),user_path(contributor_score.user) %>
+                <p><%=link_to contributor_score.user.show_name, user_path(contributor_score.user.id), :title => contributor_score.user.show_name %></p>
+                <p><span class="c_green" style="cursor:pointer">
+                <a onmouseover ="message_titile_show($(this),event)" onmouseout ="message_titile_hide($(this))" class="c_green">
+                  <%=total_score %></a></span></p>
+                <div  style="display: none" class="numIntro">
+                  <div class="contributor-course-calculate">积分计算</div>
+                  <%# unless  contributor_score.resource_num.to_i == 0 %>
+                  <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>
+                    <%# 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>
+                    通知发布数 x 1 = <%= contributor_score.news_num.to_i %> x 1 = <%= contributor_score.news_num.to_i %></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>
+                    作业留言数 x 1 = <%= contributor_score.homework_journal_num.to_i %> x 1 = <%= contributor_score.homework_journal_num.to_i %></br>
+                    通知留言数 x 1 = <%= contributor_score.news_reply_num.to_i %> x 1 = <%= contributor_score.news_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 %>
+                    <%# end %>
+                    <%# unless  contributor_score.news_reply_num.to_i == 0 %>
+                    <%# end %>
+                    总得分：<%=total_score %>
+                  </div>
+                </div>
+              </li>
+          <% end %>
+      <% end %>
+      <div class="cl"></div>
+    </ul>
+<% end %>
\ No newline at end of file
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 1df3caab2..00f197c7f 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -138,72 +138,9 @@
             </ul>
         <% end %>
       </div><!--项目侧导航 end-->
-      <%# 课程贡献榜 %>
+      <%# 课程活跃度 %>
       <div class="cl"></div>
-      <% unless contributor_course_scor(@course.id).count == 0 %>
-        <ul class="rankList">
-        <h4>课程活跃度
-          <a class="contributor_course" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))" style="cursor: pointer; position:relative;">积分规则</a>
-        </h4>
-          <div  class="numIntro undis" style="cursor:pointer;">
-            <div class="active-degree-rule">
-            积分规则<br/>
-            资源发布：资源数 x 5 <br/>
-            问答发布：发帖数 x 2 <br/>
-            通知发布：通知数 x 1 <br/>
-            问答回复：回复数 x 1 <br/>
-            作业留言：留言数 x 1 <br/>
-            通知留言：留言数 x 1 <br/>
-            课程留言：留言数 x 1  <br/>
-            总得分为以上得分之和</div>
-         </div>
-
-        <% contributor_course_scor(@course.id).each do |contributor_score| %>
-           <% 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.to_i * 1 + contributor_score.news_reply_num.to_i * 1 +
-                  contributor_score.news_num.to_i * 1 %>
-          <% unless total_score ==0 %>
-            <li><%=link_to image_tag(url_to_avatar(contributor_score.user), :width => "35", :height => "35", :class=> "rankPortrait"),user_path(contributor_score.user) %>
-              <p><%=link_to contributor_score.user.show_name, user_path(contributor_score.user.id), :title => contributor_score.user.show_name %></p>
-              <p><span class="c_green" style="cursor:pointer">
-                <a onmouseover ="message_titile_show($(this),event)" onmouseout ="message_titile_hide($(this))" class="c_green">
-                  <%=total_score %></a></span></p>
-              <div  style="display: none" class="numIntro">
-                <div class="contributor-course-calculate">积分计算</div>
-                <%# unless  contributor_score.resource_num.to_i == 0 %>
-                <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>
-                  <%# 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>
-                  通知发布数 x 1 = <%= contributor_score.news_num.to_i %> x 1 = <%= contributor_score.news_num.to_i %></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>
-                  作业留言数 x 1 = <%= contributor_score.homework_journal_num.to_i %> x 1 = <%= contributor_score.homework_journal_num.to_i %></br>
-                  通知留言数 x 1 = <%= contributor_score.news_reply_num.to_i %> x 1 = <%= contributor_score.news_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 %>
-
-                  <%# end %>
-                  <%# unless  contributor_score.news_reply_num.to_i == 0 %>
-
-
-                  <%# end %>
-                  总得分：<%=total_score %>
-                </div>
-
-              </div>
-            </li>
-          <% end %>
-        <% end %>
-        <div class="cl"></div>
-      </ul>
-      <% end %>
+      <%= render :partial => 'courses/course_activity_users', :locals => {:course => @course} %>
 
       <% hero_homework_scores = hero_homework_score(@course, "desc") %>
       <% unless hero_homework_scores.map(&:score).detect{|s| s.to_i != 0}.nil? %>