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

Conflicts:
	app/views/layouts/_user_projects.html.erb
	app/views/projects/set_public_or_private.js.erb

app/models/attachment.rb

@@ -643,7 +643,7 @@ class Attachment < ActiveRecord::Base
 
   def decrease_attchments_count
     if self.container_type == "Project" && !self.project.project_score.nil?
-      aatach_count = self.container.project_score.attach_num - 1+
+      aatach_count = self.container.project_score.attach_num - 1
       self.container.project_score.update_attribute(:attach_num, aatach_count)
     end
   end

app/views/organizations/_org_course_homework.html.erb

@@ -173,7 +173,7 @@
                 <% time=project.updated_on %>
                 <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
                 <p><span class="captainName" title="<%=(User.find project.user_id).show_name %>"><%=(User.find project.user_id).show_name %></span><span style="vertical-align: top;">(组长)</span></p>
-                <p><%=time_from_now time %>&nbsp;&nbsp;<%= project.commits_count %>提交</p>
+                <p><%=time_from_now time %>&nbsp;&nbsp;<%= project.project_score.changeset_num %>提交</p>
                 <div class="relatePInfo" id="relatePInfo_<%=project.id %>_<%=activity.id %>">
                   项目名称：<%=project.name %><br />
                   创建者：<%=(User.find project.user_id).show_name %>(组长)<br />

app/views/projects/_projects_topic_score_index.html.erb

@@ -1,4 +1,4 @@
-<!-- added by bai -->
 <div><%= l(:label_topic_number) %> * 2 = <%= project.project_score.board_num %> * 2 = <%= project.project_score.board_num * 2 %></div>
-<div><%= l(:label_topic_score) %> = <%= project.project_score.board_num * 2 %></div>
-<!-- end -->
+<div><%= l(:label_topic_reply_score) %> * 1 = <%= project.project_score.board_message_num %> * 1 = <%= project.project_score.board_message_num * 1 %></div>
+<div><%= l(:label_topic_score) %> = <%= project.project_score.board_num * 2 %> + <%= project.project_score.board_message_num * 1 %>
+  = <%= project.project_score.board_num * 2 + project.project_score.board_message_num * 1 %></div>

app/views/users/_course_homework.html.erb

@@ -173,7 +173,7 @@
             <% time=project.updated_on %>
             <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
             <p><span class="captainName" title="<%=(User.find project.user_id).show_name %>"><%=(User.find project.user_id).show_name %></span><span style="vertical-align: top;">(组长)</span></p>
-            <p><%=time_from_now time %>&nbsp;&nbsp;<%= project.commits_count %>提交</p>
+            <p><%=time_from_now time %>&nbsp;&nbsp;<%= project.project_score.changeset_num %>提交</p>
             <div class="relatePInfo" id="relatePInfo_<%=project.id %>_<%=activity.id %>">
               项目名称：<%=project.name %><br />
               创建者：<%=(User.find project.user_id).show_name %>(组长)<br />

app/views/users/_resource_share_for_orgs.html.erb

@@ -22,6 +22,7 @@
     <%= hidden_field_tag(:send_id, send_id) %>
     <%= hidden_field_tag(:send_ids, send_ids) %>
   <div class="sectionWrap fl mr15">
+
     <ul class="fontGrey3 sectionContent">
       <% unless @orgs.empty? %>
           <% @orgs.each do |org|%>

app/views/users/_user_homework_detail.html.erb

@@ -174,7 +174,7 @@
                   <% time=project.updated_on %>
                   <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
                   <p><span class="captainName" title="<%=(User.find project.user_id).show_name %>"><%=(User.find project.user_id).show_name %></span><span style="vertical-align: top;">(组长)</span></p>
-                  <p><%=time_from_now time %>&nbsp;&nbsp;<%= project.commits_count %>提交</p>
+                  <p><%=time_from_now time %>&nbsp;&nbsp;<%= project.project_score.changeset_num %>提交</p>
                   <div class="relatePInfo" id="relatePInfo_<%=project.id %>_<%=homework_common.id %>">
                     项目名称：<%=project.name %><br />
                     创建者：<%=(User.find project.user_id).show_name %>(组长)<br />

config/locales/projects/zh.yml

@@ -440,6 +440,7 @@ zh:
   label_code_submit_number: 代码提交频率
   
   label_topic_score: 讨论区得分
+  label_topic_reply_score: 讨论区回复数量
   label_topic_number: 讨论区帖子数量
   label_add_news: 添加了新闻