From 6416b010378cabc3f13b3b38710b33618b4100ae Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 4 Mar 2016 14:28:06 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=87=8C=E7=9A=84?=
 =?UTF-8?q?=E2=80=9C=E8=AF=BE=E7=A8=8B=E4=BD=9C=E4=B8=9A=E2=80=9D=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E2=80=9C=E4=BD=9C=E4=B8=9A=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/locales/courses/zh.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/courses/zh.yml b/config/locales/courses/zh.yml
index 19b979d97..b59538bc9 100644
--- a/config/locales/courses/zh.yml
+++ b/config/locales/courses/zh.yml
@@ -15,7 +15,7 @@ zh:
   label_course_new: 新建课程
   label_course_name: 课程名称
 
-  label_homework: 课程作业
+  label_homework: 作业
   label_course_news: 课程通知
   label_course_mail_news_reply: 课程通知回复
   label_main_teacher: 主讲教师

From d2920c64eaacdb9579d38a57b3f8f500148bb22e Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 4 Mar 2016 15:12:03 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E9=A2=98=E5=BA=93=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E5=88=B0=E8=AF=BE=E7=A8=8B=E5=90=8E=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_homework_post_notice.html.erb | 12 ++++++++++++
 app/views/users/send_homework_to_course.js.erb | 10 +++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 app/views/users/_homework_post_notice.html.erb

diff --git a/app/views/users/_homework_post_notice.html.erb b/app/views/users/_homework_post_notice.html.erb
new file mode 100644
index 000000000..a9b153854
--- /dev/null
+++ b/app/views/users/_homework_post_notice.html.erb
@@ -0,0 +1,12 @@
+<div id="popbox02">
+  <div class="ni_con">
+    <p style="display: block;font-size: 14px;margin-left: 30px;margin-top: 20px;">
+      题目已发送到目标课程的作业列表，但需要您设置发布和截止时间，以激活相应作业，谢谢！
+    </p>
+    <div class="ni_btn">
+      <a href="javascript:void(0)" class="tijiao c_white ml45" onclick="hideModal();">
+        确&nbsp;&nbsp;定
+      </a>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/users/send_homework_to_course.js.erb b/app/views/users/send_homework_to_course.js.erb
index 491156876..e4e8e84ab 100644
--- a/app/views/users/send_homework_to_course.js.erb
+++ b/app/views/users/send_homework_to_course.js.erb
@@ -1 +1,9 @@
-$("#subject_count_homework_<%=@homework.id %>").html(<%= @homework.quotes %>);
\ No newline at end of file
+$("#subject_count_homework_<%=@homework.id %>").html(<%= @homework.quotes %>);
+$("#ajax-modal").html("<%=escape_javascript(render :partial => 'homework_post_notice') %>");
+showModal('ajax-modal', '500px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+        "<a href='javascript:' onclick='hideModal();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+$('#ajax-modal').parent().css("top","50%").css("left","50%");
+$('#ajax-modal').parent().addClass("popbox").addClass("resourceUploadPopup");
+$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
\ No newline at end of file

From a5cb3d5e6a4daf1f636c871dd78155f21c3d0b43 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 4 Mar 2016 15:14:38 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E4=BD=9C=E5=93=81?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E8=BE=93=E5=85=A5=E6=A1=86=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E2=80=9C=E8=AF=B7=E8=BE=93=E5=85=A5=E4=BD=9C=E5=93=81=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E2=80=9D=E3=80=81=E2=80=9C=E8=AF=B7=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E4=BD=9C=E5=93=81=E6=8F=8F=E8=BF=B0=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/edit.html.erb | 4 ++--
 app/views/student_work/new.html.erb  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/student_work/edit.html.erb b/app/views/student_work/edit.html.erb
index f72faaac2..56636a48e 100644
--- a/app/views/student_work/edit.html.erb
+++ b/app/views/student_work/edit.html.erb
@@ -41,12 +41,12 @@
             <%=hidden_field_tag 'group_member_ids', params[:group_member_ids], :value=>str %>
         <% end %>
         <div>
-          <input type="text" name="student_work[name]" id="student_work_name" placeholder="请简洁的概括作品的功能或特性" class="InputBox  W700" maxlength="200" onkeyup="regexStudentWorkName();" value="<%= @work.name%>">
+          <input type="text" name="student_work[name]" id="student_work_name" placeholder="请输入作品名称" class="InputBox  W700" maxlength="200" onkeyup="regexStudentWorkName();" value="<%= @work.name%>">
           <div class="cl"></div>
           <p id="student_work_name_span" class="c_red mb10"></p>
         </div>
         <div class="mt10">
-          <textarea  name="student_work[description]" id="student_work_description" placeholder="请介绍你的作品"  class="InputBox  W700 H150"  maxlength="6000" onkeyup="regexStudentWorkDescription();"><%= @work.description%></textarea>
+          <textarea  name="student_work[description]" id="student_work_description" placeholder="请输入作品描述"  class="InputBox  W700 H150"  maxlength="6000" onkeyup="regexStudentWorkDescription();"><%= @work.description%></textarea>
           <script>
               var text = document.getElementById("student_work_description");
               autoTextarea(text);// 调用
diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb
index 99c317314..5d2b134a8 100644
--- a/app/views/student_work/new.html.erb
+++ b/app/views/student_work/new.html.erb
@@ -127,12 +127,12 @@
             <%=hidden_field_tag 'group_member_ids', params[:group_member_ids], :value=>User.current.id %>
         <% end %>
         <div>
-          <%= f.text_field "name", :required => true, :size => 60, :class => "InputBox  W700", :maxlength => 200, :placeholder => "请简洁的概括作品的功能或特性", :onkeyup => "regexStudentWorkName();" %>
+          <%= f.text_field "name", :required => true, :size => 60, :class => "InputBox  W700", :maxlength => 200, :placeholder => "请输入作品名称", :onkeyup => "regexStudentWorkName();" %>
           <div class="cl"></div>
           <p id="student_work_name_span" class="c_red mb10"></p>
         </div>
         <div class="mt10">
-          <%= f.text_area "description", :class => "InputBox  W700 H150", :placeholder => "请介绍你的作品", :onkeyup => "regexStudentWorkDescription();"%>
+          <%= f.text_area "description", :class => "InputBox  W700 H150", :placeholder => "请输入作品描述", :onkeyup => "regexStudentWorkDescription();"%>
           <script>
               var text = document.getElementById("student_work_description");
               autoTextarea(text);// 调用

From ffac8164f13056efd9bce826f7711fdb76386ec8 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 4 Mar 2016 15:55:45 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=9A=84?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=92=8C=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=8C=E6=8C=89=E7=85=A7=E6=97=B6=E9=97=B4=E5=80=92=E6=8E=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admin_controller.rb | 10 ++++++----
 app/views/admin/projects.html.erb   |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 01703f679..cec419eba 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -32,18 +32,20 @@ class AdminController < ApplicationController
   end
 
   def projects
+=begin
     @status = params[:status] || 1
 
-    scope = Project.status(@status).order('id asc')
+    scope = Project.status(@status)
     scope = scope.like(params[:name]) if params[:name].present?
-    @projects = scope.where(project_type: Project::ProjectType_project).all
-
+    @projects = scope.where(project_type: Project::ProjectType_project).reorder("created_on desc").all
+=end
+    @projects = Project.like(@name).order('created_on desc')
     render :action => "projects", :layout => false if request.xhr?
   end
 
   def courses
     @name = params[:name]
-    @courses = Course.like(@name)
+    @courses = Course.like(@name).order('created_at desc')
     respond_to do |format|
       format.html
     end
diff --git a/app/views/admin/projects.html.erb b/app/views/admin/projects.html.erb
index 3f6ee36f0..d12e85856 100644
--- a/app/views/admin/projects.html.erb
+++ b/app/views/admin/projects.html.erb
@@ -45,8 +45,8 @@
     </tr>
     </thead>
     <tbody>
-    <% project_tree(@projects) do |project, level| %>
-        <tr class="<%= cycle("odd", "even") %> <%= project.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
+    <% @projects.each do |project| %>
+        <tr class="<%= cycle("odd", "even") %>">
           <td style="text-align: center;">
             <%= project.id %>
           </td>

From 947e6ea469b9d387c369ca1a2c6f468de83798b2 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 4 Mar 2016 16:00:20 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E4=BD=9C=E4=B8=9A--=E2=80=9C=E7=A6=81?=
 =?UTF-8?q?=E7=94=A8=E5=8C=BF=E8=AF=84=E2=80=9D=E5=A4=84=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=EF=BC=9A=E5=8C=BF=E8=AF=84=E6=98=AF?=
 =?UTF-8?q?=E5=90=8C=E5=AD=A6=E4=B9=8B=E9=97=B4=E7=9A=84=E5=8F=8C=E7=9B=B2?=
 =?UTF-8?q?=E4=BA=92=E8=AF=84=E8=BF=87=E7=A8=8B=EF=BC=9A=E6=AF=8F=E4=B8=AA?=
 =?UTF-8?q?=E5=90=8C=E5=AD=A6=E5=B0=86=E8=AF=84=E9=98=85=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E5=88=86=E9=85=8D=E7=BB=99=E4=BB=96/=E5=A5=B9=E7=9A=84?=
 =?UTF-8?q?=E8=8B=A5=E5=B9=B2=E4=B8=AA=E4=BD=9C=E5=93=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/_org_course_homework.html.erb | 3 ++-
 app/views/users/_course_homework.html.erb             | 3 ++-
 app/views/users/_user_homework_detail.html.erb        | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb
index 4767e2ad2..a8b05f08f 100644
--- a/app/views/organizations/_org_course_homework.html.erb
+++ b/app/views/organizations/_org_course_homework.html.erb
@@ -239,7 +239,8 @@
                   <% end %>
                   <% if activity.anonymous_comment == 0 && (comment_status == 0 || comment_status == 1)%>
                       <li>
-                        <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id,:course_activity=>course_activity),:class => "postOptionLink", :remote => true)%>
+                        <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id,:course_activity=>course_activity),:class => "postOptionLink",
+                                    :title => "匿评是同学之间的双盲互评过程：每个同学将评阅系统分配给他/她的若干个作品",:remote => true)%>
                       </li>
                   <% end %>
                   <% if (activity.anonymous_comment == 1 && activity.is_open == 0) || (activity.anonymous_comment == 0 && comment_status == 3 && activity.is_open == 0) %>
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 5e684ab15..603772269 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -238,7 +238,8 @@
                   <% end %>
                   <% if activity.anonymous_comment == 0 && (comment_status == 0 || comment_status == 1)%>
                       <li>
-                        <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id,:course_activity=>course_activity),:class => "postOptionLink", :remote => true)%>
+                        <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id,:course_activity=>course_activity),:class => "postOptionLink",
+                                    :title => "匿评是同学之间的双盲互评过程：每个同学将评阅系统分配给他/她的若干个作品", :remote => true)%>
                       </li>
                   <% end %>
                   <% if (activity.anonymous_comment == 1 && activity.is_open == 0) || (activity.anonymous_comment == 0 && comment_status == 3 && activity.is_open == 0) %>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index bf4f4cde6..00a3a7536 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -244,7 +244,8 @@
                 <% end %>
                 <% if homework_common.anonymous_comment == 0 && (comment_status == 0 || comment_status == 1)%>
                     <li>
-                      <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(homework_common,:is_in_course => is_in_course),:class => "postOptionLink", :remote => true)%>
+                      <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(homework_common,:is_in_course => is_in_course),:class => "postOptionLink",
+                                  :title => "匿评是同学之间的双盲互评过程：每个同学将评阅系统分配给他/她的若干个作品", :remote => true)%>
                     </li>
                 <% end %>
                 <% if (homework_common.anonymous_comment == 1 && homework_common.is_open == 0) || (homework_common.anonymous_comment == 0 && comment_status == 3 && homework_common.is_open == 0) %>

From fd8b40a36eaf3a0284589e0da305f04b881ba325 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 4 Mar 2016 16:53:36 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E5=AF=B9=E4=BA=8E=E7=BC=96=E7=A8=8B?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=EF=BC=8C=E7=B3=BB=E7=BB=9F=E8=AF=84=E5=88=86?=
 =?UTF-8?q?=E7=9A=84=E5=89=8D=E5=87=A0=E5=90=8D=E8=83=BD=E5=90=A6=E4=B9=9F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=87=BA=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_org_course_homework.html.erb             | 46 +++++++++++--------
 app/views/users/_course_homework.html.erb     | 46 +++++++++++--------
 .../users/_user_homework_detail.html.erb      | 46 +++++++++++--------
 3 files changed, 78 insertions(+), 60 deletions(-)

diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb
index a8b05f08f..2e038f01f 100644
--- a/app/views/organizations/_org_course_homework.html.erb
+++ b/app/views/organizations/_org_course_homework.html.erb
@@ -128,7 +128,7 @@
       <div class="cl"></div>
       <% if activity.student_works.count != 0 %>
           <% sw = activity.student_works.reorder("created_at desc").first %>
-          <div class="mt10 homepagePostDeadline">
+          <div class="mt10 homepagePostDeadline mb10">
             #&nbsp;<%=time_from_now sw.created_at %><%= link_to sw.user.show_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品
           </div>
       <% end %>
@@ -139,30 +139,36 @@
         <%# student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id}").reorder("created_at desc") %>
         <% unless student_work_scores.empty?  %>
             <% last_score = student_work_scores.first %>
-            <div class="mt10">
+            <div>
               <p class="mb10 fontGrey2">#&nbsp;<%=time_from_now last_score.created_at %>
                 <%= link_to last_score.user.show_name, user_activities_path(last_score.user_id), :class => "newsBlue ml5 mr5"%>评阅了作品，优秀排行：
               </p>
-              <% ids = '('+student_work_scores.map{|sw|sw.student_work_id}.join(',')+')' %>
-              <% student_works = activity.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where("student_works.id in #{ids}").order("score desc") %>
-              <% student_works.each_with_index do |sw, i| %>
-                  <div class="fl mr10 w100" style="text-align:center;">
-                    <a href="javascript:void(0);" class="linkBlue"><%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => activity.id), :alt => "学生头像" %>
-                      <p class="w100 hidden"><%= link_to sw.user.show_name, student_work_index_path(:homework => activity.id)%></p>
-                    </a>
-                    <% score = sw.respond_to?("score") ? sw.score : (sw.final_score || 0) - sw.absence_penalty - sw.late_penalty %>
-                    <p class="fontGrey2">分数：<span class="c_red"><%=format("%.1f",score<0 ? 0 : score) %>分</span></p>
-                  </div>
-                  <% if i == 4 %>
-                      <% break %>
-                  <% end %>
-              <% end %>
-              <% if student_works.count > 5 %>
-                  <%= link_to "更多>>", student_work_index_path(:homework => activity.id),:class=>'linkGrey2 fl ml50',:style=>'margin-top:60px;'%>
-              <% end %>
-              <div class="cl"></div>
             </div>
         <% end %>
+        <div>
+          <% if activity.homework_type != 2 %>
+              <% ids = student_work_scores.empty? ? "(-1)" : '('+student_work_scores.map{|sw|sw.student_work_id}.join(',')+')' %>
+              <% student_works = activity.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where("student_works.id in #{ids}").order("score desc") %>
+          <% else %>
+              <% student_works = activity.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("score desc") %>
+          <% end %>
+          <% student_works.each_with_index do |sw, i| %>
+              <div class="fl mr10 w100" style="text-align:center;">
+                <a href="javascript:void(0);" class="linkBlue"><%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => activity.id), :alt => "学生头像" %>
+                  <p class="w100 hidden"><%= link_to sw.user.show_name, student_work_index_path(:homework => activity.id)%></p>
+                </a>
+                <% score = sw.respond_to?("score") ? sw.score : (sw.final_score || 0) - sw.absence_penalty - sw.late_penalty %>
+                <p class="fontGrey2">分数：<span class="c_red"><%=format("%.1f",score<0 ? 0 : score) %>分</span></p>
+              </div>
+              <% if i == 4 %>
+                  <% break %>
+              <% end %>
+          <% end %>
+          <% if student_works.count > 5 %>
+              <%= link_to "更多>>", student_work_index_path(:homework => activity.id),:class=>'linkGrey2 fl ml50',:style=>'margin-top:60px;'%>
+          <% end %>
+          <div class="cl"></div>
+        </div>
     <% end %>
       <div class="cl"></div>
         <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %>
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 603772269..7c5aa5e4f 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -128,7 +128,7 @@
       <div class="cl"></div>
       <% if activity.student_works.count != 0 %>
         <% sw = activity.student_works.reorder("created_at desc").first %>
-        <div class="mt10 homepagePostDeadline">
+        <div class="mt10 homepagePostDeadline mb10">
           #&nbsp;<%=time_from_now sw.created_at %><%= link_to sw.user.show_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品
         </div>
     <% end %>
@@ -138,30 +138,36 @@
         <% student_work_scores = StudentWorksScore.find_by_sql("select max(created_at) as created_at, student_work_id, user_id from student_works_scores where student_work_id in #{sw_id} group by student_work_id order by max(created_at) desc") %>
         <% unless student_work_scores.empty?  %>
             <% last_score = student_work_scores.first %>
-            <div class="mt10">
+            <div>
               <p class="mb10 fontGrey2">#&nbsp;<%=time_from_now last_score.created_at %>
                 <%= link_to last_score.user.show_name, user_activities_path(last_score.user_id), :class => "newsBlue ml5 mr5"%>评阅了作品，优秀排行：
               </p>
-              <% ids = '('+student_work_scores.map{|sw|sw.student_work_id}.join(',')+')' %>
-              <% student_works = activity.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where("student_works.id in #{ids}").order("score desc") %>
-              <% student_works.each_with_index do |sw, i| %>
-                  <div class="fl mr10 w100" style="text-align:center;">
-                    <a href="javascript:void(0);" class="linkBlue"><%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => activity.id), :alt => "学生头像" %>
-                      <p class="w100 hidden"><%= link_to sw.user.show_name, student_work_index_path(:homework => activity.id)%></p>
-                    </a>
-                    <% score = sw.respond_to?("score") ? sw.score : (sw.final_score || 0) - sw.absence_penalty - sw.late_penalty %>
-                    <p class="fontGrey2">分数：<span class="c_red"><%=format("%.1f",score<0 ? 0 : score) %>分</span></p>
-                  </div>
-                  <% if i == 4 %>
-                    <% break %>
-                  <% end %>
-              <% end %>
-              <% if student_works.count > 5 %>
-                <%= link_to "更多>>", student_work_index_path(:homework => activity.id),:class=>'linkGrey2 fl ml50',:style=>'margin-top:60px;'%>
-              <% end %>
-              <div class="cl"></div>
             </div>
         <% end %>
+        <div>
+          <% if activity.homework_type != 2 %>
+            <% ids = student_work_scores.empty? ? "(-1)" : '('+student_work_scores.map{|sw|sw.student_work_id}.join(',')+')' %>
+            <% student_works = activity.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where("student_works.id in #{ids}").order("score desc") %>
+          <% else %>
+            <% student_works = activity.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("score desc") %>
+          <% end %>
+          <% student_works.each_with_index do |sw, i| %>
+              <div class="fl mr10 w100" style="text-align:center;">
+                <a href="javascript:void(0);" class="linkBlue"><%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => activity.id), :alt => "学生头像" %>
+                  <p class="w100 hidden"><%= link_to sw.user.show_name, student_work_index_path(:homework => activity.id)%></p>
+                </a>
+                <% score = sw.respond_to?("score") ? sw.score : (sw.final_score || 0) - sw.absence_penalty - sw.late_penalty %>
+                <p class="fontGrey2">分数：<span class="c_red"><%=format("%.1f",score<0 ? 0 : score) %>分</span></p>
+              </div>
+              <% if i == 4 %>
+                <% break %>
+              <% end %>
+          <% end %>
+          <% if student_works.count > 5 %>
+            <%= link_to "更多>>", student_work_index_path(:homework => activity.id),:class=>'linkGrey2 fl ml50',:style=>'margin-top:60px;'%>
+          <% end %>
+          <div class="cl"></div>
+        </div>
     <% end %>
     <div class="cl"></div>
       <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 00a3a7536..70624ce38 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -131,7 +131,7 @@
       <div class="cl"></div>
       <% if homework_common.student_works.count != 0 %>
           <% sw = homework_common.student_works.reorder("created_at desc").first %>
-          <div class="mt10 homepagePostDeadline">
+          <div class="mt10 homepagePostDeadline mb10">
             #&nbsp;<%=time_from_now sw.created_at %><%= link_to sw.user.show_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品
           </div>
       <% end %>
@@ -142,30 +142,36 @@
         <%# student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id}").reorder("created_at desc") %>
         <% unless student_work_scores.empty?  %>
             <% last_score = student_work_scores.first %>
-            <div class="mt10">
+            <div>
               <p class="mb10 fontGrey2">#&nbsp;<%=time_from_now last_score.created_at %>
                 <%= link_to last_score.user.show_name, user_activities_path(last_score.user_id), :class => "newsBlue ml5 mr5"%>评阅了作品，优秀排行：
               </p>
-              <% ids = '('+student_work_scores.map{|sw|sw.student_work_id}.join(',')+')' %>
-              <% student_works = homework_common.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where("student_works.id in #{ids}").order("score desc") %>
-              <% student_works.each_with_index do |sw, i| %>
-                  <div class="fl mr10 w100" style="text-align:center;">
-                    <a href="javascript:void(0);" class="linkBlue"><%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => homework_common.id), :alt => "学生头像" %>
-                      <p class="w100 hidden"><%= link_to sw.user.show_name, student_work_index_path(:homework => homework_common.id)%></p>
-                    </a>
-                    <% score = sw.respond_to?("score") ? sw.score : (sw.final_score || 0) - sw.absence_penalty - sw.late_penalty %>
-                    <p class="fontGrey2">分数：<span class="c_red"><%=format("%.1f",score<0 ? 0 : score) %>分</span></p>
-                  </div>
-                  <% if i == 4 %>
-                      <% break %>
-                  <% end %>
-              <% end %>
-              <% if student_works.count > 5%>
-                <%= link_to "更多>>", student_work_index_path(:homework => homework_common.id),:class=>'linkGrey2 fl ml50',:style=>'margin-top:60px;'%>
-              <% end %>
-              <div class="cl"></div>
             </div>
         <% end %>
+        <div>
+          <% if homework_common.homework_type != 2 %>
+              <% ids = student_work_scores.empty? ? "(-1)" : '('+student_work_scores.map{|sw|sw.student_work_id}.join(',')+')' %>
+              <% student_works = homework_common.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where("student_works.id in #{ids}").order("score desc") %>
+          <% else %>
+              <% student_works = homework_common.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("score desc") %>
+          <% end %>
+          <% student_works.each_with_index do |sw, i| %>
+              <div class="fl mr10 w100" style="text-align:center;">
+                <a href="javascript:void(0);" class="linkBlue"><%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => homework_common.id), :alt => "学生头像" %>
+                  <p class="w100 hidden"><%= link_to sw.user.show_name, student_work_index_path(:homework => homework_common.id)%></p>
+                </a>
+                <% score = sw.respond_to?("score") ? sw.score : (sw.final_score || 0) - sw.absence_penalty - sw.late_penalty %>
+                <p class="fontGrey2">分数：<span class="c_red"><%=format("%.1f",score<0 ? 0 : score) %>分</span></p>
+              </div>
+              <% if i == 4 %>
+                  <% break %>
+              <% end %>
+          <% end %>
+          <% if student_works.count > 5%>
+            <%= link_to "更多>>", student_work_index_path(:homework => homework_common.id),:class=>'linkGrey2 fl ml50',:style=>'margin-top:60px;'%>
+          <% end %>
+          <div class="cl"></div>
+        </div>
     <% end %>
 
     <% if homework_common.homework_type == 3 && homework_common.homework_detail_group.base_on_project == 1 %>

From 4f3055c99038b535d451e10907926c520c53b4a1 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 4 Mar 2016 17:11:52 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E9=97=AE=E7=AD=94=E5=8C=BA=EF=BC=8C=E4=B8=94=E6=94=BE?=
 =?UTF-8?q?=E5=BC=80=E8=AF=BE=E7=A8=8B=E7=9A=84=E2=80=9C=E9=97=AE=E7=AD=94?=
 =?UTF-8?q?=E5=8C=BA=E2=80=9D=EF=BC=8C=E5=B0=B1=E6=98=AF=E8=AF=BE=E5=A4=96?=
 =?UTF-8?q?=E7=9A=84=E7=94=A8=E6=88=B7=E4=B9=9F=E8=83=BD=E5=9C=A8=E5=85=AC?=
 =?UTF-8?q?=E5=BC=80=E8=AF=BE=E5=86=85=E5=8F=91=E5=B8=96=E6=88=96=E5=9B=9E?=
 =?UTF-8?q?=E5=B8=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/_course_show.html.erb               | 2 +-
 app/views/courses/_tool_expand.html.erb              | 2 +-
 app/views/layouts/base_courses.html.erb              | 2 +-
 app/views/organizations/_org_course_message.html.erb | 2 +-
 app/views/users/_course_message.html.erb             | 2 +-
 config/locales/zh.yml                                | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index de3b038e6..16b4fcd3d 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -22,7 +22,7 @@
 <div class="homepageRight mt0 ml10">
   <div class="homepageRightBanner">
     <div class="NewsBannerName">
-      课程讨论区
+      课程问答区
     </div>
   </div>
   <% if User.current.logged? %>
diff --git a/app/views/courses/_tool_expand.html.erb b/app/views/courses/_tool_expand.html.erb
index 3ded0cb1d..aedeec5ef 100644
--- a/app/views/courses/_tool_expand.html.erb
+++ b/app/views/courses/_tool_expand.html.erb
@@ -24,7 +24,7 @@
 <% if show_nav?(@course.boards.first ? @course.boards.first.topics.count : 0) %>
     <div class="subNav">
       <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f12 c_blue02 ml10 fn" %>
-      <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}") if User.current.member_of_course?(@course) && @course.boards.first %>
+      <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}") %>
     </div>
 <% end %>
 <% if show_nav?(course_feedback_count) %>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index fa59fbed9..1e0bf0c60 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -104,7 +104,7 @@
         <div class="subNav">
           <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02" %>
           <%= link_to "(#{@course.boards.first ? (@course.boards.first.topics.count + Message.where("board_id =? and parent_id is not ?", @course.boards.first.id, nil).count) : 0})", course_boards_path(@course), :class => "subnav_num c_orange" %>
-          <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}") if User.current.member_of_course?(@course) && @course.boards.first %>
+          <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}") %>
         </div>
         <% end %>
         <% unless show_nav?(course_feedback_count) %>
diff --git a/app/views/organizations/_org_course_message.html.erb b/app/views/organizations/_org_course_message.html.erb
index 4f13e1b4f..8f18c10d8 100644
--- a/app/views/organizations/_org_course_message.html.erb
+++ b/app/views/organizations/_org_course_message.html.erb
@@ -12,7 +12,7 @@
             <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
         <% end %>
         TO
-        <%= link_to activity.course.name.to_s+" | 课程讨论区", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue ml15 mr5"%>
+        <%= link_to activity.course.name.to_s+" | 课程问答区", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue ml15 mr5"%>
       </div>
       <div class="homepagePostTitle hidden m_w530 fl">
         <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 7e8a24bb2..47ad2d6d3 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -20,7 +20,7 @@
             <% end %>
         <% end %>
         TO
-        <%= link_to activity.course.name.to_s+" | 课程讨论区", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue ml15 mr5"%>
+        <%= link_to activity.course.name.to_s+" | 课程问答区", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue ml15 mr5"%>
       </div>
       <div class="homepagePostTitle hidden m_w530 fl">
         <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index e9d3ed813..114e67370 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -614,7 +614,7 @@ zh:
   label_homework_info: 提交情况  #huang
 
   label_course_news_description: '课程必须是高校正式开设的课程，或是围绕特定主题定期发布课程资料的公共开放课程；<br/>如果您想创建一个协作研究空间，请您前往“我的项目”页面创建项目，谢谢！'
-  label_course_board: 讨论区
+  label_course_board: 问答区
   label_version: 版本
   label_version_new: 新建版本
 
@@ -1731,7 +1731,7 @@ zh:
   label_newbie_faq: '新手指引 & 问答'
   label_hot_project: '热门项目'
   label_borad_project: 项目讨论区
-  label_borad_course: 课程讨论区
+  label_borad_course: 课程问答区
   label_borad_org_subfield: 资源栏目讨论区
   view_borad_course: 课程讨论
   label_memo_create_succ: 发布成功

From 3deaa492b249acb379aa732742929fae9b69a2e3 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 4 Mar 2016 18:11:23 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BD=9C=E4=B8=9A=E6=8F=8F=E8=BF=B0=E8=A2=AB=E8=A7=A3?=
 =?UTF-8?q?=E6=9E=90=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_homework_form.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index 88e81827e..1e6de50b3 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -185,7 +185,7 @@
   <div id="homework_editor" style="display: <%= edit_mode ? 'block':'none'%>">
     <div class="mt10">
       <% if edit_mode %>
-          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='homework_textarea' name="homework_common[description]"><%=homework.description.html_safe %></textarea>
+          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='homework_textarea' name="homework_common[description]"><%=homework.description %></textarea>
           <%#= f.kindeditor :description, :editor_id => 'homework_description_editor', :height => "150px", :owner_id => homework.id, :owner_type => OwnerTypeHelper::HOMEWORKCOMMON, at_id: homework.id, at_type: homework.class.to_s %>
       <% else %>
           <%= hidden_field_tag :asset_id, params[:asset_id], :required => false, :style => 'display:none' %>