From 99922379a3db21ccbe28cced2a63ca0ed00059c9 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 18 Sep 2017 10:00:23 +0800
Subject: [PATCH 01/30] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=88=86=E7=8F=AD?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E4=B8=8D=E4=BC=9A=E6=98=BE=E7=A4=BA=E2=80=9C?=
 =?UTF-8?q?=E6=9C=AA=E5=88=86=E7=8F=AD=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_group_children_list.html.erb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/layouts/_group_children_list.html.erb b/app/views/layouts/_group_children_list.html.erb
index 10e456a37..65c220334 100644
--- a/app/views/layouts/_group_children_list.html.erb
+++ b/app/views/layouts/_group_children_list.html.erb
@@ -3,13 +3,13 @@
   <% group_count = @course.course_groups.count %>
   <span class="edu-cir-grey fl ml10 mt15"><%= group_count %></span>
 </li>
-<li id="sy_09" class="clearfix">
-  <% count = @course.members.where(:course_group_id => 0).select{|m| m.roles.to_s.include?("Student")}.count %>
-  <a href="<%= no_group_student_list_course_path(@course) %>" class="fl ml15">未分班</a>
-  <span class="edu-cir-grey fl ml10 mt15"><%= count %></span>
-</li>
 <% unless @course.course_groups.empty? %>
     <ul>
+      <li id="sy_09" class="clearfix">
+        <% count = @course.members.where(:course_group_id => 0).select{|m| m.roles.to_s.include?("Student")}.count %>
+        <a href="<%= no_group_student_list_course_path(@course) %>" class="fl ml15">未分班</a>
+        <span class="edu-cir-grey fl ml10 mt15"><%= count %></span>
+      </li>
       <% @course.course_groups.each do |group| %>
           <li id="course_group_<%=group.id %>" class="clearfix">
             <% count = group.members.count %>

From 0023e8b32f8dc11af9be135e0b77492c9fc8a258 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 18 Sep 2017 10:42:30 +0800
Subject: [PATCH 02/30] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E8=AF=BE=E5=A0=82-?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=8C=82=E8=B5=B7=E6=97=B6=E8=AF=B7=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E8=AE=BE=E7=BD=AE=E7=9A=84=E5=8F=91=E5=B8=83=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb             |  5 +++++
 .../_homework_index_list.html.erb             |  4 ++--
 public/javascripts/edu/base_edu.js            | 20 +++++++++----------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3ab45f124..716b7a4d2 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -572,6 +572,10 @@ module ApplicationHelper
       case ho_detail_manual.comment_status
         when 0
           status = "挂起"
+          if homework_common.publish_time
+            time = format_time homework_common.publish_time
+            tip = "发布时间"
+          end
         when 1
           if homework_common.end_time && homework_common.end_time >= Time.now
             status = "提交中"
@@ -595,6 +599,7 @@ module ApplicationHelper
         when 6
           status = "已结束"
           time = format_time homework_common.archive_time
+          tip = "结束时间"
       end
     end
     if status == "" && homework_common.allow_late && homework_common.archive_time > Time.now
diff --git a/app/views/homework_common/_homework_index_list.html.erb b/app/views/homework_common/_homework_index_list.html.erb
index 4f9eea2b2..8cb7a579c 100644
--- a/app/views/homework_common/_homework_index_list.html.erb
+++ b/app/views/homework_common/_homework_index_list.html.erb
@@ -50,8 +50,8 @@
                         未交
                       </span>
                   <% end %>
-                  <span class="ml50 <%= homework_common.homework_detail_manual.try(:comment_status) == 6 ? 'color-grey' : 'color-orange' %>"><%= homework_curr_status[:time] %></span>
               <% end %>
+              <span <%= homework_common.homework_detail_manual.try(:comment_status) == 0 ? "data-tip-down=发布时间" : '' %> class="ml50 <%= homework_common.homework_detail_manual.try(:comment_status) == 6 ? 'color-grey' : 'color-orange' %>"><%= homework_curr_status[:time] %></span>
             </p>
           </div>
           <% if @is_teacher %>
@@ -64,7 +64,7 @@
                       </li>
                   <% end %>
                   <li>
-                    <%= link_to "设置", setting_homework_common_path(homework_common) %>
+                    <%= link_to "设置", student_work_index_path(:homework => homework_common.id, :tab => 4) %>
                   </li>
                   <!--<li><%#= link_to "导出成绩", student_work_index_path(:homework => homework_common, :format => 'xls'), :id => "export_student_work" %></li>-->
                   <%# if homework_common.homework_type == 1 || homework_common.homework_type == 3 %>
diff --git a/public/javascripts/edu/base_edu.js b/public/javascripts/edu/base_edu.js
index 88d9f4eaf..7c75ca389 100644
--- a/public/javascripts/edu/base_edu.js
+++ b/public/javascripts/edu/base_edu.js
@@ -286,6 +286,16 @@ $(function(){
         if($(this).is(':checked')){
             $(this).parent().parent('ul').find('input[type="text"]').removeAttr('disabled');
             $(this).parent().parent('ul').find('input[type="text"]').removeClass('disabled-bg');
+            if($("input[name='homework_end_time']").val().trim() != ""){
+                var my_date = new Date();
+                var end_date = new Date(Date.parse($("input[name='homework_end_time']").val().replace(/-/g, "/")));
+                var max_date = my_date > end_date ? my_date : end_date;
+                $("input[name='homework_evaluation_start']").val(formate_time(new Date(max_date.setDate(max_date.getDate()+7))));
+                $("input[name='homework_evaluation_end']").val(formate_time(new Date(max_date.setDate(max_date.getDate()+14))));
+            }
+            $("input[name='homework_evaluation_num']").val("3");
+            $("input[name='homework_absence_penalty']").val("2");
+            $("select[name='st_proportion']").removeAttr('disabled').removeClass('disabled-bg');
             $("#anon_relate_setting_ul").show();
             $("input[name='homework_anonymous_appeal']").attr("checked", "checked");
             $("input[name='homework_appeal_time']").datetimepicker({
@@ -303,16 +313,6 @@ $(function(){
                 $("input[name='homework_appeal_time']").val(formate_time(new Date(max_date.setDate(max_date.getDate()+7))));
             }
             $("input[name='homework_appeal_penalty']").val("2");
-            if($("input[name='homework_end_time']").val().trim() != ""){
-                var my_date = new Date();
-                var end_date = new Date(Date.parse($("input[name='homework_end_time']").val().replace(/-/g, "/")));
-                var max_date = my_date > end_date ? my_date : end_date;
-                $("input[name='homework_evaluation_start']").val(formate_time(new Date(max_date.setDate(max_date.getDate()+7))));
-                $("input[name='homework_evaluation_end']").val(formate_time(new Date(max_date.setDate(max_date.getDate()+14))));
-            }
-            $("input[name='homework_evaluation_num']").val("3");
-            $("input[name='homework_absence_penalty']").val("2");
-            $("select[name='st_proportion']").removeAttr('disabled').removeClass('disabled-bg');
         } else{
             $(this).parent().parent('ul').find('input[type="text"]').attr('disabled', 'disabled');
             $(this).parent().parent('ul').find('input[type="text"]').addClass('disabled-bg');

From c8a484f109b953aff2e57c5ce93dfae4659341fe Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 18 Sep 2017 14:25:42 +0800
Subject: [PATCH 03/30] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=88=86=E7=8F=AD?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=B7=A6=E4=BE=A7=E8=8F=9C=E5=8D=95=E6=A0=8F?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb               |  1 +
 app/views/courses/all_student_list.js.erb           |  3 +--
 app/views/courses/has_group_student_list.js.erb     |  3 +--
 app/views/courses/members.html.erb                  |  2 --
 app/views/courses/members.js.erb                    |  1 +
 app/views/courses/no_group_student_list.js.erb      |  3 +--
 app/views/courses/settings/_all_teacher_list_ul.erb |  5 -----
 app/views/courses/sync_students.js.erb              |  3 +--
 public/javascripts/edu/course.js                    | 11 +++++------
 9 files changed, 11 insertions(+), 21 deletions(-)
 create mode 100644 app/views/courses/members.js.erb

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index d33d211ae..a6fd46cfd 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -989,6 +989,7 @@ class CoursesController < ApplicationController
 
     @curr_page = '成员管理'
     respond_to do |format|
+      format.js
       format.html { render :layout => 'base_edu_course' }
       format.api { render_validation_errors(@course) }
     end
diff --git a/app/views/courses/all_student_list.js.erb b/app/views/courses/all_student_list.js.erb
index a439657cb..4292ee39f 100644
--- a/app/views/courses/all_student_list.js.erb
+++ b/app/views/courses/all_student_list.js.erb
@@ -2,6 +2,5 @@
 <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
 $("#student_table_div").html("<%= j(render :partial => "courses/settings/student_table", :locals => {:is_teacher => is_teacher}) %>");
 <% else %>
-$("#setting_teacher_list").hide();
-$("#setting_student_list").html("<%= j(render :partial => 'courses/settings/all_student_list') %>").show();
+$("#setting_teacher_list").html("<%= j(render :partial => 'courses/settings/all_student_list') %>").show();
 <% end %>
\ No newline at end of file
diff --git a/app/views/courses/has_group_student_list.js.erb b/app/views/courses/has_group_student_list.js.erb
index 4896db9dd..ad521adf5 100644
--- a/app/views/courses/has_group_student_list.js.erb
+++ b/app/views/courses/has_group_student_list.js.erb
@@ -2,6 +2,5 @@
 <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
 $("#student_table_div").html("<%= j(render :partial => "courses/settings/student_table", :locals => {:is_teacher => is_teacher}) %>");
 <% else %>
-$("#setting_teacher_list").hide();
-$("#setting_student_list").html("<%= j(render :partial => 'courses/settings/has_group_student_list') %>").show();
+$("#setting_teacher_list").html("<%= j(render :partial => 'courses/settings/has_group_student_list') %>").show();
 <% end %>
\ No newline at end of file
diff --git a/app/views/courses/members.html.erb b/app/views/courses/members.html.erb
index 190e9083e..f2b609e68 100644
--- a/app/views/courses/members.html.erb
+++ b/app/views/courses/members.html.erb
@@ -10,8 +10,6 @@
         <div id="setting_teacher_list">
           <%= render :partial => 'courses/settings/members' %>
         </div>
-        <div id="setting_student_list">
-        </div>
       </div>
     </div>
   </div>
diff --git a/app/views/courses/members.js.erb b/app/views/courses/members.js.erb
new file mode 100644
index 000000000..f2a4a7648
--- /dev/null
+++ b/app/views/courses/members.js.erb
@@ -0,0 +1 @@
+$("#setting_teacher_list").html("<%= j(render :partial => 'courses/settings/members') %>");
\ No newline at end of file
diff --git a/app/views/courses/no_group_student_list.js.erb b/app/views/courses/no_group_student_list.js.erb
index 662e8380b..0590baec6 100644
--- a/app/views/courses/no_group_student_list.js.erb
+++ b/app/views/courses/no_group_student_list.js.erb
@@ -2,6 +2,5 @@
 <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
 $("#student_table_div").html("<%= j(render :partial => "courses/settings/student_table", :locals => {:is_teacher => is_teacher}) %>");
 <% else %>
-$("#setting_teacher_list").hide();
-$("#setting_student_list").html("<%= j(render :partial => 'courses/settings/no_group_student_list') %>").show();
+$("#setting_teacher_list").html("<%= j(render :partial => 'courses/settings/no_group_student_list') %>").show();
 <% end %>
\ No newline at end of file
diff --git a/app/views/courses/settings/_all_teacher_list_ul.erb b/app/views/courses/settings/_all_teacher_list_ul.erb
index 164359a92..6a41f6460 100644
--- a/app/views/courses/settings/_all_teacher_list_ul.erb
+++ b/app/views/courses/settings/_all_teacher_list_ul.erb
@@ -17,11 +17,6 @@
             <em><%= group.members.count %></em>
             <!--<i class="fa fa-bars" aria-hidden="true"></i>-->
           </p>
-
-          <p class="p2 color-grey">
-            <span onclick="rename_group_name(<%= @course.id %>, <%= group.id %>)">重命名</span>
-            <span onclick="delete_group(<%= @course.id %>, <%= group.id %>)">删除</span>
-          </p>
         </li>
     <% end %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/courses/sync_students.js.erb b/app/views/courses/sync_students.js.erb
index c49456425..1e5f43280 100644
--- a/app/views/courses/sync_students.js.erb
+++ b/app/views/courses/sync_students.js.erb
@@ -1,2 +1 @@
-$("#setting_teacher_list").hide();
-$("#setting_student_list").html("<%= j(render :partial => 'courses/settings/all_student_list') %>").show();
\ No newline at end of file
+$("#setting_teacher_list").html("<%= j(render :partial => 'courses/settings/all_student_list') %>").show();
\ No newline at end of file
diff --git a/public/javascripts/edu/course.js b/public/javascripts/edu/course.js
index 2bbdceb5d..f54d85e06 100644
--- a/public/javascripts/edu/course.js
+++ b/public/javascripts/edu/course.js
@@ -43,25 +43,24 @@ $(function() {
     $(".stud-class-set .news .container .member .people .left ul li").live('click', function(e) {
 		//$(".stud-class-set .news .container .member .people .left ul li").removeClass("sheet");
 		//$(this).addClass("sheet");
+        var $course_id = $(this).attr("data-course-id");
         if($(this).attr("data-option") == "teacher") {
-            $("#setting_teacher_list").show();
-            $("#setting_student_list").html("");
+            $.get(
+                    '/courses/'+$course_id+'/members'
+            )
         }
         if($(this).attr("data-option") == "allstudent") {
-            var $course_id = $(this).attr("data-course-id");
             $.get(
                 '/courses/'+$course_id+'/all_student_list'
             )
         }
         if($(this).attr("data-option") == "noclass") {
-            var $course_id = $(this).attr("data-course-id");
             $.get(
                     '/courses/'+$course_id+'/no_group_student_list'
             )
         }
 
         if($(this).attr("data-option") == "hasclass") {
-            var $course_id = $(this).attr("data-course-id");
             var $group_id = $(this).attr("data-group-id");
             $.get(
                     '/courses/'+$course_id+'/has_group_student_list?group_id='+$group_id
@@ -280,7 +279,7 @@ function submit_delete_group_form(course_id, group_id){
             if($("#sy_08").length > 0){
                 window.location.href = "/courses/"+course_id+"/all_student_list";
             } else{
-                $(".stud-class-set .news .container .member .people .left ul li[data-option='teacher']").click();
+                $(".stud-class-set .news .container .member .people .left ul li[data-option='allstudent']").click();
             }
         }
     });

From 71709212cb264cdac96e7cc410ca7b83903cd68d Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 18 Sep 2017 15:27:58 +0800
Subject: [PATCH 04/30] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=88=86=E7=8F=AD?=
 =?UTF-8?q?=E5=90=8E=E8=B7=B3=E5=88=B0=E5=85=A8=E9=83=A8=E5=AD=A6=E7=94=9F?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/settings/_choose_course_group.html.erb | 2 +-
 public/javascripts/edu/course.js                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/courses/settings/_choose_course_group.html.erb b/app/views/courses/settings/_choose_course_group.html.erb
index e9eedee90..c5e8acedc 100644
--- a/app/views/courses/settings/_choose_course_group.html.erb
+++ b/app/views/courses/settings/_choose_course_group.html.erb
@@ -9,7 +9,7 @@
           <input type="hidden" name="member_ids[]" value="<%= id %>">
       <% end %>
       <input type="hidden" name="type" value="<%= @type %>">
-      <%= select_tag :course_group_id,options_for_select(course_group_option(@course),0), {:id=>"course_group_id", :class=>"task-height-40 color-grey", :style => 'width:400px;border:1px solid #ddd;background:#fff;'} %>
+      <%= select_tag :course_group_id,options_for_select(course_group_option(@course),0), {:id=>"course_group_id", :class=>"task-height-40 color-grey ml10", :style => 'width:400px;border:1px solid #ddd;background:#fff;'} %>
       <div class="cl"></div>
       <span class="color-orange none" id="choose_course_group_notice">请先选择一个分班</span>
   <% end %>
diff --git a/public/javascripts/edu/course.js b/public/javascripts/edu/course.js
index f54d85e06..8f7131f15 100644
--- a/public/javascripts/edu/course.js
+++ b/public/javascripts/edu/course.js
@@ -187,7 +187,7 @@ function submit_new_group_form(id){
                     if($("#sy_08").length > 0){
                         window.location.href = "/courses/"+id+"/all_student_list";
                     } else{
-                        window.location.href = "/courses/"+id+"/members";
+                        $(".stud-class-set .news .container .member .people .left ul li[data-option='allstudent']").click();
                     }
                 }
             }

From 3480aaeeed08671903092332a1595cd9c81c642b Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 18 Sep 2017 15:55:23 +0800
Subject: [PATCH 05/30] =?UTF-8?q?=E5=8C=BF=E8=AF=84=E6=97=B6=EF=BC=9A?=
 =?UTF-8?q?=E6=9C=AA=E6=8F=90=E4=BA=A4=E4=BD=9C=E4=B8=9A=EF=BC=8C=E5=9C=A8?=
 =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E4=B8=8D=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E5=92=8C?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/_evaluation_work.html.erb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb
index 39bc70a81..a3d6da907 100644
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@@ -10,12 +10,14 @@
   <% if is_my_work%>
       <td><%= index + 1 %></td>
       <td><%= student_work.user.show_real_name%></td>
-      <td><%= format_time student_work.updated_at %></td>
+      <td>
+        <%= student_work.work_status == 0 ? '--' : format_time(student_work.updated_at) %>
+      </td>
       <td class="<%= score_color student_work.student_score %>">
         <%= student_work.student_score.nil? ? '--' : format("%.1f",student_work.student_score)+"（#{student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count}）" %>
       </td>
       <td>
-        <%= link_to '查看', student_work_path(student_work), :class => 'link-color-blue' %>
+        <%= link_to "#{student_work.work_status == 0 ? '--' : '查看'}", student_work_path(student_work) %>
       </td>
   <% else%>
       <td><%= index + 1 %></td>

From f91deb919a8196cdc872c469413a89dfaf21bd2d Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 18 Sep 2017 16:23:06 +0800
Subject: [PATCH 06/30] =?UTF-8?q?=E8=AF=84=E9=98=85=E4=BD=9C=E5=93=81?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E4=B8=8D=E8=A6=81=E7=BB=99=E5=87=BA=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA-1=E7=9A=84=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../student_work/_student_work_score_div.html.erb      |  2 +-
 public/javascripts/edu/course.js                       | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/student_work/_student_work_score_div.html.erb b/app/views/student_work/_student_work_score_div.html.erb
index 30a2c1504..455bf05ff 100644
--- a/app/views/student_work/_student_work_score_div.html.erb
+++ b/app/views/student_work/_student_work_score_div.html.erb
@@ -26,7 +26,7 @@
               <div class="clearfix">
                 <li class="fl mb15 with80">
                   <label class="panel-form-label fl color-grey" style="width:80px;"> 评分&nbsp;&nbsp;</label>
-                  <input type="number" class="fl task-form-10 task-height-40 panel-box-sizing color-light-green" name="score" id="score_<%= @work.id%>" value="<%= (@score.nil? || @score.score.nil?) ? -1 : @score.score%>" min="-1" max="100" size="4" data-units="dollars" />
+                  <input type="number" class="fl task-form-10 task-height-40 panel-box-sizing" name="score" id="score_<%= @work.id%>" value="<%= (@score.nil? || @score.score.nil?) ? -1 : @score.score%>" min="-1" max="100" size="4" data-units="dollars" />
                   <!--<input type="number" class="fl task-form-10 task-height-40 panel-box-sizing" placeholder="88" name="score" />-->
                   <!--<input type="number" class="fl task-form-10 task-height-40 panel-box-sizing" placeholder="88" name="score" id="score_<%#= @work.id %>" value="<%#= (@score.nil? || @score.score.nil?) ? -1 : @score.score %>" min="-1" max="100" size="4" data-units="dollars" />-->
                   <span class="ml5 fl mt5">分</span>
diff --git a/public/javascripts/edu/course.js b/public/javascripts/edu/course.js
index 8f7131f15..46db4b272 100644
--- a/public/javascripts/edu/course.js
+++ b/public/javascripts/edu/course.js
@@ -397,7 +397,7 @@ $.fn.peSlider = function(settings){
                 input.next().next().html("未评分");
                 input.next().next().show();
             } else{
-                input.css("color", "#000");
+                input.css("color", "#29bd8b");
                 input.next().next().hide();
             }
             slider
@@ -409,7 +409,7 @@ $.fn.peSlider = function(settings){
                         input.next().next().html("未评分");
                         input.next().next().show();
                     } else {
-                        input.css("color", "#000");
+                        input.css("color", "#29bd8b");
                         input.next().next().hide();
                     }
                     input.val(ui.value);
@@ -437,7 +437,7 @@ $.fn.peSlider = function(settings){
                             input.next().next().html("未评分");
                             input.next().next().show();
                         } else {
-                            input.css("color", "#000");
+                            input.css("color", "#29bd8b");
                             input.next().next().hide();
                         }
                         slider.slider('value', inVal);
@@ -452,7 +452,7 @@ $.fn.peSlider = function(settings){
                             input.next().next().html("未评分");
                             input.next().next().show();
                         } else {
-                            input.css("color", "#000");
+                            input.css("color", "#29bd8b");
                             input.next().next().hide();
                         }
                         slider.slider('value', inVal);
@@ -469,7 +469,7 @@ $.fn.peSlider = function(settings){
                         input.next().next().html("未评分");
                         input.next().next().show();
                     } else {
-                        input.css("color", "#000");
+                        input.css("color", "#29bd8b");
                         input.next().next().hide();
                     }
                 });

From e93a5d8a556ec2bfcde3e1dd4abf6a8ad4c34f6e Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 18 Sep 2017 16:29:07 +0800
Subject: [PATCH 07/30] =?UTF-8?q?=E4=BD=9C=E5=93=81=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E5=92=8C=E8=AF=84=E9=98=85=E9=9C=80=E8=A6=81=E6=96=B0=E5=BC=80?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/_evaluation_un_common_work.html.erb | 2 +-
 app/views/student_work/_evaluation_un_group_work.html.erb  | 2 +-
 app/views/student_work/_evaluation_un_pro_work.html.erb    | 2 +-
 app/views/student_work/_evaluation_work.html.erb           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/student_work/_evaluation_un_common_work.html.erb b/app/views/student_work/_evaluation_un_common_work.html.erb
index 9083fef8b..c4017550d 100644
--- a/app/views/student_work/_evaluation_un_common_work.html.erb
+++ b/app/views/student_work/_evaluation_un_common_work.html.erb
@@ -84,6 +84,6 @@
     <% end%>
   </td>
   <td>
-    <%= link_to "#{@is_teacher ? '评阅' : (student_work.work_status == 0 ? '--' : '查看')}", student_work_path(student_work) %>
+    <%= link_to "#{@is_teacher ? '评阅' : (student_work.work_status == 0 ? '--' : '查看')}", student_work_path(student_work), :target => "_blank" %>
   </td>
 </tr>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_un_group_work.html.erb b/app/views/student_work/_evaluation_un_group_work.html.erb
index 00db81514..df7a275eb 100644
--- a/app/views/student_work/_evaluation_un_group_work.html.erb
+++ b/app/views/student_work/_evaluation_un_group_work.html.erb
@@ -87,6 +87,6 @@
     <% end%>
   </td>
   <td>
-    <%= link_to "#{@is_teacher ? '评阅' : (student_work.work_status == 0 ? '--' : '查看')}", student_work_path(student_work) %>
+    <%= link_to "#{@is_teacher ? '评阅' : (student_work.work_status == 0 ? '--' : '查看')}", student_work_path(student_work), :target => "_blank" %>
   </td>
 </tr>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_un_pro_work.html.erb b/app/views/student_work/_evaluation_un_pro_work.html.erb
index d891e3da2..a22509577 100644
--- a/app/views/student_work/_evaluation_un_pro_work.html.erb
+++ b/app/views/student_work/_evaluation_un_pro_work.html.erb
@@ -87,6 +87,6 @@
     <% end%>
   </td>
   <td>
-    <%= link_to "#{@is_teacher ? '评阅' : (student_work.work_status == 0 ? '--' : '查看')}", student_work_path(student_work) %>
+    <%= link_to "#{@is_teacher ? '评阅' : (student_work.work_status == 0 ? '--' : '查看')}", student_work_path(student_work), :target => "_blank" %>
   </td>
 </tr>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb
index a3d6da907..771f5b1a0 100644
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@@ -17,7 +17,7 @@
         <%= student_work.student_score.nil? ? '--' : format("%.1f",student_work.student_score)+"（#{student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count}）" %>
       </td>
       <td>
-        <%= link_to "#{student_work.work_status == 0 ? '--' : '查看'}", student_work_path(student_work) %>
+        <%= link_to "#{student_work.work_status == 0 ? '--' : '查看'}", student_work_path(student_work), :target => "_blank" %>
       </td>
   <% else%>
       <td><%= index + 1 %></td>

From c4d786664b1f17a3798ad623dce5c30368556643 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 18 Sep 2017 17:36:11 +0800
Subject: [PATCH 08/30] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E7=9A=84=E6=A0=87=E9=A2=98=E9=83=A8=E5=88=86=E4=B8=8D=E5=9B=BA?=
 =?UTF-8?q?=E5=AE=9A=E6=98=BE=E7=A4=BA=E2=80=9C=E7=AC=AC1=E7=AB=A0?=
 =?UTF-8?q?=E2=80=9D=E7=AD=89=E5=AD=97=E6=A0=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/subjects/show.html.erb                |  6 +++---
 db/migrate/20170918090054_migrate_stage_name.rb | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 db/migrate/20170918090054_migrate_stage_name.rb

diff --git a/app/views/subjects/show.html.erb b/app/views/subjects/show.html.erb
index c00effaa7..15425bf40 100644
--- a/app/views/subjects/show.html.erb
+++ b/app/views/subjects/show.html.erb
@@ -20,7 +20,7 @@
         <div class="lesson-saved-list-item pt20 pb20 bor-grey-e user_bg_shadow mb20" style = "border-radius:4px;" id="stage_div_<%= stage.id %>">
           <p class="clearfix title-line ml20 mr20">
             <i class="fa fa-pause-circle color-light-green font-22 transform90 mr5"></i>
-            <span class="font-18 font-bd">第<span class="subject_stage_index"><%= s_index + 1 %></span>章&nbsp;&nbsp;<%= stage.name %></span>
+            <span class="font-18 font-bd"><%= stage.name %></span>
             <% if User.current.manager_of_subject?(@subject) %>
                 <a href="javascript:void(0);" class="fr" onclick="edit_stage(<%= stage.id %>)"><i class="fa fa-pencil mt8 color-grey-c edit" data-tip-down="编辑"></i></a>
                 <a href="javascript:void(0);" class="fr" onclick="delete_confirm_box_2('<%= stage_path(stage) %>', '确定要删除该阶段吗？');"><i class="fa fa-trash mt8 mr10 color-grey-c delete" data-tip-down="删除"></i></a>
@@ -108,7 +108,7 @@
                   <div class="stage-entry clearfix">
                     <li class="clearfix ml10 mr10">
                       <label class="fl"><span class="color-orange mr5">*</span>名称:</label>
-                      <input class="stage-name fl" name="stage_name" style="background: none;" maxlength="100" placeholder="请输入阶段名称,最多100个字符,如基础知识、第1章等" size="100" type="text">
+                      <input class="stage-name fl" name="stage_name" value="第1章 " style="background: none;" maxlength="100" placeholder="请输入阶段名称,最多100个字符,如基础知识、第1章等" size="100" type="text">
                       <p class="color-red clearfix" style="height: 20px;width: 90%;margin-left: 55px"><span id="stage_name_notice" style="display: none;"><i class="fa fa-exclamation-circle color-red mr5"></i>阶段名称不能为空</span></p>
                     </li>
                     <li class="clearfix ml10 mb15">
@@ -265,7 +265,7 @@
             edithtml+="<div class=\"stage-entry clearfix\">";
             edithtml+="<li class=\"clearfix ml10 mr10\">";
             edithtml+="<label class=\"fl\"><span class=\"color-orange mr5\">*</span>名称:</label>";
-            edithtml+="<input class=\"stage-name fl\" name=\"stage_name\" style=\"background: none;\" maxlength=\"100\" placeholder=\"请输入阶段名称,最多100个字符,如基础知识、第1章等\" size=\"100\" type=\"text\">";
+            edithtml+="<input class=\"stage-name fl\" name=\"stage_name\" style=\"background: none;\" value=\"第"+counttage+"章\" maxlength=\"100\" placeholder=\"请输入阶段名称,最多100个字符,如基础知识、第1章等\" size=\"100\" type=\"text\">";
             edithtml+="<p class=\"color-red clearfix\" style=\"height: 20px;width: 90%;margin-left: 55px\"><span id=\"stage_name_notice\" style=\"display: none;\"><i class=\"fa fa-exclamation-circle color-red mr5\"></i>阶段名称不能为空</span></p>";
             edithtml+="</li>";
             edithtml+="<li class=\"clearfix ml10 mb15\">";
diff --git a/db/migrate/20170918090054_migrate_stage_name.rb b/db/migrate/20170918090054_migrate_stage_name.rb
new file mode 100644
index 000000000..0168c1452
--- /dev/null
+++ b/db/migrate/20170918090054_migrate_stage_name.rb
@@ -0,0 +1,14 @@
+#encoding: utf-8
+class MigrateStageName < ActiveRecord::Migration
+  def up
+    Stage.where("0=0").each do |stage|
+      str = "第" + stage.position.to_s + "章"
+      unless stage.name.index(str) && stage.name.index(str) == 0
+        stage.update_column('name', str + " " + stage.name)
+      end
+    end
+  end
+
+  def down
+  end
+end

From c6960002c5cc5e368741128078dbb3e700d2bc8b Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 19 Sep 2017 15:15:16 +0800
Subject: [PATCH 09/30] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E7=9A=84=E6=9C=80=E7=83=AD=E9=9C=80=E8=A6=81=E6=8A=8A=E5=B7=B2?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=9A=84=E6=8E=92=E5=9C=A8=E6=9C=80=E5=89=8D?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/shixuns_controller.rb | 34 +++++++++++++++------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index 48edf6bf8..5cbeff5bd 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -141,10 +141,12 @@ class ShixunsController < ApplicationController
     @mail = User.current.mail.blank?
     @shixun_all_count = Shixun.all.count
     @shixuns = Shixun.where("name like ? and hidden = 0", "%#{search}%")
-    @shixuns.each do |shixun|
-      shixun[:myshixunCount] = shixun.myshixuns.count
-    end
-    @shixuns = @shixuns.sort{|x, y| y[:myshixunCount] <=> x[:myshixunCount]}
+    # @shixuns.each do |shixun|
+    #   shixun[:myshixunCount] = shixun.myshixuns.count
+    # end
+    # @shixuns = @shixuns.sort{|x, y| y[:myshixunCount] <=> x[:myshixunCount]}
+    @shixuns = @shixuns.select("shixuns.*, (select count(myshixuns.id) from myshixuns where myshixuns.shixun_id = shixuns.id group by shixuns.id) AS myshixunCount").reorder("status = 2 desc, myshixunCount desc")
+
     @shixun_my_score = Experience.find_by_sql("SELECT sum(score) as score FROM `experiences` where user_id=#{User.current.id}").first.try(:score).to_i
     @current_user_had_passed = Myshixun.find_by_sql("select count(*) as had_passed from myshixuns where status =1 and user_id=#{User.current.id}
                                                    and shixun_id in (SELECT id FROM `shixuns` where status > 1)").first.try(:had_passed).to_i
@@ -241,8 +243,8 @@ class ShixunsController < ApplicationController
     @order = params[:order] || "myshixun_count"
     bsort = params[:sort] || "desc"
     @sort = bsort == "desc" ? "asc" : "desc"
-    if @order == "updated_at"
-      order_str = "#{Shixun.table_name}.updated_at #{bsort}"
+    if @order == "created_at"
+      order_str = "#{Shixun.table_name}.created_at #{bsort}"
     else
       order_str = "myshixun_count #{bsort}, #{Shixun.table_name}.updated_at #{bsort}"
     end
@@ -298,18 +300,20 @@ class ShixunsController < ApplicationController
       when nil, "0"
         @shixuns = @shixuns
     end
-    if @order == "updated_at"
+    if @order == "created_at"
       @shixuns =@shixuns.reorder(order_str)
     else
       # 最热排序
-      @shixuns.each do |shixun|
-        shixun[:myshixunCount] = shixun.myshixuns.count
-      end
-      if bsort == "desc"
-        @shixuns = @shixuns.sort{|x, y| y[:myshixunCount] <=> x[:myshixunCount]}
-      else
-        @shixuns = @shixuns.sort{|x, y| x[:myshixunCount] <=> y[:myshixunCount]}
-    end
+      # @shixuns.each do |shixun|
+      #   shixun[:myshixunCount] = shixun.myshixuns.count
+      # end
+      @shixuns = @shixuns.select("shixuns.*, (select count(myshixuns.id) from myshixuns where myshixuns.shixun_id = shixuns.id group by shixuns.id) AS myshixunCount").reorder("status = 2 desc, myshixunCount #{bsort}")
+      #@shixuns = @shixuns.reorder("status = 2 #{bsort}, myshixunCount #{bsort}")
+      # if bsort == "desc"
+      #   @shixuns = @shixuns.sort{|x, y| y[:myshixunCount] <=> x[:myshixunCount]}
+      # else
+      #   @shixuns = @shixuns.sort{|x, y| x[:myshixunCount] <=> y[:myshixunCount]}
+      # end
     end
     # @shixuns = Shixun.where(:authentication => 1).reorder(order)
     @shixuns_count = @shixuns.count

From d18d0d1de267245f34522226592d1f94074a648b Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 19 Sep 2017 15:35:38 +0800
Subject: [PATCH 10/30] =?UTF-8?q?=E9=95=BF=E4=B8=AD=E5=BF=83=E7=9A=84?=
 =?UTF-8?q?=E7=BB=8F=E9=AA=8C=E5=80=BC=E5=92=8C=E9=87=91=E5=B8=81=E4=B8=BA?=
 =?UTF-8?q?0=E7=9A=84=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 78569490a..b7ba90cd0 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2323,7 +2323,7 @@ class UsersController < ApplicationController
   end
 
   def user_experience
-    @user_experiences = @user.experiences.reorder("created_at desc")
+    @user_experiences = @user.experiences.where("score > 0").reorder("created_at desc")
     @limit = 20
     @is_remote = true
     @experiences_count = @user_experiences.count

From ac667c55830f224c1bb010cabb840133b52fd10a Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 20 Sep 2017 11:09:32 +0800
Subject: [PATCH 11/30] =?UTF-8?q?=E6=95=99=E8=BE=85=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=AF=BE=E5=A0=82=E3=80=81=E8=80=81=E5=B8=88?=
 =?UTF-8?q?=E6=89=B9=E5=87=86=EF=BC=8C=E8=AF=B7=E7=BB=99=E6=95=99=E5=B8=88?=
 =?UTF-8?q?=E5=8F=91=E7=95=99=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb | 10 ++++++++++
 app/controllers/users_controller.rb   | 12 ++++++++++--
 app/models/course.rb                  |  5 +++++
 app/services/courses_service.rb       | 24 ++++++++++++------------
 4 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index a6fd46cfd..5752290f4 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -217,6 +217,16 @@ class CoursesController < ApplicationController
       join = cs.join_course_roles params,@user
       @state = join[:state]
       @course = join[:course]
+      if @state == 6
+        # 给课堂老师发留言
+        if params[:role].include?("7") || params[:role].include?("9")
+          notes = @user.show_real_name.to_s + " 申请以#{params[:role].include?('7') ? '教辅' : '教师'}的身份加入班级：<a target='_blank' href='#{members_course_path(@course)}'>#{@course.name}</a>"
+          @course.course_teachers.each do |mem|
+            user = mem.user
+            user.journals_for_messages << JournalsForMessage.new(:user_id => @user.id, :notes => notes, :private => 1, :reply_id => 0)
+          end
+        end
+      end
     else
       @state = 5 #未登录
     end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b7ba90cd0..e9078ba63 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -790,14 +790,22 @@ class UsersController < ApplicationController
           if integer_ids.include?(9)
             cs = CoursesService.new
             c = Course.find(@msg.course_id)
-            cs.send_wechat_join_class_notice apply_user,c,9,0
+            #cs.send_wechat_join_class_notice apply_user,c,9,0
           else
             cs = CoursesService.new
             c = Course.find(@msg.course_id)
-            cs.send_wechat_join_class_notice apply_user,c,7,0
+            #cs.send_wechat_join_class_notice apply_user,c,7,0
           end
         end
 
+        apply_user = User.find @msg.course_message_id
+        notes = User.current.show_real_name.to_s + " 批准#{apply_user.show_real_name}以#{integer_ids.include?(7) ? '教辅' : '教师'}的身份加入班级：<a target='_blank' href='#{members_course_path(c)}'>#{c.name}</a>"
+        c.course_teachers.each do |mem|
+          user = mem.user
+          if user != User.current
+            user.journals_for_messages << JournalsForMessage.new(:user_id => User.current.id, :notes => notes, :private => 1, :reply_id => 0)
+          end
+        end
       when 'N'
         CourseMessage.create(:user_id => @msg.course_message_id, :course_id => @msg.course_id, :viewed => false,:course_message_id=>User.current.id,:content=>@msg.content,:course_message_type=>'CourseRequestDealResult',:status=>2)
         @msg.update_attributes(:status=>2,:viewed=>1)
diff --git a/app/models/course.rb b/app/models/course.rb
index 534325464..5a169be09 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -244,6 +244,11 @@ class Course < ActiveRecord::Base
     self.status == STATUS_ARCHIVED
   end
 
+  # 课堂的老师不包括助教
+  def course_teachers
+    self.members.select{|m| m.roles.to_s.include?("Manager") || m.roles.to_s.include?("Teacher")}
+  end
+
   def self.visible_condition(user, options={})
     allowed_to_condition(user, :view_course, options)
   end
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 745f0e938..dce1176f2 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -682,18 +682,18 @@ class CoursesService
 
                 #----------------微信通知----------------------
 
-                if role_ids.include?("7") || role_ids.include?("9")
-                  tea_user = User.find(course.tea_id)
-                  count = ShieldWechatMessage.where("container_type='User' and container_id=#{tea_user.id} and shield_type='Course' and shield_id=#{course.id}").count
-                  if count == 0
-
-                    rolename = role_ids.include?("7") ? "助教" : "教师"
-                    content = current_user.show_name + "申请以"+rolename+"身份加入班级，等待您的审批。"
-                    name = course.course_list.nil? ? course.name : course.course_list_name+" • "+course.name
-                    ws = WechatService.new
-                    ws.class_notice tea_user.id, "review_class_member", course.id, "班级成员审批通知。", name, tea_user.show_name, format_time(Time.now), content, "点击查看申请详情。",current_user.id
-                  end
-                end
+                # if role_ids.include?("7") || role_ids.include?("9")
+                #   tea_user = User.find(course.tea_id)
+                #   count = ShieldWechatMessage.where("container_type='User' and container_id=#{tea_user.id} and shield_type='Course' and shield_id=#{course.id}").count
+                #   if count == 0
+                #
+                #     rolename = role_ids.include?("7") ? "助教" : "教师"
+                #     content = current_user.show_name + "申请以"+rolename+"身份加入班级，等待您的审批。"
+                #     name = course.course_list.nil? ? course.name : course.course_list_name+" • "+course.name
+                #     ws = WechatService.new
+                #     ws.class_notice tea_user.id, "review_class_member", course.id, "班级成员审批通知。", name, tea_user.show_name, format_time(Time.now), content, "点击查看申请详情。",current_user.id
+                #   end
+                # end
                 #--------------------------------------------
 
                 if is_stu

From 113df2494383e0ecddbaa4d0ce8afdc384345cf2 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 20 Sep 2017 11:23:25 +0800
Subject: [PATCH 12/30] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=AF=B7=E6=98=BE=E7=A4=BA=E5=8F=91=E5=B8=83=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb                       | 5 -----
 app/views/homework_common/_homework_index_list.html.erb | 5 ++++-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 716b7a4d2..3ab45f124 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -572,10 +572,6 @@ module ApplicationHelper
       case ho_detail_manual.comment_status
         when 0
           status = "挂起"
-          if homework_common.publish_time
-            time = format_time homework_common.publish_time
-            tip = "发布时间"
-          end
         when 1
           if homework_common.end_time && homework_common.end_time >= Time.now
             status = "提交中"
@@ -599,7 +595,6 @@ module ApplicationHelper
         when 6
           status = "已结束"
           time = format_time homework_common.archive_time
-          tip = "结束时间"
       end
     end
     if status == "" && homework_common.allow_late && homework_common.archive_time > Time.now
diff --git a/app/views/homework_common/_homework_index_list.html.erb b/app/views/homework_common/_homework_index_list.html.erb
index 8cb7a579c..17dc45a07 100644
--- a/app/views/homework_common/_homework_index_list.html.erb
+++ b/app/views/homework_common/_homework_index_list.html.erb
@@ -51,7 +51,10 @@
                       </span>
                   <% end %>
               <% end %>
-              <span <%= homework_common.homework_detail_manual.try(:comment_status) == 0 ? "data-tip-down=发布时间" : '' %> class="ml50 <%= homework_common.homework_detail_manual.try(:comment_status) == 6 ? 'color-grey' : 'color-orange' %>"><%= homework_curr_status[:time] %></span>
+              <span class="ml50 <%= homework_common.homework_detail_manual.try(:comment_status) == 6 ? 'color-grey' : 'color-orange' %>"><%= homework_curr_status[:time] %></span>
+              <% if homework_common.homework_detail_manual.try(:comment_status) == 0 && homework_common.publish_time %>
+                  <span class="ml50 color-grey">将于&nbsp;<span class="color-orange"><%= format_time(homework_common.publish_time).to_s %></span>&nbsp;发布</span>
+            <% end %>
             </p>
           </div>
           <% if @is_teacher %>

From da6d67eb35f1c352e91f5748f07c966ff5ae5c14 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 20 Sep 2017 14:27:13 +0800
Subject: [PATCH 13/30] =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E3=80=81=E8=AE=A8=E8=AE=BA=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb         |  2 +-
 app/helpers/application_helper.rb             |  6 ++---
 ..._single_or_multiple_question_show.html.erb |  2 +-
 app/views/files/_resource_detail.html.erb     |  2 +-
 app/views/users/_course_attachment.html.erb   |  6 ++---
 app/views/users/_course_boardlist.html.erb    | 24 +++++++++++++++----
 app/views/users/_course_create.html.erb       |  6 ++---
 app/views/users/_course_homework.html.erb     |  8 +++----
 .../users/_course_journalsformessage.html.erb |  4 ++--
 app/views/users/_course_message.html.erb      |  6 ++---
 app/views/users/_course_news.html.erb         |  4 ++--
 app/views/users/_course_poll.html.erb         |  6 ++---
 app/views/users/_homework_base_info.html.erb  | 12 +++++-----
 public/stylesheets/css/edu-common.css         |  2 +-
 public/stylesheets/css/structure.css          | 13 +++++-----
 15 files changed, 60 insertions(+), 43 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 12cd48c94..8ea6afc5b 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -36,7 +36,7 @@ class CoursesController < ApplicationController
   before_filter :require_login, :only => [:join, :unjoin]
   #before_filter :allow_join, :only => [:join]
   require 'bundler/setup'
-  require 'simple_xlsx_reader'
+  #require 'simple_xlsx_reader'
 
   # params[:search] 搜索课程的名称
   # params[:select] "join" "create" "all" 参与的 创建的 所有的课程
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3ab45f124..897f7cf02 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -3885,7 +3885,7 @@ module ApplicationHelper
     if User.current.logged?
       if User.current.member_of_course?(homework.course)
         if is_teacher #老师显示作品数量
-          link_to "作品(#{count})", student_work_index_url_in_org(homework.id, 2), :class => "c_blue homepagePostSubmit"
+          link_to "作品&nbsp;(#{count})".html_safe, student_work_index_url_in_org(homework.id, 2), :class => "c_blue homepagePostSubmit"
         else #学生显示提交作品、修改作品等按钮
           work = cur_user_works_for_homework homework
           project = cur_user_projects_for_homework homework
@@ -3924,10 +3924,10 @@ module ApplicationHelper
           end
         end
       else
-        link_to "作品(#{count})", "javascript:void(0)", :class => "c_blue homepagePostSubmit", :onclick => "notice_sure_box('您不是班级成员，不能提交作品<br/>请先从老师处获取邀请码后加入班级，再提交作品')"
+        link_to "作品&nbsp;(#{count})".html_safe, "javascript:void(0)", :class => "c_blue homepagePostSubmit", :onclick => "notice_sure_box('您不是班级成员，不能提交作品<br/>请先从老师处获取邀请码后加入班级，再提交作品')"
       end
     else
-      link_to "作品(#{count})", "javascript:void(0)", :class => "c_blue homepagePostSubmit", :onclick => "login_notice_box('#{signin_url_without_domain}');"
+      link_to "作品&nbsp;(#{count})".html_safe, "javascript:void(0)", :class => "c_blue homepagePostSubmit", :onclick => "login_notice_box('#{signin_url_without_domain}');"
     end
   end
 
diff --git a/app/views/challenges/_single_or_multiple_question_show.html.erb b/app/views/challenges/_single_or_multiple_question_show.html.erb
index b4a528a8d..c16722e2f 100644
--- a/app/views/challenges/_single_or_multiple_question_show.html.erb
+++ b/app/views/challenges/_single_or_multiple_question_show.html.erb
@@ -47,7 +47,7 @@
     <div class="panel-form">
         <li class="clearfix">
           <label class="panel-form-label fl">技能标签：&nbsp;&nbsp;</label>
-          <div class="fl task-inputs mt5">
+          <div class="fl task-inputs" style="margin-top:6px;">
             <% if  @challenge_choose.challenge_tags.blank? %>
                 无
             <% else %>
diff --git a/app/views/files/_resource_detail.html.erb b/app/views/files/_resource_detail.html.erb
index 2a43b58c2..d11fa252a 100644
--- a/app/views/files/_resource_detail.html.erb
+++ b/app/views/files/_resource_detail.html.erb
@@ -67,7 +67,7 @@
       <div class="homepagePostSetting">
         <ul>
           <li>
-            <i class="fa fa-bars color-grey-bc"></i>
+            <i class="fa fa-bars color-grey-b"></i>
             <% if User.current.logged? || User.current.admin? %>
                 <% if User.current.admin? || ((is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file)) %>
                     <% if User.current.admin? || ((delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course") %>
diff --git a/app/views/users/_course_attachment.html.erb b/app/views/users/_course_attachment.html.erb
index 7607b61fc..834514c9a 100644
--- a/app/views/users/_course_attachment.html.erb
+++ b/app/views/users/_course_attachment.html.erb
@@ -10,12 +10,12 @@
       </div>
       <div class="homepagePostTo break_word fl" style="margin:0px">
         <% if activity.try(:author).show_real_name == ' ' %>
-            <%= link_to activity.try(:author).show_real_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:author).show_real_name, user_path(activity.author_id), :class => "newsBlue mr15 color-grey-b" %>
         <% else %>
-            <%= link_to activity.try(:author).show_real_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:author).show_real_name, user_path(activity.author_id), :class => "newsBlue mr15 color-grey-b" %>
         <% end %>
         TO
-        <%= link_to "班级资源", course_files_path(activity.course), :class => "newsBlue ml15" %>
+        <%= link_to "班级资源", course_files_path(activity.course), :class => "newsBlue ml15 color-grey-b" %>
       </div>
 
       <div class="homepagePostSubmitContainer fr" style="margin:0px">
diff --git a/app/views/users/_course_boardlist.html.erb b/app/views/users/_course_boardlist.html.erb
index 15f4bc394..aad722bf6 100644
--- a/app/views/users/_course_boardlist.html.erb
+++ b/app/views/users/_course_boardlist.html.erb
@@ -50,9 +50,9 @@
   <!--列表内容-->
   <% if @topics.count > 0 %>
     <% topics.each do |activity| %>
-      <div class="panel-inner-fourm" style="padding: 10px 20px;">
+      <div class="panel-inner-fourm" style="padding: 15px 20px;">
         <%= link_to image_tag(url_to_avatar(activity.author), :width => "60", :height => "60", :class => "panel-list-img mr15"), user_path(activity.author), :alt => "用户",:style => "width:60px;height:60px;display: block;" %>
-        <div class="panel-list-infobox clearfix ds">
+        <div class="panel-list-infobox clearfix ds pr pt5">
           <h6>
             <%= link_to activity.subject.to_s.html_safe, User.current.logged? ? board_message_path(activity.board_id, activity) : signin_url_without_domain, :class => "panel-list-title hide fl mt5" %>
           </h6>
@@ -61,7 +61,7 @@
           <% end %>
           <!--<span class="btn-cir btn-cir-red fl mt5 ml5">置顶</span></h6>-->
           <div class="cl"></div>
-          <p class="color-grey panel-lightgrey mt15 fl">
+          <p class="color-grey panel-lightgrey mt10 fl">
             <span class="mr50">
               <%= link_to activity.author.show_real_name, user_path(activity.author), :class => "panel-name-small hide fl mr15 color-grey" %>
               <span><%= time_from_now(activity.created_on) %></span>
@@ -72,12 +72,28 @@
                 <span class="mr10">最后回复<span class="ml10 mr10"><%= last_message.author.show_real_name %></span><%= time_from_now(last_message.created_on) %></span>
             <% end %>
           </p>
-          <p class="fr panel-lightgrey mt15">
+          <p class="fr panel-lightgrey mt10">
             <!--<span class="mr10"><i class="fa fa-eye color-grey  mr5 "></i>473</span>-->
             <span class="mr10"><i class="fa fa-eye color-grey mr5"></i><%= activity.visits %></span>
             <span class="mr10"><i class="fa fa-thumbs-up color-grey mr5"></i><%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %></span>
             <span class="mr10"><i class="fa fa-comments-o color-grey mr5"></i><%= count %></span>
           </p>
+
+          <div class="homepagePostSetting" style="right: 4px;top: 5px;">
+            <ul>
+              <li>
+                <i class="fa fa-bars color-grey-b"></i>
+                <ul class="homepagePostSettiongText">
+                  <li><a href="javascript:void(0)" class="postOptionLink">发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送</a></li>
+                  <li><a href="javascript:void(0)" class="postOptionLink" data-remote="true">置&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;顶</a></li>
+                  <li><a href="javascript:void(0)" class="postOptionLink" data-remote="true">编&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;辑</a></li>
+                  <li>
+                    <a href="javascript:void(0);" class="postOptionLink">删&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;除</a>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </div>
         </div>
       </div>
     <% end %>
diff --git a/app/views/users/_course_create.html.erb b/app/views/users/_course_create.html.erb
index 09d766cc5..32ff0bb3f 100644
--- a/app/views/users/_course_create.html.erb
+++ b/app/views/users/_course_create.html.erb
@@ -10,13 +10,13 @@
       </div>
       <div class="homepagePostTo break_word fl">
         <% if activity.try(:teacher).show_real_name == ' ' %>
-            <%= link_to activity.try(:teacher), user_path(activity.teacher), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:teacher), user_path(activity.teacher), :class => "newsBlue mr15 color-grey-b" %>
         <% else %>
-            <%= link_to activity.try(:teacher).show_real_name, user_path(activity.teacher), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:teacher).show_real_name, user_path(activity.teacher), :class => "newsBlue mr15 color-grey-b" %>
         <% end %>
         TO
         <% str = defined?(is_course) && is_course == 1 ? "班级" : "#{activity.name.to_s} | 班级" %>
-        <%= link_to str, course_path(activity.id,:host=>Setting.host_course), :class => "newsBlue ml15" %>
+        <%= link_to str, course_path(activity.id,:host=>Setting.host_course), :class => "newsBlue ml15 color-grey-b" %>
       </div>
 
       <div class="homepagePostDate fr">
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index c4ca5a807..52c77e5bc 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -26,12 +26,12 @@
       <div class="cl"></div>
 
       <div class="homepagePostTo break_word">
-        <%= link_to activity.user.show_real_name, user_path(activity.user,:host=>Setting.host_user), :class => "newsBlue mr15" %>
+        <%= link_to activity.user.show_real_name, user_path(activity.user,:host=>Setting.host_user), :class => "newsBlue mr15 color-grey-b" %>
          TO <!--+"(课程名称)" -->
         <% if hw_status == 3 || hw_status == 2 %>
-            <%= link_to "#{activity.homework_type_ch}作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course, :homework_type => activity.homework_type), :class => "newsBlue ml15"%>
+            <%= link_to "#{activity.homework_type_ch}作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course, :homework_type => activity.homework_type), :class => "newsBlue ml15 color-grey-b"%>
         <% else %>
-            <%= link_to activity.course.name.to_s+" | #{activity.homework_type_ch}作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course, :homework_type => activity.homework_type), :class => "newsBlue ml15"%>
+            <%= link_to activity.course.name.to_s+" | #{activity.homework_type_ch}作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course, :homework_type => activity.homework_type), :class => "newsBlue ml15 color-grey-b"%>
         <% end %>
       </div>
 
@@ -43,7 +43,7 @@
       <div class="homepagePostSubmitContainer">
         <%= render :partial => 'users/homework_opr', :locals => {:activity => activity, :is_teacher => is_teacher, :hw_status => hw_status, :user_activity_id => user_activity_id} %>
         <% if !activity.end_time.nil? %>
-        <div class="homepagePostDeadline fr">提交截止时间：<%= format_time activity.end_time %></div>
+        <div class="homepagePostDeadline fl mt3 color-grey3">提交截止时间：<%= format_time activity.end_time %></div>
         <% end %>
         <% if activity.homework_detail_manual.comment_status == 0  && !activity.publish_time.nil? %>
             <div class="homepagePostDeadline ml15">
diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb
index 1552093b3..5529c4b4d 100644
--- a/app/views/users/_course_journalsformessage.html.erb
+++ b/app/views/users/_course_journalsformessage.html.erb
@@ -6,11 +6,11 @@
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word">
-        <%= link_to activity.user.show_name, user_path(activity.user), :class => "newsBlue mr15" %>
+        <%= link_to activity.user.show_name, user_path(activity.user), :class => "newsBlue mr15 color-grey-b" %>
          TO
         <% course=Course.find(activity.jour_id) %>
         <% str = defined?(is_course) && is_course == 1 ? "班级留言" : "#{course.name.to_s} | 班级留言" %>
-        <%= link_to str, course_feedback_path(course), :class => "newsBlue ml15" %>
+        <%= link_to str, course_feedback_path(course), :class => "newsBlue ml15 color-grey-b" %>
       </div>
       <!--<div class="homepagePostTitle break_word list_style upload_img">
         <%# if activity.parent %>
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index fc95d3ece..f426ec105 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -13,17 +13,17 @@
         <% end %>
       </div>
       <% if activity.sticky == 1 %>
-          <span class="sticky_btn_cir ml10">置顶</span>
+          <span class="sticky_btn_cir ml10 fl mt3">置顶</span>
       <% end%>
       <% if activity.locked %>
           <span class="locked_btn_cir ml10 fl" title="已锁定">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
       <% end %>
       <div class="cl"></div>
       <div class="homepagePostTo break_word fl">
-        <%= link_to activity.author.show_real_name, user_path(activity.author, :host=>Setting.host_user), :class => "newsBlue mr15" %>
+        <%= link_to activity.author.show_real_name, user_path(activity.author, :host=>Setting.host_user), :class => "newsBlue mr15 color-grey-b" %>
         TO
         <% str = is_course == 1 ? "#{activity.board.parent.nil? ? '班级讨论区' : activity.board.name}" : activity.course.name.to_s+" | #{activity.board.parent.nil? ? '班级讨论区' : activity.board.name}" %>
-        <%= link_to str, course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue ml15"%>
+        <%= link_to str, course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue ml15 color-grey-b"%>
 
       </div>
       <!--<div class="homepagePostDate fl">
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index 478c3b166..a4682c79f 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -6,10 +6,10 @@
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word">
-         <%= link_to activity.author.show_name, user_path(activity.author), :class => "newsBlue mr15" %>
+         <%= link_to activity.author.show_name, user_path(activity.author), :class => "newsBlue mr15color-grey-b" %>
          TO  <!--+"(课程名称)"-->
         <% str = defined?(is_course) && is_course == 1 ? "班级通知" : "#{activity.course.name.to_s} | 班级通知" %>
-        <%= link_to str, course_news_index_path(activity.course), :class => "newsBlue ml15" %>
+        <%= link_to str, course_news_index_path(activity.course), :class => "newsBlue ml15color-grey-b" %>
       </div>
       <div class="homepagePostTitle break_word hidden fl m_w600"> <!--+"(通知标题)"-->
         <%= link_to activity.title.to_s, news_path(activity), :class => "postGrey" %>
diff --git a/app/views/users/_course_poll.html.erb b/app/views/users/_course_poll.html.erb
index 56aa2fd48..8b7e495d1 100644
--- a/app/views/users/_course_poll.html.erb
+++ b/app/views/users/_course_poll.html.erb
@@ -11,14 +11,14 @@
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word">
         <% if activity.try(:user).try(:realname) == ' ' %>
-            <%= link_to activity.try(:user), user_path(activity.user), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:user), user_path(activity.user), :class => "newsBlue mr15 color-grey-b" %>
         <% else %>
-            <%= link_to activity.try(:user).try(:realname), user_path(activity.user), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:user).try(:realname), user_path(activity.user), :class => "newsBlue mr15 color-grey-b" %>
         <% end %>
         TO
         <% course = Course.find(activity.polls_group_id) %>
         <% str = defined?(is_course) && is_course == 1 ? "班级问卷" : "#{course.name.to_s} | 班级问卷" %>
-        <%= link_to str, poll_index_path(:polls_type => "Course", :polls_group_id => activity.polls_group_id), :class => "newsBlue ml15" %>
+        <%= link_to str, poll_index_path(:polls_type => "Course", :polls_group_id => activity.polls_group_id), :class => "newsBlue ml15 color-grey-b" %>
         <!--<a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a>-->
       </div>
       <div class="homepagePostTitle break_word" >
diff --git a/app/views/users/_homework_base_info.html.erb b/app/views/users/_homework_base_info.html.erb
index 20f848480..9e3606c92 100644
--- a/app/views/users/_homework_base_info.html.erb
+++ b/app/views/users/_homework_base_info.html.erb
@@ -1,4 +1,4 @@
-<div class="mt10">
+<div class="mt20 clearfix">
   <div class="homepagePostDeadline">
     迟交扣分：<%= activity.late_penalty%>分
   </div>
@@ -9,7 +9,7 @@
   <% end %>
 </div>
 <div class="cl"></div>
-<div>
+<div class="clearfix">
   <% if activity.anonymous_comment == 0%>
       <div class="homepagePostDeadline">
         缺评扣分：<%= activity.homework_detail_manual.absence_penalty%>分/作品
@@ -22,7 +22,7 @@
 <div class="cl"></div>
 <% if activity.student_works.has_committed.count != 0 %>
     <% sw = activity.student_works.has_committed.reorder("commit_time desc").first %>
-    <div class="mt10 homepagePostDeadline">
+    <div class="mt20 homepagePostDeadline color-grey">
       #&nbsp;<%=time_from_now sw.commit_time %><%= link_to sw.user.show_real_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品
     </div>
     <div class="cl"></div>
@@ -31,7 +31,7 @@
     <% student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id} and score is not null").reorder("created_at desc") %>
     <% unless student_work_scores.empty?  %>
         <% last_score = student_work_scores.first %>
-        <div class="mt10">
+        <div class="mt3 mb10">
           <p class="fontGrey2">
             #&nbsp;<%=time_from_now last_score.created_at %><%= link_to last_score.reviewer_role == 3 && !is_teacher ? '学生匿名' : last_score.user.show_real_name, last_score.reviewer_role == 3 && !is_teacher ? "javascript:void(0)" : user_activities_path(last_score.user_id), :class => "newsBlue ml5 mr5"%>评阅了作品，优秀排行：
           </p>
@@ -55,7 +55,7 @@
               <% end %>
             </a>
             <% score = sw.respond_to?("score") ? sw.score : sw.work_score %>
-            <p class="fontGrey2">分数：<span class="c_red"><%=format("%.1f",score.to_f < 0 ? 0 : score.to_f) %>分</span></p>
+            <p class="fontGrey2"><span class="c_red"><%=format("%.1f",score.to_f < 0 ? 0 : score.to_f) %>分</span></p>
           </div>
       <% end %>
       <% if student_works.count == 7 %>
@@ -87,7 +87,7 @@
     <% comment_status = activity.homework_detail_manual.comment_status %>
     <div class="homepagePostSetting">
       <ul>
-        <li class="homepagePostSettingIcon"><i class="fa fa-bars color-grey9"></i>
+        <li class="homepagePostSettingIcon"><i class="fa fa-bars color-grey-b"></i>
           <ul class="whomepagePostSettiongText">
             <% if activity.homework_type != 4 %>
             <li>
diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css
index 5c52d96cf..c9ea7e8d7 100644
--- a/public/stylesheets/css/edu-common.css
+++ b/public/stylesheets/css/edu-common.css
@@ -64,7 +64,7 @@ a.color-grey:hover{color: #FF7500!important;}/*a标签，移入变橙色*/
 .color-light-grey-C{color: #CCCCCC!important;}
 .color-light-grey-E{color: #EEEEEE}
 .color-grey-bf{color:#bfbfbf!important;}
-.color-grey-bc{color:#bcbcbc;}
+.color-grey-b{color:#bbbbbb!important;}
 
 .-text-danger{ color:#FF6545 }
 .color_white{ color:#fff!important;}
diff --git a/public/stylesheets/css/structure.css b/public/stylesheets/css/structure.css
index 3658fa9ab..5340bc4ff 100644
--- a/public/stylesheets/css/structure.css
+++ b/public/stylesheets/css/structure.css
@@ -184,20 +184,21 @@ a.postTypeGrey:hover {color:#3b94d6;}
 .homepagePostBrief {width:965px; margin:0px auto; position:relative;}
 .eduHomepagePostBrief {width:1200px; margin:0px auto; position:relative;}
 .homepagePostPortrait {float:left; width:50px;}
+.homepagePostPortrait img{float: left;margin-top: 5px}
 .homepagePostDes {float:left; width:890px; margin-left:15px; }
 .eduHomepagePostDes {float:left; width:92%; margin-left:15px; }
-.homepagePostTo {font-size:14px; color:#484848; margin-bottom:5px; margin-right: 20px;}
-.homepagePostTitle {font-size:14px; color:#484848; margin-bottom:5px; font-weight:bold;}
-.homepagePostSubmitContainer {height:25px; margin-top: 8px; margin-bottom: 5px;}
-.homepagePostSubmit {font-size:14px; color:#888888; border:1px solid #dddddd; background-color:#eaeaea; float:left; margin-right:20px; padding:0px 10px;}
-.homepagePostSubmit:hover {background-color:#d8d8d8;}
+.homepagePostTo {font-size:14px; color:#bbbbbb; margin-bottom:12px; margin-right: 20px;}
+.homepagePostTitle {font-size:16px; color:#484848;}
+.homepagePostSubmitContainer {height:25px; margin-top: 8px; margin-bottom: 25px;}
+.homepagePostSubmit {font-size:14px; color:#fff!important; border:1px solid #FF7500; background-color:#FF7500; float:left; margin-right:15px; padding:0px 10px;}
+/*.homepagePostSubmit:hover {background-color:#d8d8d8;}*/
 .homepagePostIntro {font-size:14px; color:#484848;overflow:hidden;}
 .homepagePostIntro ol li{list-style-type: decimal;margin-left: 40px;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #136ec2;}
 .homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important;}
-.homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
+.homepagePostDeadline {font-size:12px; color:#333; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReply {width:965px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;}
 .eduHomepagePostReply {width:1200px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;}

From a7034d7c95459d5828e1820cbfb183093957e9d8 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 20 Sep 2017 14:34:59 +0800
Subject: [PATCH 14/30] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E6=9F=A5=E7=9C=8B=E4=BB=96=E4=BA=BA=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E6=97=B6=EF=BC=8C=E6=98=BE=E7=A4=BA=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=89=80=E6=9C=89=E7=9A=84=E5=AE=9E=E8=AE=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index e9078ba63..8ada7be35 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2066,14 +2066,16 @@ class UsersController < ApplicationController
     @user_fanlist_count = fan_query.count()
     @user_fanlist = fan_query.order("#{Watcher.table_name}.id desc").limit(12)
 
+    show_all = @user == User.current || User.current.admin?
+
     # 我创建的实训数
-    @create_num = (@user == User.current ? Shixun.where(:user_id => @user).count : Shixun.where(:user_id => @user).visible.count)
+    @create_num = (show_all ? Shixun.where(:user_id => @user).count : Shixun.where(:user_id => @user).visible.count)
     # 我合作的实训数
     coop_id = Shixun.find_by_sql("select shixun_id from shixun_members where user_id=#{@user.id} and role = 2").map(&:shixun_id)   # 合作者的实训id
-    @cooperative_num = (@user == User.current ? Shixun.where(:id => coop_id).count : Shixun.where(:id => coop_id).visible.count)
+    @cooperative_num = (show_all ? Shixun.where(:id => coop_id).count : Shixun.where(:id => coop_id).visible.count)
     # 我挑战的实训数
     ch_id = Shixun.find_by_sql("select id from shixuns where id in (select shixun_id from myshixuns where user_id = #{@user.id})")
-    @challenge_num = (@user == User.current ? Shixun.where(:id => ch_id).count : Shixun.where(:id => ch_id).visible.count)
+    @challenge_num = (show_all ? Shixun.where(:id => ch_id).count : Shixun.where(:id => ch_id).visible.count)
     # 我的所有课程数
     @all_courses_count = @user.courses.not_deleted_not_end.count
     # 我创建的课程数
@@ -2089,7 +2091,7 @@ class UsersController < ApplicationController
     ids2 = ids2.map{|shixun| shixun.id} unless ids2.blank?
     id = ids + ids2
     id = id.uniq
-    if @user == User.current
+    if show_all
       @shixuns = Shixun.where(:id => id).order("updated_at desc")
     else
       @shixuns = Shixun.where(:status => [2, 3], :id => id).order("updated_at desc")
@@ -2251,13 +2253,13 @@ class UsersController < ApplicationController
       if params[:filter] == "challenge"
         # 已挑战过
         id = Shixun.find_by_sql("select id from shixuns where id in (select shixun_id from myshixuns where user_id = #{@user.id})")
-        if @user == User.current
+        if @user == User.current || User.current.admin?
           @shixuns = Shixun.where(:id => id).order("updated_at desc")
         else
           @shixuns = Shixun.where(:id => id).visible.order("updated_at desc")
         end
       elsif params[:filter] == "create"
-        if @user == User.current
+        if @user == User.current || User.current.admin?
           @shixuns = Shixun.where(:user_id => @user).order("updated_at desc")
         else
           @shixuns = Shixun.where(:user_id => @user).visible.order("updated_at desc")
@@ -2265,7 +2267,7 @@ class UsersController < ApplicationController
       elsif  params[:filter] == "cooperative"
         # 合作者的实训id
         id = Shixun.find_by_sql("select shixun_id from shixun_members where user_id=#{@user.id} and role = 2").map(&:shixun_id)
-        if @user == User.current
+        if @user == User.current || User.current.admin?
           @shixuns = Shixun.where(:id => id).order("updated_at desc")
         else
           @shixuns = Shixun.where(:id => id).visible.order("updated_at desc")
@@ -2279,7 +2281,7 @@ class UsersController < ApplicationController
         ids2 = ids2.map{|shixun| shixun.id} unless ids2.blank?
         id = ids + ids2
         id = id.uniq
-        if @user == User.current
+        if @user == User.current || User.current.admin?
           @shixuns = Shixun.where(:id => id).order("updated_at desc")
         else
           @shixuns = Shixun.where(:id => id).visible.order("updated_at desc")

From ee65fd18fb3bc785855dcf2cbdbb3728c575c2a6 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 20 Sep 2017 17:16:11 +0800
Subject: [PATCH 15/30] =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=A2=98=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E9=80=9A=E8=BF=87=E5=90=8E=EF=BC=8C=E9=81=AE=E7=BD=A9?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/challenges/index.html.erb      |   2 +-
 app/views/games/_pass_game_show.html.erb |  28 +++++++++++++++++++++++
 public/images/task/task-su-btn-jie.png   | Bin 0 -> 11781 bytes
 public/stylesheets/css/edu-popup.css     |   8 +++----
 4 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 public/images/task/task-su-btn-jie.png

diff --git a/app/views/challenges/index.html.erb b/app/views/challenges/index.html.erb
index d71baa9c9..d877ea5bf 100644
--- a/app/views/challenges/index.html.erb
+++ b/app/views/challenges/index.html.erb
@@ -38,8 +38,8 @@
   <div id="challenge_list">
     <%= render :partial => "content_list" %>
   </div>
-
 </div>
+
 <script type="text/javascript">
     $(document).ready(function() {
         /* -------------- 简介Md -------------------- */
diff --git a/app/views/games/_pass_game_show.html.erb b/app/views/games/_pass_game_show.html.erb
index ef9d9a815..f917e2412 100644
--- a/app/views/games/_pass_game_show.html.erb
+++ b/app/views/games/_pass_game_show.html.erb
@@ -13,6 +13,34 @@
     </div>
   </div>
 </div>
+
+<% if false %>
+<div class="task-popup-warp" style="background-color: rgba(0,0,0,0.7);top: 0px;left: 0px;">
+  <div class="task-popup-box <%= had_done == 0 ? "task-box1" : "task-box2" %>">
+    <a href="javascript:void(0)" class="task-popup-close" onclick="refresh_game_list();"></a>
+
+    <% if had_done == 0 %>
+        <div class="task-su-con">
+          <p class="task-su-p">恭喜您通过本关</p>
+          <p class="mt8"><i class="fa fa-check-circle color-light-green mr5"></i>本题正确：<span class="color-orange03">&nbsp;3&nbsp;</span>道</p>
+          <p><i class="fa fa-exclamation-circle color-orange mr5"></i>本题错误：<span class="color-orange03">&nbsp;2&nbsp;</span>道</p>
+        </div>
+    <% else %>
+        <div class="task-su-con" style="position: absolute;width: 100%;z-index:3;padding-top: 63px;">
+          <img src="/images/task/task-success02.png"/>
+          <a href="<%= myshixun_game_path(myshixun, :index => 1) %>" class="task-su-btn-white mt30" onclick="hideModal();" data-remote="true">查看光辉历史</a>
+        </div>
+        <div style="text-align:center;background-color: #fff;border-radius: 0px 0px 8px 8px;width: 200px;position:absolute;z-index:2;height:100px;bottom:-30px;left:50%;margin-left:-100px;">
+          <p class="mt25"><i class="fa fa-check-circle color-light-green mr5"></i>本题正确：<span class="color-orange03">&nbsp;3&nbsp;</span>道</p>
+          <p><i class="fa fa-exclamation-circle color-orange mr5"></i>本题错误：<span class="color-orange03">&nbsp;2&nbsp;</span>道</p>
+        </div>
+    <% end %>
+  </div>
+  <% if had_done == 0 %>
+    <%= link_to "下 一 关", {:controller => 'games', :action => "next_step", :id => game, :myshixun_id => myshixun}, :class => "task-su-btn", :onclick => "hideModal();", :remote => true %>
+  <% end %>
+</div>
+<% end %>
 <script>
   function refresh_game_list(){
       $.ajax({
diff --git a/public/images/task/task-su-btn-jie.png b/public/images/task/task-su-btn-jie.png
new file mode 100644
index 0000000000000000000000000000000000000000..11dc7995fd8bec3bead686f5039b664dfc128f38
GIT binary patch
literal 11781
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
LlqIXhjRXG=z36D{

literal 0
HcmV?d00001

diff --git a/public/stylesheets/css/edu-popup.css b/public/stylesheets/css/edu-popup.css
index 022e114e7..6dd7ca7eb 100644
--- a/public/stylesheets/css/edu-popup.css
+++ b/public/stylesheets/css/edu-popup.css
@@ -11,15 +11,15 @@
 
 /************实训弹窗****************/
 .task-popup-warp{ width: 100%; height:100%; background:black; position:fixed;}
-.task-popup-box{  position: relative; margin:150px auto; }
+.task-popup-box{  position: relative; margin:150px auto 0px; }
 .task-box1{ width:428px; height:420px;background:url(/images/task/task-success.png) 0px 0px no-repeat;}
-.task-box2{ width:496px; height:373px;background:url(/images/task/task-success02.png) 0px 50px no-repeat;}
+.task-box2{ width:496px; height:373px;position: relative;}/*background:url(/images/task/task-success02.png) 0px 50px no-repeat;*/
 a.task-popup-close{ display: block; background:url(/images/task/task-close.png) 0px 0px no-repeat; width: 31px; height: 31px; position:absolute; right:5px; top:100px;}
 a:hover.task-popup-close{background:url(/images/task/task-close.png) -40px 0px no-repeat; }
 .task-su-con{  text-align: center; padding-top:285px;}
 .task-su-p{ font-size: 20px; color:#ee4a1f; font-weight: bold;}
-a.task-su-btn{display: block;background:url(/images/task/task-su-btn.png) 0px -64px no-repeat; width: 138px; height: 57px;color:#ee4a1f; line-height: 50px; text-align: center; font-size: 16px; margin:20px auto;}
-a:hover.task-su-btn{background:url(/images/task/task-su-btn.png) 0px 0px no-repeat; }
+a.task-su-btn{display: block;background:url(/images/task/task-su-btn-jie.png) 0px -64px no-repeat; width: 138px; height: 53px;color:#ee4a1f; line-height: 50px; text-align: center; font-size: 16px; margin:20px auto;}
+a:hover.task-su-btn{background:url(/images/task/task-su-btn-jie.png) 0px 0px no-repeat;height: 53px;}
 a.task-su-btn-white{ display: inline-block; padding:8px 25px; border:1px solid #fff; color:#fff; text-align: center; border-radius:5px; font-size:14px;}
 a:hover.task-su-btn-white{ color: #ee4a1f;  border:1px solid #ee4a1f; }
 

From cefc5edbfe5c7d741990f24fb63342b36213885c Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 21 Sep 2017 11:07:44 +0800
Subject: [PATCH 16/30] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E7=9A=84=E7=AE=80=E4=BB=8B=E3=80=81=E5=AD=A6=E4=B9=A0=E9=A1=BB?=
 =?UTF-8?q?=E7=9F=A5=EF=BC=8C=E8=AF=B7=E6=94=B9=E4=B8=BA=20ke=20=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=99=A8=EF=BC=8C=E9=9C=80=E8=A6=81=E6=8F=92=E5=85=A5?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/owner_type_helper.rb       |  1 +
 app/views/boards/_course_new.html.erb  |  6 +--
 app/views/subjects/edit.html.erb       | 60 ++++++++++++++++++++------
 app/views/subjects/new.html.erb        | 59 ++++++++++++++++++++++---
 public/assets/kindeditor/kindeditor.js | 19 ++++++--
 public/javascripts/application.js      | 18 +++-----
 public/javascripts/edu/base_edu.js     | 12 ++++--
 7 files changed, 136 insertions(+), 39 deletions(-)

diff --git a/app/helpers/owner_type_helper.rb b/app/helpers/owner_type_helper.rb
index 9124a4f98..3239d9d8e 100644
--- a/app/helpers/owner_type_helper.rb
+++ b/app/helpers/owner_type_helper.rb
@@ -15,4 +15,5 @@ module OwnerTypeHelper
   HOMEWORKREFERENCEANSWER = 14
   STUDENTWORK = 15
   HOMEWORKBANK = 16
+  SUBJECT = 17
 end
\ No newline at end of file
diff --git a/app/views/boards/_course_new.html.erb b/app/views/boards/_course_new.html.erb
index 56014f062..91bb5c852 100644
--- a/app/views/boards/_course_new.html.erb
+++ b/app/views/boards/_course_new.html.erb
@@ -87,7 +87,7 @@
                 //paramsHeight = params.kindutil.removeUnit(this.height);
                 edit.iframe.height(150);
                 this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight) , 150));
-                elocalStorage(message_content_editor,'topic_course_<%=course.id %>');
+                elocalStorage(message_content_editor,'topic_course_<%=course.id %>','des');
             }
         }).loadPlugin('paste');
         return editor;
@@ -154,8 +154,8 @@
           <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='topic_textarea' name="message[content]"><%=topic.content %></textarea>
           <div class="cl"></div>
           <p id="message_content_span"></p>
-          <p id="e_tip" class="c_grey"></p>
-          <p id="e_tips" class="c_grey"></p>
+          <p id="e_tip_des" class="c_grey"></p>
+          <p id="e_tips_des" class="c_grey"></p>
         </div>
         <div class="cl"></div>
         <div class="mt10">
diff --git a/app/views/subjects/edit.html.erb b/app/views/subjects/edit.html.erb
index 73967296e..0f8baf4e9 100644
--- a/app/views/subjects/edit.html.erb
+++ b/app/views/subjects/edit.html.erb
@@ -1,3 +1,6 @@
+<% content_for :header_tags do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
 <div class="active-class ">
   <p style="line-height: 42px;">
     <i class="fa fa-map-marker mr5 color-grey"></i>
@@ -22,18 +25,51 @@
           <!--<div class="cl"></div>-->
           <!--<span class="color-orange ml20 fl none" style="margin-left: 12%;" id="new_subject_intro_notice"><i class="fa fa-exclamation-circle mr5" ></i>请输入描述</span>-->
         <!--</li>-->
-        <li class="clearfix pt20">
-          <label class="panel-form-label label fl"><span class="color-orange">*</span>&nbsp;简介</label>
-          <textarea name="subject[description]" id="new_subject_description" class="task task-height-220 panel-box-sizing task-form-70 fl color-grey ml20"><%= @subject.description %></textarea>
-          <div class="cl"></div>
-          <span class="color-orange ml20 fl none" style="margin-left: 12%;" id="new_subject_description_notice"><i class="fa fa-exclamation-circle mr5" ></i>请输入简介</span>
-        </li>
-        <li class="clearfix pt20">
-          <label class="panel-form-label label fl"><span class="color-orange">*</span>&nbsp;学习须知</label>
-          <textarea type="text" name="subject[learning_notes]" id="new_learning_notes" class="task task-height-220 panel-box-sizing task-form-70 fl color-grey ml20" placeholder=""><%= @subject.learning_notes %></textarea>
-          <div class="cl"></div>
-          <span class="color-orange ml20 fl none" style="margin-left: 12%;" id="new_learning_notes_notice"><i class="fa fa-exclamation-circle mr5" ></i>请输入学习须知</span>
-        </li>
+          <li class="clearfix pt20">
+            <label class="panel-form-label label fl mr20"><span class="color-orange">*</span>简介</label>
+            <%= hidden_field_tag :asset_id, params[:asset_id], :required => false, :style => 'display:none' %>
+            <textarea class="panel-form-width-690 panel-form-height-150 fl panel-box-sizing" style="display: none"></textarea>
+            <%= f.kindeditor :description, :editor_id => 'subject_description_editor',
+                             :owner_id => @subject.nil? ? 0: @subject.id,
+                             :owner_type => OwnerTypeHelper::SUBJECT,
+                             :local_storage_mdu => "subject_description_#{User.current.id}_#{@subject.id}",
+                             :local_storage_id => "desc",
+                             :width => '80%',
+                             :height => 200,
+                             :minHeight=>200,
+                             :placeholder => "请在此输入实训路径的简介",
+                             :class => 'talk_text fl',
+                             :input_html => { :id => 'new_subject_description',
+                                              :class => 'talk_text fl',
+                                              :maxlength => 5000 }
+            %>
+            <div class="cl"></div>
+            <p id="e_tip_desc" style="margin-left: 140px" class="c_grey"></p>
+            <p id="e_tips_desc" style="margin-left: 140px" class="c_grey"></p>
+            <span class="color-orange ml20 fl none" style="margin-left: 12%;" id="new_subject_description_notice"><i class="fa fa-exclamation-circle mr5" ></i>请输入简介</span>
+          </li>
+          <li class="clearfix pt20">
+            <label class="panel-form-label label fl mr20"><span class="color-orange">*</span>&nbsp;学习须知</label>
+            <textarea class="panel-form-width-690 panel-form-height-150 fl panel-box-sizing" style="display: none"></textarea>
+            <%= f.kindeditor :learning_notes, :editor_id => 'subject_learning_notes_editor',
+                             :owner_id => @subject.nil? ? 0: @subject.id,
+                             :owner_type => OwnerTypeHelper::SUBJECT,
+                             :local_storage_mdu => "subject_notes_#{User.current.id}_#{@subject.id}",
+                             :local_storage_id => "notes",
+                             :width => '80%',
+                             :height => 200,
+                             :minHeight=>200,
+                             :placeholder => "请在此输入实训路径的学习须知",
+                             :class => 'talk_text fl',
+                             :input_html => { :id => 'new_learning_notes',
+                                              :class => 'talk_text fl',
+                                              :maxlength => 5000 }
+            %>
+            <div class="cl"></div>
+            <p id="e_tip_notes" style="margin-left: 140px" class="c_grey"></p>
+            <p id="e_tips_notes" style="margin-left: 140px" class="c_grey"></p>
+            <span class="color-orange ml20 fl none" style="margin-left: 12%;" id="new_learning_notes_notice"><i class="fa fa-exclamation-circle mr5" ></i>请输入学习须知</span>
+          </li>
         <li class="clearfix pt20 pb20">
           <label class="panel-form-label label fl">&nbsp;</label>
           <%= link_to "取消", subject_path(@subject), :class => "task-btn fl mr10 ml20" %>
diff --git a/app/views/subjects/new.html.erb b/app/views/subjects/new.html.erb
index 6e2fd1f6f..3af64e227 100644
--- a/app/views/subjects/new.html.erb
+++ b/app/views/subjects/new.html.erb
@@ -1,3 +1,6 @@
+<% content_for :header_tags do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
 <div class="active-class ">
   <p style="line-height: 42px;">
     <i class="fa fa-map-marker mr5 color-grey"></i>
@@ -23,15 +26,48 @@
           <!--<span class="color-orange ml20 fl none" style="margin-left: 12%;" id="new_subject_intro_notice"><i class="fa fa-exclamation-circle mr5" ></i>请输入描述</span>-->
         <!--</li>-->
         <li class="clearfix pt20">
-          <label class="panel-form-label label fl"><span class="color-orange">*</span>简介</label>
-          <textarea name="subject[description]" id="new_subject_description" class="task task-height-220 panel-box-sizing task-form-80 fl color-grey ml20"></textarea>
+          <label class="panel-form-label label fl mr20"><span class="color-orange">*</span>简介</label>
+          <%= hidden_field_tag :asset_id, params[:asset_id], :required => false, :style => 'display:none' %>
+          <textarea class="panel-form-width-690 panel-form-height-150 fl panel-box-sizing" style="display: none"></textarea>
+          <%= f.kindeditor :description, :editor_id => 'subject_description_editor',
+                           :owner_id => @subject.nil? ? 0: @subject.id,
+                           :owner_type => OwnerTypeHelper::SUBJECT,
+                           :local_storage_mdu => "subject_description_#{User.current.id}",
+                           :local_storage_id => "desc",
+                           :width => '80%',
+                           :height => 200,
+                           :minHeight=>200,
+                           :placeholder => "请在此输入实训路径的简介",
+                           :class => 'talk_text fl',
+                           :input_html => { :id => 'new_subject_description',
+                                            :class => 'talk_text fl',
+                                            :maxlength => 5000 }
+          %>
           <div class="cl"></div>
+          <p id="e_tip_desc" style="margin-left: 140px" class="c_grey"></p>
+          <p id="e_tips_desc" style="margin-left: 140px" class="c_grey"></p>
           <span class="color-orange ml20 fl none" style="margin-left: 12%;" id="new_subject_description_notice"><i class="fa fa-exclamation-circle mr5" ></i>请输入简介</span>
         </li>
         <li class="clearfix pt20">
-          <label class="panel-form-label label fl"><span class="color-orange">*</span>&nbsp;学习须知</label>
-          <textarea type="text" name="subject[learning_notes]" id="new_learning_notes" class="task task-height-220 panel-box-sizing task-form-70 fl color-grey ml20" placeholder=""></textarea>
+          <label class="panel-form-label label fl mr20"><span class="color-orange">*</span>&nbsp;学习须知</label>
+          <textarea class="panel-form-width-690 panel-form-height-150 fl panel-box-sizing" style="display: none"></textarea>
+          <%= f.kindeditor :learning_notes, :editor_id => 'subject_learning_notes_editor',
+                           :owner_id => @subject.nil? ? 0: @subject.id,
+                           :owner_type => OwnerTypeHelper::SUBJECT,
+                           :local_storage_mdu => "subject_notes_#{User.current.id}",
+                           :local_storage_id => "notes",
+                           :width => '80%',
+                           :height => 200,
+                           :minHeight=>200,
+                           :placeholder => "请在此输入实训路径的学习须知",
+                           :class => 'talk_text fl',
+                           :input_html => { :id => 'new_learning_notes',
+                                            :class => 'talk_text fl',
+                                            :maxlength => 5000 }
+          %>
           <div class="cl"></div>
+          <p id="e_tip_notes" style="margin-left: 140px" class="c_grey"></p>
+          <p id="e_tips_notes" style="margin-left: 140px" class="c_grey"></p>
           <span class="color-orange ml20 fl none" style="margin-left: 12%;" id="new_learning_notes_notice"><i class="fa fa-exclamation-circle mr5" ></i>请输入学习须知</span>
         </li>
         <!--<li class="clearfix pt20">
@@ -46,4 +82,17 @@
     <% end %>
   </div>
   </div>
-  </div>
\ No newline at end of file
+  </div>
+
+<script>
+    function rec_data(k,mdu,id){
+        if(window.sessionStorage.getItem(k+mdu) !== null){
+            if(id == "desc"){
+                subject_description_editor.html(window.sessionStorage.getItem(k+mdu));
+            } else{
+                subject_learning_notes_editor.html(window.sessionStorage.getItem(k+mdu));
+            }
+            clear_data(k,mdu,id);
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index c5f8cf99f..f1fa69302 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -237,6 +237,8 @@ function _getBasePath() {
 K.basePath = _getBasePath();
 K.options = {
     placeholder : '',
+    local_storage_mdu : '',
+    local_storage_id : '',
 	designMode : true,
 	fullscreenMode : false,
 	filterMode : true,
@@ -4784,7 +4786,7 @@ function _bindTabEvent() {
 function _bindFocusEvent() {
 	var self = this;
 	K(self.edit.textarea[0], self.edit.win).focus(function(e) {
-        if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*[\uFF1A][\u4e00-\u9fa5]*[\uFF0C][\u4e00-\u9fa5]*[\uFF0C][\u4e00-\u9fa5]*[\uFF0C][\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(self.edit.html())){
+        if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*[\，]*[\u4e00-\u9fa5]*[\。]*<\/\w*\>\s*$/.test(self.edit.html())){
             self.edit.html('');
         }
 		if(typeof self.options.enable_at === 'function'){
@@ -4795,7 +4797,10 @@ function _bindFocusEvent() {
 		}
 	}).blur(function(e) {
         if(self.isEmpty()) {
-            self.edit.html(self.placeholder);
+            if (self.placeholder != "") {
+                self.edit.html("<span id='hint' style='color:#999999;font-size:12px;'>" + self.placeholder + "</span>");
+            }
+           // self.edit.html(self.placeholder);
            // self.edit.html("<span id='hint' style='color:#999999;font-size:12px;'>" + self.placeholder + "</span>");
         }
 		if (self.afterBlur) {
@@ -5184,7 +5189,8 @@ KEditor.prototype = {
                 if (self.placeholder != "" && self.edit.html() == "") {
                     self.edit.html("<span id='hint' style='color:#999999;font-size:12px;'>" + self.placeholder + "</span>");
                 }
-			}
+                elocalStorage(self, self.local_storage_mdu, self.local_storage_id);
+            }
 		});
 		//statusbar.removeClass('statusbar').addClass('ke-statusbar')
 		//	.append('<span class="ke-inline-block ke-statusbar-center-icon"></span>');
@@ -5323,7 +5329,12 @@ KEditor.prototype = {
 		}
 	},
 	isEmpty : function() {
-		return _trim(this.text().replace(/\r\n|\n|\r/, '')) === '';
+        var self = this;
+        if(self.placeholder == ""){
+            return _trim(this.text().replace(/\r\n|\n|\r/, '')) === '';
+        } else{
+            return (_trim(this.text().replace(/\r\n|\n|\r/, '')) === '' || /^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*[\，]*[\u4e00-\u9fa5]*[\。]*<\/\w*\>\s*$/.test(self.edit.html()));
+        }
 	},
 	isDirty : function() {
 		return _trim(this.initContent.replace(/\r\n|\n|\r|t/g, '')) !== _trim(this.html().replace(/\r\n|\n|\r|t/g, ''));
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 76362007e..a02dc5c0d 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1540,13 +1540,8 @@ function elocalStorage(editor,mdu,id){
         editor2 = editor;
         var oc = window.sessionStorage.getItem('content'+mdu);
         if(oc !== null ){
-            if(arguments[2]){
-                var h = '您上次有已保存的数据，是否<a style="cursor: pointer;" onclick="rec_data(\'content\',\''+ mdu + '\',' + id + ')">恢复</a> ? / <a style="cursor: pointer;" onclick="clear_data(\'content\',\''+ mdu + '\',' + id + ')">不恢复</a>';
-                $("#e_tips_"+id).html(h);
-            }else{
-                var h = '您上次有已保存的数据，是否<a style="cursor: pointer;" onclick="rec_data(\'content\',\''+ mdu + '\')">恢复</a> ? / <a style="cursor: pointer;" onclick="clear_data(\'content\',\''+ mdu + '\')">不恢复</a>';
-                $("#e_tips").html(h);
-            }
+            var h = '您上次有已保存的数据，是否<a style="cursor: pointer;" class="color-orange05" onclick="rec_data(\'content\',\''+ mdu + '\',\'' + id + '\')">恢复</a> ? / <a style="cursor: pointer;" class="color-orange05" onclick="clear_data(\'content\',\''+ mdu + '\',\'' + id + '\')">不恢复</a>';
+            $("#e_tips_"+id).html(h);
         }
         setInterval(function() {
             d = new Date();
@@ -1559,8 +1554,9 @@ function elocalStorage(editor,mdu,id){
             editor.sync();
             if(!editor.isEmpty()){
                 add_data("content",mdu,editor.html());
-                var id1 = arguments[2] ? "#e_tip_"+id : "#e_tip";
-                var id2 = arguments[2] ? "#e_tips_"+id : "#e_tips";
+                var id1 = "#e_tip_"+id;
+                var id2 = "#e_tips_"+id;
+                console.log(id1 + h + ':' + m + ':' + s +" 保存   ");
                 $(id1).html(" 数据已于 " + h + ':' + m + ':' + s +" 保存   ");
                 $(id2).html("");
             }
@@ -1581,8 +1577,8 @@ function rec_data(k,mdu,id){
 }
 function clear_data(k,mdu,id){
     window.sessionStorage.removeItem(k+mdu);
-    var id1 = arguments[2] ? "#e_tip_"+id : "#e_tip";
-    var id2 = arguments[2] ? "#e_tips_"+id : "#e_tips";
+    var id1 = "#e_tip_"+id;
+    var id2 = "#e_tips_"+id;
     if(k == 'content'){
         $(id2).html("");
     }else{
diff --git a/public/javascripts/edu/base_edu.js b/public/javascripts/edu/base_edu.js
index 7c75ca389..d64210570 100644
--- a/public/javascripts/edu/base_edu.js
+++ b/public/javascripts/edu/base_edu.js
@@ -1094,19 +1094,21 @@ function submit_new_subject(){
     } else{
         $("#new_subject_name_notice").hide();
     }
-    if($("#new_subject_description").val().trim() == ""){
+    if(subject_description_editor.isEmpty()){
         check = false;
         $("#new_subject_description_notice").show();
     } else{
         $("#new_subject_description_notice").hide();
     }
-    if($("#new_learning_notes").val().trim() == ""){
+    if(subject_learning_notes_editor.isEmpty()){
         check = false;
         $("#new_learning_notes_notice").show();
     } else {
         $("#new_learning_notes_notice").hide();
     }
     if(check){
+        subject_description_editor.sync();
+        subject_learning_notes_editor.sync();
         $("#new_subject").submit();
     }
 }
@@ -1119,19 +1121,21 @@ function submit_edit_subject(id){
     } else{
         $("#new_subject_name_notice").hide();
     }
-    if($("#new_subject_description").val().trim() == ""){
+    if(subject_description_editor.isEmpty()){
         check = false;
         $("#new_subject_description_notice").show();
     } else{
         $("#new_subject_description_notice").hide();
     }
-    if($("#new_learning_notes").val().trim() == ""){
+    if(subject_learning_notes_editor.isEmpty()){
         check = false;
         $("#new_learning_notes_notice").show();
     } else {
         $("#new_learning_notes_notice").hide();
     }
     if(check){
+        subject_description_editor.sync();
+        subject_learning_notes_editor.sync();
         $("#edit_subject_"+id).submit();
     }
 }
\ No newline at end of file

From b5c7c5a8d8bcb5997a946b163451bcafd49e8d12 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 21 Sep 2017 11:19:44 +0800
Subject: [PATCH 17/30] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F=E3=80=81=E6=95=99=E5=B8=88=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=8F=AA=E6=B7=BB=E5=8A=A0=E4=B8=8E=E4=B8=BB=E8=AE=B2=E4=BA=BA?=
 =?UTF-8?q?=E6=89=80=E5=9C=A8=E5=8D=95=E4=BD=8D=E4=B8=80=E8=87=B4=E7=9A=84?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/student_work_helper.rb                     |  4 ++--
 app/views/courses/settings/_add_students.html.erb      | 10 ++++++++--
 app/views/courses/settings/_add_teachers.html.erb      |  7 ++++++-
 .../student_work/_evaluation_un_common_work.html.erb   |  4 ++--
 .../student_work/_evaluation_un_group_work.html.erb    |  2 +-
 .../student_work/_evaluation_un_pro_work.html.erb      |  2 +-
 .../student_work/_evaluation_un_shixun_work.html.erb   |  2 +-
 app/views/student_work/show.html.erb                   |  2 +-
 app/views/users/_homework_opr.html.erb                 | 10 +++++-----
 public/stylesheets/css/edu-common.css                  |  9 +++++----
 10 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/app/helpers/student_work_helper.rb b/app/helpers/student_work_helper.rb
index c90e7db2f..6c4b8c005 100644
--- a/app/helpers/student_work_helper.rb
+++ b/app/helpers/student_work_helper.rb
@@ -79,9 +79,9 @@ module StudentWorkHelper
       when 0
         str = "未提交"
       when 1
-        str = "按时提交"
+        str = "<span class='color-light-green'>按时提交</span>"
       when 2
-        str = "延时提交"
+        str = "<span class='color-orange'>延时提交</span>"
     end
   end
 
diff --git a/app/views/courses/settings/_add_students.html.erb b/app/views/courses/settings/_add_students.html.erb
index 29092fd71..6833b5d87 100644
--- a/app/views/courses/settings/_add_students.html.erb
+++ b/app/views/courses/settings/_add_students.html.erb
@@ -11,13 +11,19 @@
             <div class="mb10 edu-position" style="width:400px;">
               <input type="hidden" value="10" name="membership[role_ids][]">
               <input type="hidden" value="<%= @course.id %>" id="course_search_not_student_id">
-              <input class="task-form-100 task-height-40 panel-box-sizing" id="search_not_student" placeholder="输入姓名、学号进行搜索" type="text">
+              <input class="task-form-100 task-height-40 panel-box-sizing color-grey3" id="search_not_student" placeholder="输入姓名、学号进行搜索" type="text">
               <a href="javascript:void(0);" class="edu-btn-search font-16 color-grey mt5"><i class="fa fa-search"></i></a>
             </div>
             <div class="clearfix mb15">
               <% if @course.course_groups.count > 0 %>
-              <%= select_tag :course_group_id,options_for_select(course_group_option(@course),0), {:id=>"course_group_id", :class=>"add_student_select"} %>
+              <%= select_tag :course_group_id,options_for_select(course_group_option(@course),0), {:id=>"course_group_id", :class=>"task-form-100 task-height-40 panel-box-sizing mb10 color-grey3"} %>
               <% end %>
+
+              <div class="mb10 edu-position" style="text-align: right">
+                <label class="color-grey">单位：&nbsp;&nbsp;</label>
+                <input placeholder="请输入单位名称" class="task-form-60 task-height-40 panel-box-sizing color-grey3"/>
+                <a href="javascript:void(0);" class="edu-btn-search font-16 color-grey mt5"><i class="fa fa-search"></i></a>
+              </div>
               <ul class="upload_select_box fl" style="overflow-y:auto;width:380px;" id="search_not_students_list">
                 <%#= render :partial => 'courses/settings/search_not_students_list' %>
               </ul>
diff --git a/app/views/courses/settings/_add_teachers.html.erb b/app/views/courses/settings/_add_teachers.html.erb
index 3ed0aacc9..b0423a34f 100644
--- a/app/views/courses/settings/_add_teachers.html.erb
+++ b/app/views/courses/settings/_add_teachers.html.erb
@@ -13,6 +13,11 @@
           <input class="task-form-100 task-height-40 panel-box-sizing" id="search_not_teacher" placeholder="输入用户的真实姓名进行搜索" type="text">
           <a href="javascript:void(0);" class="edu-btn-search font-16 color-grey mt5"><i class="fa fa-search"></i></a>
         </div>
+        <div class="mb10 edu-position mr15" style="text-align: right">
+          <label class="color-grey">单位：&nbsp;&nbsp;</label>
+          <input placeholder="请输入单位名称" class="task-form-40 task-height-40 panel-box-sizing color-grey3"/>
+          <a href="javascript:void(0);" class="edu-btn-search font-16 color-grey mt5"><i class="fa fa-search"></i></a>
+        </div>
         <div class="clearfix mb15">
           <ul class="upload_select_box fl" style="overflow-y:auto;width:380px;" id="search_not_teachers_list">
             <%#= render :partial => 'courses/settings/search_not_teachers_list' %>
@@ -21,7 +26,7 @@
       </div>
 
       <div class="right fl">
-        <h4 class="font-16 mt50">角色：</h4>
+        <h4 class="font-16 mt95">角色：</h4>
         <ul class="pl20 pb20">
           <li>
             <!--<i class="fa fa-circle-o grey fl" aria-hidden="true"></i>-->
diff --git a/app/views/student_work/_evaluation_un_common_work.html.erb b/app/views/student_work/_evaluation_un_common_work.html.erb
index 9083fef8b..fdced5e64 100644
--- a/app/views/student_work/_evaluation_un_common_work.html.erb
+++ b/app/views/student_work/_evaluation_un_common_work.html.erb
@@ -1,13 +1,13 @@
 <tr id="student_work_<%= student_work.id %>">
   <td id="work_num_<%= student_work.id %>"><%= (@page - 1) * @limit + index + 1 %></td>
   <td>
-    <%= link_to student_work.user.show_real_name, user_path(student_work.user) %>
+    <%= link_to student_work.user.show_real_name, user_path(student_work.user),:class=>"color-grey3" %>
   </td>
   <td title="<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id %>">
     <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id %>
   </td>
   <td>
-    <%= list_work_status student_work.work_status %>
+    <%= (list_work_status student_work.work_status).html_safe %>
   </td>
   <td>
     <%= student_work.work_status == 0 ? '--' : format_time(student_work.updated_at) %>
diff --git a/app/views/student_work/_evaluation_un_group_work.html.erb b/app/views/student_work/_evaluation_un_group_work.html.erb
index 00db81514..5091eed73 100644
--- a/app/views/student_work/_evaluation_un_group_work.html.erb
+++ b/app/views/student_work/_evaluation_un_group_work.html.erb
@@ -1,7 +1,7 @@
 <tr id="student_work_<%= student_work.id %>">
   <td id="work_num_<%= student_work.id %>"><%= (@page - 1) * @limit + index + 1 %></td>
   <td>
-    <%= link_to student_work.user.show_real_name, user_path(student_work.user) %>
+    <%= link_to student_work.user.show_real_name, user_path(student_work.user),:class=>"color-grey3" %>
   </td>
   <td title="<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id %>">
     <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id %>
diff --git a/app/views/student_work/_evaluation_un_pro_work.html.erb b/app/views/student_work/_evaluation_un_pro_work.html.erb
index d891e3da2..edc59d44b 100644
--- a/app/views/student_work/_evaluation_un_pro_work.html.erb
+++ b/app/views/student_work/_evaluation_un_pro_work.html.erb
@@ -1,7 +1,7 @@
 <tr id="student_work_<%= student_work.id %>">
   <td id="work_num_<%= student_work.id %>"><%= (@page - 1) * @limit + index + 1 %></td>
   <td>
-    <%= link_to student_work.user.show_real_name, user_path(student_work.user) %>
+    <%= link_to student_work.user.show_real_name, user_path(student_work.user),:class => "color-grey3" %>
   </td>
   <td title="<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id %>">
     <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id %>
diff --git a/app/views/student_work/_evaluation_un_shixun_work.html.erb b/app/views/student_work/_evaluation_un_shixun_work.html.erb
index 974d6698a..bb033a5d2 100644
--- a/app/views/student_work/_evaluation_un_shixun_work.html.erb
+++ b/app/views/student_work/_evaluation_un_shixun_work.html.erb
@@ -1,7 +1,7 @@
 <tr id="student_work_<%= student_work.id %>">
   <td id="work_num_<%= student_work.id %>"><%= (@page - 1) * @limit + index + 1 %></td>
   <td>
-    <%= link_to student_work.user.show_real_name, user_path(student_work.user) %>
+    <%= link_to student_work.user.show_real_name, user_path(student_work.user),:class=>"color-grey3" %>
   </td>
   <td title="<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id %>">
     <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id %>
diff --git a/app/views/student_work/show.html.erb b/app/views/student_work/show.html.erb
index 58906796c..2347acead 100644
--- a/app/views/student_work/show.html.erb
+++ b/app/views/student_work/show.html.erb
@@ -45,7 +45,7 @@
     </div>
     <% if !@work.attachments.where(:attachtype => 7).blank? %>
         <% revise_attachment = @work.attachments.where("attachtype = 7").first %>
-        <div class="edu-con-bg01 mt15" >
+        <div class="edu-con-bg01 mt15 user_bg_shadow bor-grey-e" >
           <div class="edu-con-top clearfix">
             <p class="ml15 font-bd">补交附件</p>
           </div>
diff --git a/app/views/users/_homework_opr.html.erb b/app/views/users/_homework_opr.html.erb
index 6376e34c3..6f7563d32 100644
--- a/app/views/users/_homework_opr.html.erb
+++ b/app/views/users/_homework_opr.html.erb
@@ -3,11 +3,11 @@
     <% projects = cur_user_projects_for_homework activity %>
     <% if work.nil? && projects.nil? %>
         <div class="homepagePostSubmit">
-          <%=link_to "关联项目",new_student_work_project_student_work_index_path(:homework => activity.id,:hw_status=>hw_status,:user_activity_id=>user_activity_id),remote: true,:class=> 'c_blue', :title=> '请各组长关联作业项目' %>
+          <%=link_to "关联项目",new_student_work_project_student_work_index_path(:homework => activity.id,:hw_status=>hw_status,:user_activity_id=>user_activity_id),remote: true,:class=> 'color_white', :title=> '请各组长关联作业项目' %>
         </div>
     <% elsif work.nil? %>
         <div class="homepagePostSubmit">
-          <%=link_to "取消关联",cancel_relate_project_student_work_index_path(:homework => activity.id,:hw_status=>hw_status,:user_activity_id=>user_activity_id), :confirm => "您确定要取消关联吗？", remote: true,:class => "c_blue", :title=> '取消关联项目' %>
+          <%=link_to "取消关联",cancel_relate_project_student_work_index_path(:homework => activity.id,:hw_status=>hw_status,:user_activity_id=>user_activity_id), :confirm => "您确定要取消关联吗？", remote: true,:class => "color_white", :title=> '取消关联项目' %>
         </div>
     <% end %>
 <% end %>
@@ -16,16 +16,16 @@
 </div>
 <% if activity.allow_late && activity.end_time < Time.now && (activity.homework_type == 1 || activity.homework_type == 3) && work && work.work_status != 0 && work.user == User.current && !is_teacher && activity.homework_detail_manual.comment_status < 6 %>
     <div class="homepagePostSubmit">
-      <%=link_to "补交附件", student_work_path(work, :is_focus => 1), :class => 'c_blue', :title => "可追加作品修订附件" %>
+      <%=link_to "补交附件", student_work_path(work, :is_focus => 1), :class => 'color_white', :title => "可追加作品修订附件" %>
     </div>
 <% end %>
 <% if activity.homework_type == 2 && is_teacher%>
     <div class="homepagePostSubmit">
-      <%= link_to "模拟答题", new_student_work_path(homework: activity.id, is_test: true), class: 'c_blue test-program-btn', title: '教师可以通过模拟答题设置作业的标准答案' %>
+      <%= link_to "模拟答题", new_student_work_path(homework: activity.id, is_test: true), class: 'color_white test-program-btn', title: '教师可以通过模拟答题设置作业的标准答案' %>
     </div>
     <% if activity.homework_detail_manual.comment_status != 0 %>
         <div class="homepagePostSubmit">
-          <%= link_to "代码查重", work_canrepeat_student_work_index_path(homework: activity.id, course_id: activity.course.id), class: 'c_blue test-program-btn',:remote => true %>
+          <%= link_to "代码查重", work_canrepeat_student_work_index_path(homework: activity.id, course_id: activity.course.id), class: 'color_white test-program-btn',:remote => true %>
         </div>
     <% end %>
 <% end %>
diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css
index c9ea7e8d7..f70fcbcba 100644
--- a/public/stylesheets/css/edu-common.css
+++ b/public/stylesheets/css/edu-common.css
@@ -1,5 +1,5 @@
 @charset "utf-8";
-body{font-size:14px; line-height:2.0;}
+body{font-size:14px; line-height:2.0;background:#ffffff;}
 html{height:100%;}
 .newContainer{ min-height:100%; height: auto !important; height: 100%; /*IE6不识别min-height*/position: relative;}
 .newMain{ margin: 0 auto; padding-bottom: 155px; }
@@ -7,12 +7,12 @@ html{height:100%;}
 .newHeader{background: #303133;width:100%; height: 50px; min-width: 1200px}
 /* 重置样式 */
 body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td,span{ margin:0; padding:0;}
-body,table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:14px;line-height:1.9; background:#f5f5f5;; color:#333;}
+table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:14px;line-height:1.9; background:#f5f5f5;; color:#333;}
 div,img,tr,td,table{ border:0;}
 table,tr,td{border:0;}
 ol,ul,li{ list-style-type:none}
 a:link,a:visited{text-decoration:none;color:#898989; }
-a:hover {color:#29bd8b;}
+a:hover {color:#FF7500;}
 input,textarea,select{ background: #fff; border:1px solid #eee; color:#666;}
 textarea{resize: none;}
 /*侧滚动条*/
@@ -60,6 +60,7 @@ a.color-orange05:hover,i.color-orange05:hover{color:#ff7500!important;}
 a.color-grey:hover{color: #FF7500!important;}/*a标签，移入变橙色*/
 .color-dark-grey{color:#666!important;}
 .color-grey3{color:#333!important;}
+a.color-grey3:hover{color: #ff7500!important;}
 .u-color-light-grey{color: #CCCCCC}
 .color-light-grey-C{color: #CCCCCC!important;}
 .color-light-grey-E{color: #EEEEEE}
@@ -96,7 +97,7 @@ a:hover.link-color-grey03{color:#3498db!important;}
 .font-28{ font-size: 28px!important;}
 .font-30{ font-size: 30px!important;}
 /*通用内外边距*/
-.mt-10{ margin-top:-10px;}.mt2{ margin-top:2px;}.mt3{ margin-top:3px;}.mt5{ margin-top:5px;}.mt6{ margin-top:6px;}.mt7{ margin-top:7px;}.mt8{ margin-top:8px;}.mt10{ margin-top:10px;}.mt12{ margin-top:12px;}.mt15{ margin-top:15px;}.mt20{ margin-top:20px;}.mt25{ margin-top:25px;}.mt30{ margin-top:30px;}.mt50{ margin-top:50px;}
+.mt-10{ margin-top:-10px;}.mt2{ margin-top:2px;}.mt3{ margin-top:3px;}.mt5{ margin-top:5px;}.mt6{ margin-top:6px;}.mt7{ margin-top:7px;}.mt8{ margin-top:8px;}.mt10{ margin-top:10px;}.mt12{ margin-top:12px;}.mt15{ margin-top:15px;}.mt20{ margin-top:20px;}.mt25{ margin-top:25px;}.mt30{ margin-top:30px;}.mt50{ margin-top:50px;}.mt95{ margin-top:95px;}
 .mb5{ margin-bottom: 5px;}.mb10{ margin-bottom: 10px;}.mb15{ margin-bottom: 15px;}.mb20{ margin-bottom: 20px;}.mb25{ margin-bottom: 25px;}.mb30{ margin-bottom: 30px;}.mb40{ margin-bottom: 40px;}.mb50{ margin-bottom: 50px;}
 .ml-3{ margin-left: -3px;}.ml5{ margin-left: 5px;}.ml6{ margin-left: 6px;}.ml10{ margin-left: 10px;}.ml15{ margin-left: 15px;}.ml20{ margin-left: 20px;}.ml25{ margin-left: 25px;}.ml30{ margin-left: 30px;}.ml33{ margin-left: 33px;}.ml35{ margin-left:35px;}.ml40{margin-left:40px;}.ml42{margin-left:42px;}.ml50{ margin-left: 50px;}.ml75{ margin-left: 75px;}.ml95{ margin-left: 95px;}.ml115{margin-left: 115px}.ml230{ margin-left: 230px;}
 .mr3{margin-right: 3px}.mr5{ margin-right: 5px;}.mr10{ margin-right: 10px;}.mr15{ margin-right: 15px;}.mr18{ margin-right: 18px;}.mr20{ margin-right: 20px;}.mr25{ margin-right: 25px;}.mr30{ margin-right:30px;}.mr40{margin-right:40px;}.mr50{ margin-right: 50px;}.mr60{ margin-right:60px;}

From 3dc678448ded260429e530cf04bd903d312d3763 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 21 Sep 2017 11:27:41 +0800
Subject: [PATCH 18/30] =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=A2=98=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E9=80=9A=E8=BF=87=E5=90=8E=EF=BC=8C=E9=81=AE=E7=BD=A9?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/games/_pass_game_show.html.erb | 40 ++++++++++++------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/views/games/_pass_game_show.html.erb b/app/views/games/_pass_game_show.html.erb
index f917e2412..ef086eb99 100644
--- a/app/views/games/_pass_game_show.html.erb
+++ b/app/views/games/_pass_game_show.html.erb
@@ -1,29 +1,14 @@
 <%= stylesheet_link_tag 'css/edu-common', 'css/edu-popup' %>
 
-<div class="task-popup-warp" style="background-color: rgba(0,0,0,0.7);">
-  <div class="task-popup-box <%= had_done == 0 ? "task-box1" : "task-box2" %>">
-    <a href="javascript:void(0)" class="task-popup-close" onclick="refresh_game_list();"></a>
-    <div class="task-su-con">
-      <% if had_done == 0 %>
-          <p class="task-su-p">恭喜您通过本关</p>
-          <%= link_to "下 一 关", {:controller => 'games', :action => "next_step", :id => game, :myshixun_id => myshixun}, :class => "task-su-btn", :onclick => "hideModal();", :remote => true %>
-      <% else %>
-          <a href="<%= myshixun_game_path(myshixun, :index => 1) %>" class="task-su-btn-white mt50" onclick="hideModal();" data-remote="true">查看光辉历史</a>
-      <% end %>
-    </div>
-  </div>
-</div>
-
-<% if false %>
+<% if game.challenge.st != 0 %>
 <div class="task-popup-warp" style="background-color: rgba(0,0,0,0.7);top: 0px;left: 0px;">
   <div class="task-popup-box <%= had_done == 0 ? "task-box1" : "task-box2" %>">
     <a href="javascript:void(0)" class="task-popup-close" onclick="refresh_game_list();"></a>
-
     <% if had_done == 0 %>
         <div class="task-su-con">
           <p class="task-su-p">恭喜您通过本关</p>
-          <p class="mt8"><i class="fa fa-check-circle color-light-green mr5"></i>本题正确：<span class="color-orange03">&nbsp;3&nbsp;</span>道</p>
-          <p><i class="fa fa-exclamation-circle color-orange mr5"></i>本题错误：<span class="color-orange03">&nbsp;2&nbsp;</span>道</p>
+          <p class="mt8"><i class="fa fa-check-circle color-light-green mr5"></i>本题正确：<span class="color-orange03">&nbsp;<%= game.challenge.choose_correct_num.to_i %>&nbsp;</span>道</p>
+          <p><i class="fa fa-exclamation-circle color-orange mr5"></i>本题错误：<span class="color-orange03">&nbsp;<%= game.challenge.challenge_chooses.count  - game.challenge.choose_correct_num.to_i %>&nbsp;</span>道</p>
         </div>
     <% else %>
         <div class="task-su-con" style="position: absolute;width: 100%;z-index:3;padding-top: 63px;">
@@ -31,8 +16,8 @@
           <a href="<%= myshixun_game_path(myshixun, :index => 1) %>" class="task-su-btn-white mt30" onclick="hideModal();" data-remote="true">查看光辉历史</a>
         </div>
         <div style="text-align:center;background-color: #fff;border-radius: 0px 0px 8px 8px;width: 200px;position:absolute;z-index:2;height:100px;bottom:-30px;left:50%;margin-left:-100px;">
-          <p class="mt25"><i class="fa fa-check-circle color-light-green mr5"></i>本题正确：<span class="color-orange03">&nbsp;3&nbsp;</span>道</p>
-          <p><i class="fa fa-exclamation-circle color-orange mr5"></i>本题错误：<span class="color-orange03">&nbsp;2&nbsp;</span>道</p>
+          <p class="mt25"><i class="fa fa-check-circle color-light-green mr5"></i>本题正确：<span class="color-orange03">&nbsp;<%= game.challenge.choose_correct_num.to_i %>&nbsp;</span>道</p>
+          <p><i class="fa fa-exclamation-circle color-orange mr5"></i>本题错误：<span class="color-orange03">&nbsp;<%= game.challenge.challenge_chooses.count  - game.challenge.choose_correct_num.to_i %>&nbsp;</span>道</p>
         </div>
     <% end %>
   </div>
@@ -40,7 +25,22 @@
     <%= link_to "下 一 关", {:controller => 'games', :action => "next_step", :id => game, :myshixun_id => myshixun}, :class => "task-su-btn", :onclick => "hideModal();", :remote => true %>
   <% end %>
 </div>
+<% else %>
+    <div class="task-popup-warp" style="background-color: rgba(0,0,0,0.7);">
+      <div class="task-popup-box <%= had_done == 0 ? "task-box1" : "task-box2" %>">
+        <a href="javascript:void(0)" class="task-popup-close" onclick="refresh_game_list();"></a>
+        <div class="task-su-con">
+          <% if had_done == 0 %>
+              <p class="task-su-p">恭喜您通过本关</p>
+              <%= link_to "下 一 关", {:controller => 'games', :action => "next_step", :id => game, :myshixun_id => myshixun}, :class => "task-su-btn", :onclick => "hideModal();", :remote => true %>
+          <% else %>
+              <a href="<%= myshixun_game_path(myshixun, :index => 1) %>" class="task-su-btn-white mt50" onclick="hideModal();" data-remote="true">查看光辉历史</a>
+          <% end %>
+        </div>
+      </div>
+    </div>
 <% end %>
+
 <script>
   function refresh_game_list(){
       $.ajax({

From e237b4c4cd3ba9f6eacfda4adaf2b82914141118 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 21 Sep 2017 11:32:39 +0800
Subject: [PATCH 19/30] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BD=9C=E5=93=81?=
 =?UTF-8?q?=E6=97=B6=E6=96=87=E6=9C=AC=E6=A1=86=E8=A6=81=E6=9C=89=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/new.html.erb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb
index 7f062d589..05111532b 100644
--- a/app/views/student_work/new.html.erb
+++ b/app/views/student_work/new.html.erb
@@ -50,6 +50,9 @@
                                  :owner_id => @student_work.nil? ? 0: @student_work.id,
                                  :owner_type => OwnerTypeHelper::STUDENTWORK,
                                  :width => '90%',
+                                 :placeholder => "请在此输入您的作业内容，或者作业附件的简要描述。",
+                                 :local_storage_mdu => "student_work_description_#{User.current.id}",
+                                 :local_storage_id => "desc",
                                  :height => 200,
                                  :minHeight=>200,
                                  :class => 'talk_text fl',
@@ -58,10 +61,9 @@
                                                   :maxlength => 5000 }
                 %>
               </li>
-              <!--<li class="clearfix ">-->
-                <!--<label class=" panel-form-label fl">&nbsp;&nbsp;</label>-->
-                <!--<span class="fl color-grey font-12">数据已于 16:50:50 保存</span>-->
-              <!--</li>-->
+              <div class="cl"></div>
+              <p id="e_tip_desc" style="margin-left: 10%" class="c_grey"></p>
+              <p id="e_tips_desc" style="margin-left: 10%" class="c_grey"></p>
               <li class="none" id="student_work_description_notice">
                 <label class="panel-form-label fl">&nbsp;</label>
                 <span class="color-orange fl mt5"><i class="fa fa-exclamation-circle mr5 color-orange"></i>内容不能为空</span>

From 9bdcfc6b9d377ba0e74f3db2e3ab4c6bb4fbfedf Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 21 Sep 2017 14:21:50 +0800
Subject: [PATCH 20/30] =?UTF-8?q?body=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/css/edu-common.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css
index f70fcbcba..61451de98 100644
--- a/public/stylesheets/css/edu-common.css
+++ b/public/stylesheets/css/edu-common.css
@@ -7,7 +7,7 @@ html{height:100%;}
 .newHeader{background: #303133;width:100%; height: 50px; min-width: 1200px}
 /* 重置样式 */
 body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td,span{ margin:0; padding:0;}
-table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:14px;line-height:1.9; background:#f5f5f5;; color:#333;}
+body,table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:14px;line-height:1.9; background:#f5f5f5;; color:#333;}
 div,img,tr,td,table{ border:0;}
 table,tr,td{border:0;}
 ol,ul,li{ list-style-type:none}

From b885ad23e67f1fc19dc4fd012cb540b071eb8365 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 21 Sep 2017 17:57:18 +0800
Subject: [PATCH 21/30] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=8E=88=E6=9D=83=EF=BC=8C=E8=AF=B7=E9=99=90?=
 =?UTF-8?q?=E5=AE=9A=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/account_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 7c0ad24bb..5695a9037 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -586,7 +586,7 @@ class AccountController < ApplicationController
 
   def apply_trail
     apply_action = ApplyAction.where(:user_id => User.current.id,  :container_type => "TrialAuthorization", :status => 0).first
-    if User.current.user_extensions.identity == 1 && !User.current.user_extensions.student_id.nil? && User.current.user_extensions.student_id != "" && !User.current.user_extensions.school.nil?
+    if User.current.user_extensions.identity == 1 && !User.current.user_extensions.student_id.nil? && User.current.user_extensions.student_id != "" && !User.current.user_extensions.school.nil? && [1579, 2438, 1587, 117].include?(User.current.user_extensions.school_id)
       User.current.update_attributes(:certification => 1)
       @tip = "申请成功，我们将在一分钟内完成审核"
       if apply_action.blank?

From 219ff96ea08ab92f7e1238433d5b4cc743a901de Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 21 Sep 2017 18:29:07 +0800
Subject: [PATCH 22/30] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E8=AF=BE=E5=A0=82=E7=9A=84=E6=95=99=E5=B8=88=E6=88=96=E8=80=85?=
 =?UTF-8?q?=E5=8A=A9=E6=95=99=E5=BE=85=E5=AE=A1=E6=89=B9=E6=8F=90=E9=86=92?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=94=E6=9B=B4=E6=8D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/student_work_helper.rb            |  4 +--
 .../courses/settings/_student_table.html.erb  |  4 +--
 app/views/courses/show.html.erb               | 16 +++++-----
 .../layouts/_group_children_list.html.erb     |  4 +--
 app/views/student_work/show.html.erb          | 32 +++++++++----------
 public/javascripts/edu/base_edu.js            | 12 +++----
 public/stylesheets/css/edu-admin.css          |  1 -
 public/stylesheets/css/edu-class.css          |  1 +
 public/stylesheets/css/edu-common.css         |  2 ++
 public/stylesheets/css/moduel.css             |  2 +-
 public/stylesheets/css/structure.css          |  8 ++++-
 11 files changed, 47 insertions(+), 39 deletions(-)

diff --git a/app/helpers/student_work_helper.rb b/app/helpers/student_work_helper.rb
index 6c4b8c005..5426354e2 100644
--- a/app/helpers/student_work_helper.rb
+++ b/app/helpers/student_work_helper.rb
@@ -165,9 +165,9 @@ module StudentWorkHelper
   #传入分数，获取对应颜色
   def score_color score
     if score
-      color = score >= 90 ? "c_red" : "c_green"
+      color = score >= 90 ? "color-red-light" : "color-light-green"
     else
-      color = "c_grey"
+      color = "color-grey"
     end
     color
   end
diff --git a/app/views/courses/settings/_student_table.html.erb b/app/views/courses/settings/_student_table.html.erb
index aaf68dcc5..015b25486 100644
--- a/app/views/courses/settings/_student_table.html.erb
+++ b/app/views/courses/settings/_student_table.html.erb
@@ -1,4 +1,4 @@
-<table class="edu-pop-table color-grey edu-txt-center table-pa5 interval-td" style="border:none;" cellspacing="0" cellpadding="0" >
+<table class="edu-pop-table color-grey3 edu-txt-center table-pa5 interval-td" style="border:none;" cellspacing="0" cellpadding="0" >
   <thead>
   <tr>
     <th>
@@ -32,7 +32,7 @@
                     <%= index + 1 + (@page -1) * 20 %>
                   <% else %>
                     <input id="member_<%= member.id %>" type="checkbox" class="check magic-checkbox <%= is_teacher ? "" : "none" %>" name="member_ids[]" value="<%= member.id %>"/>
-                    <label for="member_<%= member.id %>"><%= index + 1 + (@page -1) * 20 %></label>
+                    <label for="member_<%= member.id %>" style="top:0px"><%= index + 1 + (@page -1) * 20 %></label>
                   <% end %>
                 </span>
             </td>
diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb
index 425576ec6..23fb8738d 100644
--- a/app/views/courses/show.html.erb
+++ b/app/views/courses/show.html.erb
@@ -8,15 +8,15 @@
 
 <input type="hidden" value="<%= @type%>" name="type" id="user_activities_type">
 <div class="homepageRight mt0 " style="width:85%; float:left;">
-  <% if User.current.admin? || User.current.allowed_to?(:as_teacher,@course) %>
-    <div class="homepageRightBanner user_bg_shadow bor-grey-e with100 mb20 clearfix df" style="width:973px;">
-      <%= link_to '成员管理', members_course_path(@course), :class => "fl white-btn orange-btn", :style => "flex: 1;text-align: center;height:32px;line-height:32px" %>
-      <%= link_to '发布普通作业', new_homework_common_path(:course => @course.id, :homework_type => 1), :class => "fl white-btn orange-btn ml20", :style => "flex: 1;text-align: center;height:32px;line-height:32px" %>
-      <%= link_to '发布实训作业', shixuns_homework_common_index_path(:course => @course.id), :remote => true, :class => "fl white-btn orange-btn ml20", :style => "flex: 1;text-align: center;height:32px;line-height:32px" %>
-      <a class="fl white-btn orange-btn ml20" onclick="course_files_upload();" style="flex: 1;text-align: center;height:32px;line-height:32px">发布资源</a>
+  <% if User.current.admin? || User.current.alloNwed_to?(:as_teacher,@course) %>
+    <ul class="with100 mb20 ml15 clearfix df activities_btn font-16" style="width:1003px;">
+      <li><%= link_to '成员管理', members_course_path(@course),:class => "color-orange03" %><!--<span class="ml10" data-tip-down="有11名助教或教师申请加入课堂，请审批"><span class="edu-cir-orange">11</span></span>--></li>
+      <li><%= link_to '+&nbsp;发布普通作业'.html_safe, new_homework_common_path(:course => @course.id, :homework_type => 1),:class => "color-orange03" %></li>
+      <li><%= link_to '+&nbsp;发布实训作业'.html_safe, shixuns_homework_common_index_path(:course => @course.id),:class => "color-orange03", :remote => true %></li>
+      <li><a class="color-orange03" onclick="course_files_upload();">+&nbsp;发布资源</a></li>
       <% course_board = @course.boards.where("parent_id is NULL").first %>
-      <%= link_to '发布帖子', new_board_message_path(:board_id => course_board.id), :class => "fl white-btn orange-btn ml20", :style => "flex: 1;text-align: center;height:32px;line-height:32px" %>
-    </div>
+      <li><%= link_to '+&nbsp;发布帖子'.html_safe, new_board_message_path(:board_id => course_board.id),:class => "color-orange03" %></li>
+    </ul>
   <% end %>
   <div id="course_activities_content">
     <%= render :partial => 'courses/course_activity_content', :locals => {:course_activities => @course_activities} %>
diff --git a/app/views/layouts/_group_children_list.html.erb b/app/views/layouts/_group_children_list.html.erb
index 10e456a37..06d3d9e44 100644
--- a/app/views/layouts/_group_children_list.html.erb
+++ b/app/views/layouts/_group_children_list.html.erb
@@ -5,7 +5,7 @@
 </li>
 <li id="sy_09" class="clearfix">
   <% count = @course.members.where(:course_group_id => 0).select{|m| m.roles.to_s.include?("Student")}.count %>
-  <a href="<%= no_group_student_list_course_path(@course) %>" class="fl ml15">未分班</a>
+  <a href="<%= no_group_student_list_course_path(@course) %>" class="fl ml35">未分班</a>
   <span class="edu-cir-grey fl ml10 mt15"><%= count %></span>
 </li>
 <% unless @course.course_groups.empty? %>
@@ -13,7 +13,7 @@
       <% @course.course_groups.each do |group| %>
           <li id="course_group_<%=group.id %>" class="clearfix">
             <% count = group.members.count %>
-            <a href="<%= has_group_student_list_course_path(@course, :group_id => group.id) %>" class="fl ml15 edu-break-out"><%=group.name %></a>
+            <a href="<%= has_group_student_list_course_path(@course, :group_id => group.id) %>" class="fl ml35 edu-break-outshort"><%=group.name %></a>
             <span class="edu-cir-grey fl ml10 mt15"><%= count %></span>
           </li>
       <% end %>
diff --git a/app/views/student_work/show.html.erb b/app/views/student_work/show.html.erb
index 2347acead..40c30c177 100644
--- a/app/views/student_work/show.html.erb
+++ b/app/views/student_work/show.html.erb
@@ -29,19 +29,19 @@
       </div>
       <div class="edu-tab-con-box">
         <div id="student_work_img_<%=@work.id %>"><%= @work.description ? @work.description.html_safe : "" %></div>
-        <ul>
-          <% com_attachments = @work.attachments.where("attachtype IS NULL OR attachtype <> 7") %>
-          <% if com_attachments.empty?%>
-              <span style="color: #999999">尚未提交附件</span>
-          <% else%>
-              <%= render :partial => 'work_attachments_status', :locals => {:attachments => com_attachments, :status => @homework.homework_detail_manual.comment_status} %>
-          <% end%>
-          <li class="color-grey clearfix font-12">
-            <span class="fr"><%= format_time(@work.updated_at) %> 更新</span>
-            <span class="mr15 fr"><%= format_time(@work.commit_time) %> 提交</span>
-          </li>
-        </ul>
       </div>
+      <ul class="pl15 pr15 pb15">
+        <% com_attachments = @work.attachments.where("attachtype IS NULL OR attachtype <> 7") %>
+        <% if com_attachments.empty?%>
+            <span style="color: #999999">尚未提交附件</span>
+        <% else%>
+            <%= render :partial => 'work_attachments_status', :locals => {:attachments => com_attachments, :status => @homework.homework_detail_manual.comment_status} %>
+        <% end%>
+        <li class="color-grey clearfix font-12">
+          <span class="fr"><%= format_time(@work.updated_at) %> 更新</span>
+          <span class="mr15 fr"><%= format_time(@work.commit_time) %> 提交</span>
+        </li>
+      </ul>
     </div>
     <% if !@work.attachments.where(:attachtype => 7).blank? %>
         <% revise_attachment = @work.attachments.where("attachtype = 7").first %>
@@ -51,11 +51,11 @@
           </div>
           <div class="edu-tab-con-box">
             补交原因：<%= revise_attachment.description %>
-            <ul>
-              <%= render :partial => 'work_attachments_status', :locals => {:attachments => @work.attachments.where("attachtype = 7"), :status => @homework.homework_detail_manual.comment_status} %>
-              <li class="color-grey"><span><%= format_time(revise_attachment.created_on) %> 提交</span></li>
-            </ul>
           </div>
+          <ul class="pl15 pr15 pb15">
+            <%= render :partial => 'work_attachments_status', :locals => {:attachments => @work.attachments.where("attachtype = 7"), :status => @homework.homework_detail_manual.comment_status} %>
+            <li class="color-grey font-12"><span class="fr"><%= format_time(revise_attachment.created_on) %> 提交</span></li>
+          </ul>
         </div>
     <% end %>
 
diff --git a/public/javascripts/edu/base_edu.js b/public/javascripts/edu/base_edu.js
index 88d9f4eaf..142bb371d 100644
--- a/public/javascripts/edu/base_edu.js
+++ b/public/javascripts/edu/base_edu.js
@@ -842,8 +842,8 @@ function setting_cancel_edit(fn){
 
 $(function(){
     $("#comment_no_limit").live('click', function(){
-       if(!$(this).hasClass("link-color-blue")){
-           $(this).addClass("link-color-blue");
+       if(!$(this).hasClass("color-orange03")){
+           $(this).addClass("color-orange03");
            $("input[name='comment[]']").attr("checked", false);
            $.ajax({
                url: '/student_work?homework='+$("#homework_id").val(),
@@ -872,8 +872,8 @@ $(function(){
         });
     });
     $("#status_no_limit").live('click', function(){
-        if(!$(this).hasClass("link-color-blue")){
-            $(this).addClass("link-color-blue");
+        if(!$(this).hasClass("color-orange03")){
+            $(this).addClass("color-orange03");
             $("input[name='status[]']").attr("checked", false);
             $.ajax({
                 url: '/student_work?homework='+$("#homework_id").val(),
@@ -902,8 +902,8 @@ $(function(){
         });
     });
     $("#group_no_limit").live('click', function(){
-        if(!$(this).hasClass("link-color-blue")){
-            $(this).addClass("link-color-blue");
+        if(!$(this).hasClass("color-orange03")){
+            $(this).addClass("color-orange03");
             $("input[name='group[]']").attr("checked", false);
             $.ajax({
                 url: '/student_work?homework='+$("#homework_id").val(),
diff --git a/public/stylesheets/css/edu-admin.css b/public/stylesheets/css/edu-admin.css
index 536338334..7936338e2 100644
--- a/public/stylesheets/css/edu-admin.css
+++ b/public/stylesheets/css/edu-admin.css
@@ -35,7 +35,6 @@ a.edu-txt-w100,.edu-txt-w100{ width:100px; display: inline-block;}
 .edu-w245{ width: 245px; }
 a.edu-btn{display: inline-block;border:none; padding:0 12px;color: #666!important;border:1px solid #ccc; text-align:center;font-size: 14px;  height: 29px;line-height: 29px; border-radius:3px; font-weight: bold;letter-spacing:1px;}
 a:hover.edu-btn{ border:1px  solid #FF7500; color: #FF7500!important;}
-.edu-cir-grey{ display: inline-block; padding:0px 5px; color:#666; background:#eaeaea; text-align: center; border-radius:15px; font-size:12px; line-height:20px!important;}
 
 /*a.edu-filter-cir-grey{display: inline-block; padding:0px 15px; color:#666; border:1px solid #ddd; text-align: center; border-radius:3px; font-size:12px; height:25px; line-height:25px;}
 a:hover.edu-filter-cir-grey,a.edu-filter-cir-grey.active{ border:1px solid #3498db;  color:#3498db; }*/
diff --git a/public/stylesheets/css/edu-class.css b/public/stylesheets/css/edu-class.css
index 07a95fc40..319793bc1 100644
--- a/public/stylesheets/css/edu-class.css
+++ b/public/stylesheets/css/edu-class.css
@@ -192,6 +192,7 @@ em{font-style:normal;}
 .stud-class-set .news  .container .member .people .left li .p1{position:relative;}
 .stud-class-set .news  .container .member .people .left li .p1 span{max-width:115px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;display:inline-block;float:left}
 .edu-break-out{max-width:115px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;display:inline-block;float:left}
+.edu-break-outshort{max-width:105px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;display:inline-block;float:left}
 .stud-class-set .news  .container .member .people .left li .p1 em{margin-left:10px;font-size:12px;background:#e9e9e9;border-radius:8px;padding:2px 5px;}
 .stud-class-set .news  .container .member .people .left li .p1 i{color:#ddd;cursor: pointer;position:absolute;right:10px;top:17px;}
 .stud-class-set .news  .container .member .people .left li .p1 i:hover{color:#FF7500;}
diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css
index 61451de98..b5300429c 100644
--- a/public/stylesheets/css/edu-common.css
+++ b/public/stylesheets/css/edu-common.css
@@ -38,6 +38,7 @@ textarea{resize: none;}
 .none{display: none}
 /*通用文字功能样式*/
 .font-bd{ font-weight: bold;}
+.color-red-light{color: #F00!important;}
 .color-red{ color:#d2322d!important;}
 .u-color-light-red{color: #FF6666}
 .color-black{color:#333!important;}
@@ -250,6 +251,7 @@ a.edu-btn{display: inline-block;border:none; padding:0 12px;color: #666!importan
 a:hover.edu-btn{ border:1px  solid #5faee3; color: #5faee3!important;}
 .edu-cir-grey{ display: inline-block; padding:0px 5px; color:#666; background:#f3f3f3; text-align: center; border-radius:15px; font-size:12px; line-height:20px!important;}
 .edu-cir-grey-q{ display: inline-block; padding:0px 7px; color:#666; background:#f3f3f3; text-align: center; border-radius:15px; font-size:12px; line-height:20px!important;}
+.edu-cir-orange{ display: inline-block; padding:0px 7px; color:#fff; background:#FF7500; text-align: center; border-radius:15px; font-size:12px; line-height:20px!important;}
 
 /*a.edu-filter-cir-grey{display: inline-block; padding:0px 15px; color:#666; border:1px solid #ddd; text-align: center; border-radius:3px; font-size:12px; height:25px; line-height:25px;}
 a:hover.edu-filter-cir-grey,a.edu-filter-cir-grey.active{ border:1px solid #3498db;  color:#3498db; }*/
diff --git a/public/stylesheets/css/moduel.css b/public/stylesheets/css/moduel.css
index 8c702cdfe..35c74f477 100644
--- a/public/stylesheets/css/moduel.css
+++ b/public/stylesheets/css/moduel.css
@@ -88,7 +88,7 @@ textarea.muban_textarea{ width: 87%;border:1px solid #ddd; background:#fff; colo
 .newupload_textarea{ width: 316px; padding:5px; border:1px solid #c8c8c8;}
 #muban_popup_box label.newupload_innnerlabel{ width: auto; text-align: left;}
 /*新版导入资源弹框20161107byLB*/
-.newupload_conbox{ background: #fff; padding:15px; padding-bottom: 0;}
+.newupload_conbox{ background: #fff;padding-bottom: 0;}
 .newupload_navbox{border-bottom:1px solid #dbdbdb;}
 .newupload_nav { height: 30px; line-height: 30px; background: #e7e7e7;  }
 .newupload_nav li {float:left; padding:0 15px;   display: block;  text-align:center; }
diff --git a/public/stylesheets/css/structure.css b/public/stylesheets/css/structure.css
index 5340bc4ff..270678131 100644
--- a/public/stylesheets/css/structure.css
+++ b/public/stylesheets/css/structure.css
@@ -534,4 +534,10 @@ a.user_editinfo{border-top:1px solid #e5e5e5; height:30px; line-height:30px; tex
 .homepageClickBackground{ background-color:#3b94d6; flex:1; text-align: center }
 .flex-cell_homepage:hover{ background-color:#3b94d6;}
 
-.feedback_error p{display: inline;}
\ No newline at end of file
+.feedback_error p{display: inline;}
+.activities_btn{border: 1px solid #FF7500;}
+.activities_btn li{flex: 1;height: 50px;line-height: 50px;float: left;text-align: center;border-right: 1px solid #FF7500;}
+.activities_btn li:last-child{border: none;}
+.activities_btn li:hover{color:#fff!important;background: #FF7500;}
+.activities_btn li:hover a{color: #fff!important;}
+.activities_btn li:hover .edu-cir-orange{background: #fff;color: #FF7500}
\ No newline at end of file

From c71ca7b5a87e2bb357a72cad1d282ce2bacad0c1 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 22 Sep 2017 09:50:44 +0800
Subject: [PATCH 23/30] =?UTF-8?q?=E8=AF=BE=E5=A0=82=E7=9A=84=E5=B8=96?=
 =?UTF-8?q?=E5=AD=90=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/messages_controller.rb     |  6 +++++-
 app/views/messages/_course_show.html.erb   | 10 +++++-----
 app/views/users/_course_boardlist.html.erb |  8 ++++----
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 8918d5e46..ccc118f54 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -406,7 +406,11 @@ class MessagesController < ApplicationController
   def sticky_topic
     (render_403; return false) unless (User.current.admin? || User.current.allowed_to?(:as_teacher, @course))
     @topic.update_attributes(:sticky => @topic.sticky == 1 ? 0 : 1)
-    redirect_to board_message_path(@topic.board_id, @topic)
+    if params[:is_board]
+      redirect_to course_boards_path(@course)
+    else
+      redirect_to board_message_path(@topic.board_id, @topic)
+    end
   end
 
   def quote
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 40e308dda..2dda26d3b 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -34,15 +34,15 @@
       <% if User.current.logged? %>
           <p class="fr font-16">
             <% if User.current.admin? || User.current.allowed_to?(:as_teacher, @course) || User.current == @topic.author %>
-                <a href="javascript:void(0);" class="mr10" data-tip-down="删除"><i class="fa fa-trash-o"></i></a>
+                <a href="javascript:void(0);" onclick="delete_confirm_box_3('<%= delete_board_message_path(@topic.board_id, @topic) %>', '确定要删除该帖子吗？')" class="mr10" data-tip-down="删除"><i class="fa fa-trash-o"></i></a>
             <% end %>
-            <!--<a href="javascript:void(0);" class="mr10" title="发送" onclick="show_send(<%#= @topic.id %>, <%#= User.current.id %>, 'message');"><i class="fa fa-send-o"></i></a>-->
+            <a href="javascript:void(0);" class="mr10" title="发送" onclick="show_send(<%= @topic.id %>, <%= User.current.id %>, 'message');"><i class="fa fa-send-o"></i></a>
             <% if User.current.admin? || User.current.allowed_to?(:as_teacher, @course) || User.current == @topic.author %>
               <a href="<%= edit_board_message_path(@topic.board_id, @topic) %>" class="mr10" data-tip-down="编辑"><i class="fa fa-pencil"></i></a>
             <% end %>
-            <%# if User.current.admin? || User.current.allowed_to?(:as_teacher, @course) %>
-              <!--<a href="<%#= sticky_topic_board_message_path(@topic.board_id, @topic) %>" class="mr10" data-tip-down="<%#= @topic.sticky == 1 ? '取消置顶' : '置顶' %>"><i class="fa <%#= @topic.sticky == 1 ? 'fa-arrow-circle-o-down' : 'fa-arrow-circle-o-up' %>"></i></a>-->
-            <%# end %>
+            <% if User.current.admin? || User.current.allowed_to?(:as_teacher, @course) %>
+              <a href="<%= sticky_topic_board_message_path(@topic.board_id, @topic) %>" class="mr10" data-tip-down="<%= @topic.sticky == 1 ? '取消置顶' : '置顶' %>"><i class="fa <%= @topic.sticky == 1 ? 'fa-arrow-circle-o-down' : 'fa-arrow-circle-o-up' %>"></i></a>
+            <% end %>
           </p>
       <% end %>
       <div class="cl"></div>
diff --git a/app/views/users/_course_boardlist.html.erb b/app/views/users/_course_boardlist.html.erb
index aad722bf6..d63d958ad 100644
--- a/app/views/users/_course_boardlist.html.erb
+++ b/app/views/users/_course_boardlist.html.erb
@@ -84,11 +84,11 @@
               <li>
                 <i class="fa fa-bars color-grey-b"></i>
                 <ul class="homepagePostSettiongText">
-                  <li><a href="javascript:void(0)" class="postOptionLink">发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送</a></li>
-                  <li><a href="javascript:void(0)" class="postOptionLink" data-remote="true">置&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;顶</a></li>
-                  <li><a href="javascript:void(0)" class="postOptionLink" data-remote="true">编&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;辑</a></li>
+                  <li><a href="javascript:void(0)" onclick="show_send(<%= activity.id %>, <%= User.current.id %>, 'message');" class="postOptionLink">发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送</a></li>
+                  <li><a href="<%= sticky_topic_board_message_path(activity.board_id, activity, :is_board => true) %>" class="postOptionLink"><%= activity.sticky == 1 ? '取消置顶' : '置&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;顶'.html_safe %></a></li>
+                  <li><a href="<%= edit_board_message_path(activity.board_id, activity) %>" class="postOptionLink">编&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;辑</a></li>
                   <li>
-                    <a href="javascript:void(0);" class="postOptionLink">删&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;除</a>
+                    <a href="javascript:void(0);" onclick="delete_confirm_box_3('<%= delete_board_message_path(activity.board_id, activity) %>', '确定要删除该帖子吗？')" class="postOptionLink">删&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;除</a>
                   </li>
                 </ul>
               </li>

From eced528c8fefe764cf589b710157c45a7bcdea51 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 22 Sep 2017 10:19:59 +0800
Subject: [PATCH 24/30] =?UTF-8?q?=E6=8A=8A=E5=B7=B2=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E7=9A=84=E8=B7=AF=E5=BE=84=E6=8E=92=E5=9C=A8=E6=9C=80=E5=89=8D?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/shixuns_controller.rb     |  6 +++---
 app/controllers/subjects_controller.rb    | 11 ++++++++---
 app/models/subject.rb                     |  9 +++++++++
 app/views/subjects/_subject_list.html.erb | 12 ++++++------
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index f4bbc6ad8..d9a46da0a 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -243,8 +243,8 @@ class ShixunsController < ApplicationController
     @order = params[:order] || "myshixun_count"
     bsort = params[:sort] || "desc"
     @sort = bsort == "desc" ? "asc" : "desc"
-    if @order == "created_at"
-      order_str = "#{Shixun.table_name}.created_at #{bsort}"
+    if @order == "updated_at"
+      order_str = "#{Shixun.table_name}.updated_at #{bsort}"
     else
       order_str = "myshixun_count #{bsort}, #{Shixun.table_name}.updated_at #{bsort}"
     end
@@ -300,7 +300,7 @@ class ShixunsController < ApplicationController
       when nil, "0"
         @shixuns = @shixuns
     end
-    if @order == "created_at"
+    if @order == "updated_at"
       @shixuns =@shixuns.reorder(order_str)
     else
       # 最热排序
diff --git a/app/controllers/subjects_controller.rb b/app/controllers/subjects_controller.rb
index f14ec8017..45575406f 100644
--- a/app/controllers/subjects_controller.rb
+++ b/app/controllers/subjects_controller.rb
@@ -8,12 +8,17 @@ class SubjectsController < ApplicationController
   include ApplicationHelper
 
   def index
-    @order = params[:order] || "updated_at"
-    bsort = params[:sort] || "asc"
+    @order = params[:order] || "myshixun_count"
+    bsort = params[:sort] || "desc"
     @sort = bsort == "desc" ? "asc" : "desc"
     search = params[:search]
     #ids = Subject.find_by_sql("select group_concat(id) as allId from subjects where id in (SELECT distinct(subject_id) FROM `stages`)")
-    @subjects = Subject.where("hidden = 0").reorder("#{@order} #{bsort}")
+    if @order == "myshixun_count"
+      #@shixuns = @shixuns.select("shixuns.*, (select count(myshixuns.id) from myshixuns where myshixuns.shixun_id = shixuns.id group by shixuns.id) AS myshixunCount").reorder("status = 2 desc, myshixunCount desc")
+      @subjects = Subject.where("hidden = 0").select("subjects.*, (select count(myshixuns.id) from myshixuns, stage_shixuns where myshixuns.shixun_id = stage_shixuns.shixun_id and stage_shixuns.subject_id = subjects.id group by subjects.id) AS myshixunCount").reorder("status = 2 desc, myshixunCount #{bsort}")
+    else
+      @subjects = Subject.where("hidden = 0").reorder("#{@order} #{bsort}")
+    end
     @subject_created_count = Subject.where(:user_id => User.current.id).count
     @subjects_all_count = @subjects.count
     #@subjects = Subject.where("name like ?", "%#{search}%").reorder("#{@order} #{@sort}")
diff --git a/app/models/subject.rb b/app/models/subject.rb
index 7eb102bf5..fc4fa393c 100644
--- a/app/models/subject.rb
+++ b/app/models/subject.rb
@@ -35,6 +35,15 @@ class Subject < ActiveRecord::Base
     count
   end
 
+  def subject_users
+    count = 0
+    self.stage_shixuns.each do |stage_shixun|
+      shixun = stage_shixun.shixun
+      count += shixun.myshixuns.count
+    end
+    count
+  end
+
   def subject_score
     score = 0
     self.stage_shixuns.each do |stage_shixun|
diff --git a/app/views/subjects/_subject_list.html.erb b/app/views/subjects/_subject_list.html.erb
index 6bca42ab6..908af0a9e 100644
--- a/app/views/subjects/_subject_list.html.erb
+++ b/app/views/subjects/_subject_list.html.erb
@@ -1,9 +1,9 @@
 <ul class="nav_check_item border-bottom-orange clearfix mb15">
-  <li class="fl <%= @order == 'updated_at' ? 'check_nav' : "" %>">
-    <%= link_to "最热", subjects_path(:order => "updated_at", :search => @search, :sort => @sort), :remote => true %>
+  <li class="fl <%= @order == 'myshixun_count' ? 'check_nav' : "" %>">
+    <%= link_to "最热", subjects_path(:order => "myshixun_count", :search => @search, :sort => @sort), :remote => true %>
   </li>
-  <li class="fl <%= @order == 'created_at' ? 'check_nav' : "" %>">
-    <%= link_to "最新", subjects_path(:order => "created_at", :search => @search, :sort => @sort), :remote => true %>
+  <li class="fl <%= @order == 'updated_at' ? 'check_nav' : "" %>">
+    <%= link_to "最新", subjects_path(:order => "updated_at", :search => @search, :sort => @sort), :remote => true %>
   </li>
   <li class="fr" style="width: auto;cursor:default;">共<span class="color-orange"><%= @subjects_count %></span>个检索结果</li>
 </ul>
@@ -43,8 +43,8 @@
         <% if subject.subject_score > 0 %>
             <span class="pl5 pr5"><i class="fa fa-viacoin color-light-green pr5" aria-hidden="true" data-tip-down="总经验值"></i><em><%= subject.subject_score %></em></span>
         <% end %>
-        <% if subject.subject_challenges > 0 %>
-            <span class="pl5 pr5"><i class="fa fa-users color-light-green pr5" aria-hidden="true" data-tip-down="学习人数"></i><em><%= subject.subject_challenges %></em></span>
+        <% if subject.subject_users > 0 %>
+            <span class="pl5 pr5"><i class="fa fa-users color-light-green pr5" aria-hidden="true" data-tip-down="学习人数"></i><em><%= subject.subject_users %></em></span>
         <% end %>
       </p>
       <div class="clearfix task-index-list-user task_yx_bo" style="margin-bottom: 0px">

From 0b2f5843715c4a25c74e10c5c1fbb21a532c6240 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 22 Sep 2017 10:52:23 +0800
Subject: [PATCH 25/30] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=9A=84=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2tip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_edit_late_setting.html.erb               | 19 ++++++++++++++-----
 .../_edit_publish_setting.html.erb            |  2 +-
 .../_edit_score_setting.html.erb              |  6 +++---
 .../_show_late_setting.html.erb               | 19 ++++++++++++++-----
 .../_show_publish_setting.html.erb            |  2 +-
 .../_show_score_setting.html.erb              |  6 +++---
 6 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/app/views/homework_common/_edit_late_setting.html.erb b/app/views/homework_common/_edit_late_setting.html.erb
index d41ac0bed..33f9238d9 100644
--- a/app/views/homework_common/_edit_late_setting.html.erb
+++ b/app/views/homework_common/_edit_late_setting.html.erb
@@ -14,12 +14,21 @@
           <em></em>
           <span></span>
           <% if @homework.allow_late %>
-              <p id="edit_late_notice">允许补交，则在结束日期之前，学生可以补交作品 <br/>
-                但是在提交截止时间之后才提交作品的学生，将被扣迟交分
-              </p>
+              <% if @homework.homework_type != 4 %>
+                  <p>允许补交，则在结束日期之前，学生可以补交作品 <br/>
+                    但是在提交截止时间之后才提交作品的学生，将被扣迟交分
+                  </p>
+              <% else %>
+                  <p>允许补交，则在结束日期之前，学生可以补交作品，并在作业结束时间<br/>之前，根据实训任务的完成情况实时计算学生成绩 <br/><br/>
+                    但是在提交截止时间之后才创建的作品，将被扣迟交分
+                  </p>
+              <% end %>
           <% else %>
-              <p id="edit_late_notice">禁止补交，则在提交截止时间之后，学生不能再提交作品
-              </p>
+              <% if @homework.homework_type != 4 %>
+                  <p>禁止补交，则在提交截止时间之后，学生不能再提交作品</p>
+              <% else %>
+                  <p>禁止补交，则在提交截止时间之后才创建的作品，得分为0</p>
+              <% end %>
           <% end %>
         </div>
       </li>
diff --git a/app/views/homework_common/_edit_publish_setting.html.erb b/app/views/homework_common/_edit_publish_setting.html.erb
index 6fd57b063..10fa2d2ed 100644
--- a/app/views/homework_common/_edit_publish_setting.html.erb
+++ b/app/views/homework_common/_edit_publish_setting.html.erb
@@ -28,7 +28,7 @@
           <em></em>
           <span></span>
 
-          <p><%= @homework.homework_type == 4 ? "截止时间后，系统将根据学生完成情况计算成绩" : "截止时间过后，学生不能修改作品和追加附件" %></p>
+          <p><%= @homework.homework_type == 4 ? "系统在截止时间之前，根据实训任务的完成情况实时计算学生成绩" : "截止时间过后，学生不能修改作品和追加附件" %></p>
         </div>
       </li>
       <li class="clearfix mb15 edu-position pl30">
diff --git a/app/views/homework_common/_edit_score_setting.html.erb b/app/views/homework_common/_edit_score_setting.html.erb
index 4dbb87c72..2c2e3ed99 100644
--- a/app/views/homework_common/_edit_score_setting.html.erb
+++ b/app/views/homework_common/_edit_score_setting.html.erb
@@ -8,7 +8,7 @@
           <li class="clearfix">
             <label class="panel-form-label fl mr10" style="width: 20%">查看参考答案后通过评测的任务</label>
           </li>
-          <li class="clearfix">
+          <li class="clearfix edu-position">
             <label class="panel-form-label fl mr10">&nbsp;</label>
             <input id="answer_open_evaluation_0" class="magic-radio fl mt6" type="radio" name="answer_open_evaluation" value="0" <%= @homework.homework_detail_manual.answer_open_evaluation ? '' : 'checked' %>>
             <label for="answer_open_evaluation_0" class="fl mt6 mr30">零分</label>
@@ -18,14 +18,14 @@
               <em></em>
               <span></span>
               <p>零分：查看参考答案才完成的任务，在系统评分时属于未完成任务<br/>
-                零分：查看参考答案才完成的任务，在系统评分时属于已完成任务 <br/>
+                满分：查看参考答案才完成的任务，在系统评分时属于已完成任务 <br/>
               </p>
             </div>
           </li>
           <li class="clearfix mt10">
             <label class="panel-form-label fl mr10">最终成绩组成</label>
           </li>
-          <li class="clearfix">
+          <li class="clearfix edu-position mb20">
             <label class="panel-form-label fl mr10">系统评分</label>
             <input type="text" disabled class="fl task-form-15 task-height-40 panel-box-sizing" value="100%" placeholder="100%" />
             <div class="popup_tip_box fontGrey2" style="right:-15px; top:0px;width:405px;">
diff --git a/app/views/homework_common/_show_late_setting.html.erb b/app/views/homework_common/_show_late_setting.html.erb
index 454ce2f13..9c24b2ae4 100644
--- a/app/views/homework_common/_show_late_setting.html.erb
+++ b/app/views/homework_common/_show_late_setting.html.erb
@@ -14,12 +14,21 @@
           <em></em>
           <span></span>
           <% if @homework.allow_late %>
-              <p>允许补交，则在结束日期之前，学生可以补交作品 <br/>
-                但是在提交截止时间之后才提交作品的学生，将被扣迟交分
-              </p>
+              <% if @homework.homework_type != 4 %>
+                  <p>允许补交，则在结束日期之前，学生可以补交作品 <br/>
+                    但是在提交截止时间之后才提交作品的学生，将被扣迟交分
+                  </p>
+              <% else %>
+                  <p>允许补交，则在结束日期之前，学生可以补交作品，并在作业结束时间<br/>之前，根据实训任务的完成情况实时计算学生成绩 <br/><br/>
+                    但是在提交截止时间之后才创建的作品，将被扣迟交分
+                  </p>
+              <% end %>
           <% else %>
-              <p>禁止补交，则在提交截止时间之后，学生不能再提交作品
-              </p>
+              <% if @homework.homework_type != 4 %>
+                  <p>禁止补交，则在提交截止时间之后，学生不能再提交作品</p>
+              <% else %>
+                  <p>禁止补交，则在提交截止时间之后才创建的作品，得分为0</p>
+              <% end %>
           <% end %>
         </div>
       </li>
diff --git a/app/views/homework_common/_show_publish_setting.html.erb b/app/views/homework_common/_show_publish_setting.html.erb
index 0ba5dd24b..9a64d251b 100644
--- a/app/views/homework_common/_show_publish_setting.html.erb
+++ b/app/views/homework_common/_show_publish_setting.html.erb
@@ -23,7 +23,7 @@
         <div class="popup_tip_box fontGrey2" style="right:-15px; top:0px;width:405px;">
           <em></em>
           <span></span>
-          <p><%= @homework.homework_type == 4 ? "截止时间后，系统将根据学生完成情况计算成绩" : "截止时间过后，学生不能修改作品和追加附件" %></p>
+          <p><%= @homework.homework_type == 4 ? "系统在截止时间之前，根据实训任务的完成情况实时计算学生成绩" : "截止时间过后，学生不能修改作品和追加附件" %></p>
         </div>
       </li>
       <li class="clearfix mb15 edu-position pl30">
diff --git a/app/views/homework_common/_show_score_setting.html.erb b/app/views/homework_common/_show_score_setting.html.erb
index bc21d7089..e71630ddc 100644
--- a/app/views/homework_common/_show_score_setting.html.erb
+++ b/app/views/homework_common/_show_score_setting.html.erb
@@ -8,7 +8,7 @@
           <li class="clearfix">
             <label class="panel-form-label fl mr10" style="width: 20%">查看参考答案后通过评测的任务</label>
           </li>
-          <li class="clearfix">
+          <li class="clearfix edu-position">
             <label class="panel-form-label fl mr10">&nbsp;</label>
             <input class="magic-radio fl mt6" type="radio" disabled value="1" <%= @homework.homework_detail_manual.answer_open_evaluation ? '' : 'checked' %>>
             <label class="fl mt6 mr30">零分</label>
@@ -18,14 +18,14 @@
               <em></em>
               <span></span>
               <p>零分：查看参考答案才完成的任务，在系统评分时属于未完成任务<br/>
-                零分：查看参考答案才完成的任务，在系统评分时属于已完成任务 <br/>
+                满分：查看参考答案才完成的任务，在系统评分时属于已完成任务 <br/>
               </p>
             </div>
           </li>
           <li class="clearfix mt10">
             <label class="panel-form-label fl mr10">最终成绩组成</label>
           </li>
-          <li class="clearfix">
+          <li class="clearfix edu-position mb20">
             <label class="panel-form-label fl mr10">系统评分</label>
             <input type="text" disabled class="fl task-form-15 task-height-40 panel-box-sizing" value="100%" placeholder="100%" />
             <div class="popup_tip_box fontGrey2" style="right:-15px; top:0px;width:405px;">

From 2a619272bbba8740fda05a47ef5101480607ffc5 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 22 Sep 2017 11:16:30 +0800
Subject: [PATCH 26/30] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9bug=E5=92=8C=E5=BB=B6=E6=97=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb | 2 +-
 app/helpers/student_work_helper.rb         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 70052e997..5a1366d2f 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -359,7 +359,7 @@ class StudentWorkController < ApplicationController
       end
     end
     ##################################################################################################################
-    if @homework.homework_type == 4 && (@homework.publish_time > Time.now || (@homework.publish_time <= Time.now && @homework.allow_late))
+    if @homework.homework_type == 4 && @homework.homework_detail_manual.comment_status > 0 && (@homework.publish_time > Time.now || (@homework.publish_time <= Time.now && @homework.allow_late))
       update_shixun_work_status @homework
     end
     @order,@b_sort,@name,@group,@comment,@status = params[:order] || "updated_at",params[:sort] || "desc",params[:name].to_s.strip || "",params[:group], params[:comment], params[:status]
diff --git a/app/helpers/student_work_helper.rb b/app/helpers/student_work_helper.rb
index cf6b5b5d4..993e4d9eb 100644
--- a/app/helpers/student_work_helper.rb
+++ b/app/helpers/student_work_helper.rb
@@ -6,7 +6,7 @@ module StudentWorkHelper
     homework.student_works.where(:work_status => 0).each do |work|
       myshixun = Myshixun.where(:shixun_id => homework.homework_commons_shixuns.shixun_id, :user_id => work.user_id).first
       if myshixun
-        work.update_attributes(:work_status => myshixun.created_at <= homework.publish_time ? 1 : 2, :commit_time => myshixun.created_at, :myshixun_id => myshixun.id)
+        work.update_attributes(:work_status => myshixun.created_at <= homework.end_time ? 1 : 2, :late_penalty => myshixun.created_at <= homework.end_time ? 0 : homework.late_penalty, :commit_time => myshixun.created_at, :myshixun_id => myshixun.id)
       end
     end
   end

From 48de3d1f357b3bac2cb26f846257de77421fa92b Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 22 Sep 2017 14:36:01 +0800
Subject: [PATCH 27/30] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=88=90=E7=BB=A9=E7=9A=84=E5=AE=9E=E6=97=B6=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb | 10 +++++-----
 app/controllers/student_work_controller.rb    |  6 ++++--
 app/helpers/student_work_helper.rb            | 11 +++++++----
 app/models/students_for_course.rb             | 18 +++++++++---------
 lib/tasks/homework_publishtime.rake           |  2 +-
 5 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index f0a1b84a7..218fd4562 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -335,11 +335,11 @@ class HomeworkCommonController < ApplicationController
     if @homework.homework_type == 4
       if @homework_detail_manual.answer_open_evaluation != params[:answer_open_evaluation].to_i
         @homework_detail_manual.answer_open_evaluation = params[:answer_open_evaluation].to_i
-        if @homework.end_time < Time.now
-          @homework.student_works.each do |student_work|
-            set_shixun_final_score @homework, student_work, @homework_detail_manual.answer_open_evaluation
-          end
-        end
+        # if @homework.end_time < Time.now
+        #   @homework.student_works.each do |student_work|
+        #     set_shixun_final_score @homework, student_work, @homework_detail_manual.answer_open_evaluation
+        #   end
+        # end
       end
       @homework.score_open = params[:homework_score_open] ? 1 : 0
     else
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 5a1366d2f..75c51dde5 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -359,8 +359,10 @@ class StudentWorkController < ApplicationController
       end
     end
     ##################################################################################################################
-    if @homework.homework_type == 4 && @homework.homework_detail_manual.comment_status > 0 && (@homework.publish_time > Time.now || (@homework.publish_time <= Time.now && @homework.allow_late))
-      update_shixun_work_status @homework
+    if params[:order].nil? && params[:sort].nil? && params[:name].nil? && params[:group].nil? && params[:comment].nil? && params[:status].nil?
+      if @homework.homework_type == 4 && @homework.homework_detail_manual.comment_status > 0 && @homework.homework_detail_manual.comment_status != 6 && (@homework.end_time > Time.now || (@homework.end_time <= Time.now && @homework.allow_late))
+        update_shixun_work_status @homework
+      end
     end
     @order,@b_sort,@name,@group,@comment,@status = params[:order] || "updated_at",params[:sort] || "desc",params[:name].to_s.strip || "",params[:group], params[:comment], params[:status]
     @homework_commons = @course.homework_commons.where("publish_time <= ?",Time.now).order("created_at desc")
diff --git a/app/helpers/student_work_helper.rb b/app/helpers/student_work_helper.rb
index 993e4d9eb..c768bf034 100644
--- a/app/helpers/student_work_helper.rb
+++ b/app/helpers/student_work_helper.rb
@@ -3,11 +3,14 @@ include UserScoreHelper
 
 module StudentWorkHelper
   def update_shixun_work_status homework
-    homework.student_works.where(:work_status => 0).each do |work|
-      myshixun = Myshixun.where(:shixun_id => homework.homework_commons_shixuns.shixun_id, :user_id => work.user_id).first
-      if myshixun
-        work.update_attributes(:work_status => myshixun.created_at <= homework.end_time ? 1 : 2, :late_penalty => myshixun.created_at <= homework.end_time ? 0 : homework.late_penalty, :commit_time => myshixun.created_at, :myshixun_id => myshixun.id)
+    homework.student_works.each do |work|
+      if work.work_status == 0
+        myshixun = Myshixun.where(:shixun_id => homework.homework_commons_shixuns.shixun_id, :user_id => work.user_id).first
+        if myshixun
+          work.update_attributes(:work_status => myshixun.created_at <= homework.end_time ? 1 : 2, :late_penalty => myshixun.created_at <= homework.end_time ? 0 : homework.late_penalty, :commit_time => myshixun.created_at, :myshixun_id => myshixun.id)
+        end
       end
+      set_shixun_final_score homework, work, homework.homework_detail_manual.answer_open_evaluation
     end
   end
 
diff --git a/app/models/students_for_course.rb b/app/models/students_for_course.rb
index b501db674..95157f2da 100644
--- a/app/models/students_for_course.rb
+++ b/app/models/students_for_course.rb
@@ -39,16 +39,16 @@ class StudentsForCourse < ActiveRecord::Base
           if str != ""
             str += ","
           end
-          if hw.homework_type == 4
-            myshixun = Myshixun.where(:shixun_id => hw.homework_commons_shixuns.shixun_id, :user_id => self.student_id).first
-            if myshixun
-              str += "('#{hw.name}的作品提交',#{hw.id},#{self.student_id}, 1, #{myshixun.id}, '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}', '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}', '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}')"
-            else
-              str += "('#{hw.name}的作品提交',#{hw.id},#{self.student_id}, 0, null, null, '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}', '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}')"
-            end
-          else
+          #if hw.homework_type == 4
+            #myshixun = Myshixun.where(:shixun_id => hw.homework_commons_shixuns.shixun_id, :user_id => self.student_id).first
+            # if myshixun
+            #   str += "('#{hw.name}的作品提交',#{hw.id},#{self.student_id}, 1, #{myshixun.id}, '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}', '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}', '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}')"
+            # else
+            #   str += "('#{hw.name}的作品提交',#{hw.id},#{self.student_id}, 0, null, null, '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}', '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}')"
+            # end
+          #else
             str += "('#{hw.name}的作品提交',#{hw.id},#{self.student_id}, 0, null, null, '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}', '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}')"
-          end
+          #end
         end
       end
       if str != ""
diff --git a/lib/tasks/homework_publishtime.rake b/lib/tasks/homework_publishtime.rake
index a4fc83104..686803b80 100644
--- a/lib/tasks/homework_publishtime.rake
+++ b/lib/tasks/homework_publishtime.rake
@@ -97,7 +97,7 @@ namespace :homework_publishtime do
     homework_commons.each do |homework|
       homework_detail_manual = homework.homework_detail_manual
       homework_detail_manual.update_column('comment_status', 6)
-      if homework.homework_type == 4
+      if homework.homework_type == 4 && homework.allow_late
         shixun = homework.homework_commons_shixuns.shixun
         homework.student_works.where("work_status != 0").each do |student_work|
           passed_count = homework.homework_detail_manual.answer_open_evaluation ? had_passed_changllenge_num_rake(student_work.myshixun) : had_passed_no_ans_changllenge_num_rake(student_work.myshixun)

From 0f691406927777ee711a3d4c4e6b4d9d1e1e2720 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 22 Sep 2017 14:45:20 +0800
Subject: [PATCH 28/30] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=8C=BF=E8=AF=84=E4=BD=9C=E5=93=81=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E9=9C=80=E8=A6=81=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/student_work_helper.rb | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/helpers/student_work_helper.rb b/app/helpers/student_work_helper.rb
index c768bf034..c8e014bf0 100644
--- a/app/helpers/student_work_helper.rb
+++ b/app/helpers/student_work_helper.rb
@@ -133,16 +133,19 @@ module StudentWorkHelper
                 link_to "继续实战", 'javascript:void(0);', :onclick => "sure_box_redirect('#{myshixun_reset_myshixun_path(myshixun)}', '实训已经更新啦，系统正在为您重置');", :class => "white-btn orange-btn fr mr10 mt8"
               end
             else
-              work_ids = "(" + homework.student_works.has_committed.map(&:id).join(",") + ")"
-              if homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 3 && User.current.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count > 0 #匿评作业，且作业状态不是在开启匿评之前
-                link_to "匿评作品", student_work_index_url_in_org(homework.id, 2), :class => 'white-btn orange-btn fr mr10 mt8', :title => "开启匿评后不可修改作品"
-              elsif homework.homework_detail_manual && homework.homework_detail_manual.comment_status > 3
-                link_to "查看作品", student_work_path(work), :class => 'white-btn orange-btn fr mr10 mt8', :title => "匿评已结束"
-              elsif homework.end_time >= Time.now && work.user_id == User.current.id
+              if homework.end_time >= Time.now && work.user_id == User.current.id
                 link_to "修改作品", edit_student_work_url_without_domain(work.id),:class => 'white-btn orange-btn fr mr10 mt8'
-              else
-                link_to "查看作品", student_work_path(work), :class => 'white-btn orange-btn fr mr10 mt8', :title => "作业截止后不可修改作品"
               end
+              # work_ids = "(" + homework.student_works.has_committed.map(&:id).join(",") + ")"
+              # if homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 3 && User.current.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count > 0 #匿评作业，且作业状态不是在开启匿评之前
+              #   link_to "匿评作品", student_work_index_url_in_org(homework.id, 2), :class => 'white-btn orange-btn fr mr10 mt8', :title => "开启匿评后不可修改作品"
+              # elsif homework.homework_detail_manual && homework.homework_detail_manual.comment_status > 3
+              #   link_to "查看作品", student_work_path(work), :class => 'white-btn orange-btn fr mr10 mt8', :title => "匿评已结束"
+              # elsif homework.end_time >= Time.now && work.user_id == User.current.id
+              #   link_to "修改作品", edit_student_work_url_without_domain(work.id),:class => 'white-btn orange-btn fr mr10 mt8'
+              # else
+              #   link_to "查看作品", student_work_path(work), :class => 'white-btn orange-btn fr mr10 mt8', :title => "作业截止后不可修改作品"
+              # end
             end
           end
       end

From d35776c9252ee78c42a6ea292b0888ac9d78e78d Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 22 Sep 2017 15:39:22 +0800
Subject: [PATCH 29/30] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E8=AF=BE=E5=A0=82?=
 =?UTF-8?q?=E7=9A=84=E6=95=99=E5=B8=88=E6=88=96=E8=80=85=E5=8A=A9=E6=95=99?=
 =?UTF-8?q?=E5=BE=85=E5=AE=A1=E6=89=B9=E6=8F=90=E9=86=92=E8=AF=B7=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=EF=BC=8C=E5=8F=A6=E5=A4=96=E6=A0=B7=E5=BC=8F=E6=9B=B4?=
 =?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/show.html.erb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb
index fa6568258..21b61ec95 100644
--- a/app/views/courses/show.html.erb
+++ b/app/views/courses/show.html.erb
@@ -8,10 +8,13 @@
 
 <input type="hidden" value="<%= @type%>" name="type" id="user_activities_type">
 <div class="homepageRight mt0 " style="width:85%; float:left;">
-  <% if User.current.admin? || User.current.alloNwed_to?(:as_teacher,@course) %>
+  <% if User.current.admin? || User.current.allowed_to?(:as_teacher,@course) %>
     <ul class="with100 mb20 ml15 clearfix df activities_btn font-16" style="width:1003px;">
       <li><%= link_to '成员管理', members_course_path(@course),:class => "color-orange03" %>
-        <!--<span class="ml10" data-tip-down="有11名助教或教师申请加入课堂，请审批"><span class="edu-cir-orange">11</span></span>-->
+        <% apply_count = CourseMessage.where(:course_id => @course.id,:course_message_type => 'JoinCourseRequest', :status => 0).count %>
+        <% if apply_count > 0 %>
+          <span class="ml10"><span class="edu-cir-orange" data-tip-down="有<%= apply_count %>名助教或教师申请加入课堂，请审批"><%= apply_count %></span></span>
+        <% end %>
       </li>
       <li><%= link_to '+&nbsp;发布普通作业'.html_safe, new_homework_common_path(:course => @course.id, :homework_type => 1),:class => "color-orange03" %></li>
       <li><%= link_to '+&nbsp;发布实训作业'.html_safe, shixuns_homework_common_index_path(:course => @course.id),:class => "color-orange03", :remote => true %></li>

From 679b5a559d059e639b10029893bfee0af2162241 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 22 Sep 2017 16:31:22 +0800
Subject: [PATCH 30/30] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=A2=98tab=E6=A0=B7=E5=BC=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/challenges/_choose_tab.html.erb    |  4 +-
 app/views/challenges/_choose_type.html.erb   | 85 +++++++++++---------
 app/views/challenges/choose_type_show.js.erb |  1 -
 public/stylesheets/css/taskstyle.css         |  4 +
 4 files changed, 55 insertions(+), 39 deletions(-)

diff --git a/app/views/challenges/_choose_tab.html.erb b/app/views/challenges/_choose_tab.html.erb
index fb5015d25..3787f5985 100644
--- a/app/views/challenges/_choose_tab.html.erb
+++ b/app/views/challenges/_choose_tab.html.erb
@@ -2,9 +2,9 @@
   <a href="<%= edit_shixun_challenge_path(@challenge, :shixun_id => @shixun) %>" class="color-black">本关任务</a>
 </li>
 <% @challenge.challenge_chooses.each_with_index do |choose, index| %>
-    <li class="fl <%= @index == index ? "check_nav" : "" %>">
+    <li class="fl <%= @index == index ? "check_nav" : "" %>" style="<%= @index == index ? "width:110px" : "flex:1" %>">
       <a href="<%= choose_type_show_shixun_challenge_path(@challenge, :shixun_id => @shixun, :choose_id => choose.id, :index => index) %>" class="color-black" data-remote="true">
         <%= (index + 1).to_s + (choose.category == 1 ? ".单选题" : ".多选题") %>
       </a>
     </li>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/challenges/_choose_type.html.erb b/app/views/challenges/_choose_type.html.erb
index 085a1e3e3..6bce64f2d 100644
--- a/app/views/challenges/_choose_type.html.erb
+++ b/app/views/challenges/_choose_type.html.erb
@@ -1,10 +1,12 @@
 <div class="stage-part-2 mt20" id="">
-  <ul class="nav_check_item border-bottom-orange clearfix" style="margin-bottom: 0px">
-    <div id="challenge_choose_tab">
+  <ul class="nav_option border-bottom-orange clearfix" style="margin-bottom: 0px">
+    <div id="challenge_choose_tab" class="fl df" style="width: 1015px;">
       <%= render :partial => "challenges/choose_tab" %>
     </div>
-    <a href="javascript:void(0)" class="fr white-btn green-btn white_bg addoption-btn">+&nbsp;多选题</a>
-    <a href="javascript:void(0)" class="fr mr10 white-btn green-btn white_bg addoption-btn">+&nbsp;单选题</a>
+    <div class="fr option_item_con">
+      <a href="javascript:void(0)" class="mr10 white-btn green-btn white_bg addoption-btn mt5">+&nbsp;单选题</a>
+      <a href="javascript:void(0)" class="white-btn green-btn white_bg addoption-btn mt5">+&nbsp;多选题</a>
+    </div>
   </ul>
   <div id="task_content" class="task-pm-box mh550 user_bg_shadow">
     <div class="panel-form" id="task_show_page">
@@ -41,6 +43,7 @@
   <%#= render :partial => 'single_or_multiple_question_show'%>
 </div>
 <script>
+
   editormd.loadKaTeX(function() {
       var taskPassMD = editormd.markdownToHTML("challenge_task_pass_show", {
           htmlDecode: "style,script,iframe",  // you can filter tags decode
@@ -52,41 +55,49 @@
   });
     //添加单选、多选tab
     $(".addoption-btn").on("click",function(){
-        var len= $(".stage-part-2").find(".nav_check_item li").length;
-        for(var i = 1; i < len; i ++){
-            if($(".stage-part-2").find(".nav_check_item li a").eq(i).attr("href") == "javascript:void(0)"){
-                $(".stage-part-2").find(".nav_check_item li").eq(i).remove()
+        var length= $(".stage-part-2").find(".nav_option li").length;
+       for(var i = 1; i < length; i ++){
+            if($(".stage-part-2").find(".nav_option li a").eq(i).attr("href") == "javascript:void(0)"){
+                $(".stage-part-2").find(".nav_option li").eq(i).remove();
+                length--;
             }
         }
-        var length= $(".stage-part-2").find(".nav_check_item li").length;
-        if(length<11){
-            var title=$(this).html();
-            var category = title.indexOf("多选")>0 ? 2 : 1;
-            if(title.indexOf("多选")>0){//多选
-                title="多选题";
-            }else{
-                title="单选题";
-            }
-            var li_con=length+".<span>"+title+"</span>";
-            var html="<li class=\"fl check_nav\"><a href=\"javascript:void(0)\" class=\"color-black\">"+li_con+"</a></li>";
-            $(".stage-part-2").find(".nav_check_item li").removeClass("check_nav");
-            $(".stage-part-2").find(".nav_check_item li").eq(length-1).after(html);
-            $.ajax({
-                url: "<%= add_choose_question_shixun_challenge_path(@challenge, :shixun_id => @shixun) %>",
-                dateType: "script",
-                data: {category: category, position: length},
-                success: function(){
-                }
-            })
+        var title=$(this).html();
+        var category = title.indexOf("多选")>0 ? 2 : 1;
+        if(title.indexOf("多选")>0){//多选
+            title="多选题";
+        }else{
+            title="单选题";
         }
+        var li_con=length+".<span>"+title+"</span>";
+        var html="<li class=\"fl check_nav\"><a href=\"javascript:void(0)\" class=\"color-black\">"+li_con+"</a></li>";
+        $(".stage-part-2").find(".nav_option li").removeClass("check_nav");
+        $(".stage-part-2").find(".nav_option li").removeAttr("style");
+        for(var i=1;i<$(".stage-part-2").find(".nav_option li").length;i++){
+            $(".stage-part-2").find(".nav_option li").eq(i).attr("style","flex:1");
+        }
+
+
+        $(".stage-part-2").find(".nav_option li").eq(length-1).after(html);
+
+        $.ajax({
+            url: "<%= add_choose_question_shixun_challenge_path(@challenge, :shixun_id => @shixun) %>",
+            dateType: "script",
+            data: {category: category, position: length},
+            success: function(){
+            }
+        })
+
+
        // editor_tigan();
     });
+
     //删除单选、多选tab
     $(".deloption-btn").on("click",function(){
         var index=0;
-        for(var i=1;i<$(".stage-part-2").find(".nav_check_item li").length;i++){
-            var length=$(".stage-part-2").find(".nav_check_item li").length;
-            var item=$(".stage-part-2").find(".nav_check_item li");
+        for(var i=1;i<$(".stage-part-2").find(".nav_option li").length;i++){
+            var length=$(".stage-part-2").find(".nav_option li").length;
+            var item=$(".stage-part-2").find(".nav_option li");
             if(item.eq(i).hasClass("check_nav")){
                 if(length>1){
                     item.eq(0).addClass("check_nav");
@@ -95,16 +106,18 @@
 
             }
         }
-        for(var i=1;i<$(".stage-part-2").find(".nav_check_item li").length;i++){
-            var item=$(".stage-part-2").find(".nav_check_item li");
+        for(var i=1;i<$(".stage-part-2").find(".nav_option li").length;i++){
+            var item=$(".stage-part-2").find(".nav_option li");
             item.eq(i).html(i+".<span>"+item.eq(i).find("span").html()+"</span>");
         }
     })
     //第二个ul tab的切换事件
-    $(".stage-part-2").find(".nav_check_item li a").live("click",function(){
-        if($(".nav_check_item li").length>1){
-            $(".nav_check_item li").removeClass("check_nav");
+    $(".stage-part-2").find(".nav_option li a").live("click",function(){
+        if($(".nav_option li").length>1){
+            $(".nav_option li").removeClass("check_nav");
             $(this).parent().addClass("check_nav");
+            $(this).parent().removeAttr("style")
+            $(this).parent().attr("style","flex:1");
         }
     })
 
diff --git a/app/views/challenges/choose_type_show.js.erb b/app/views/challenges/choose_type_show.js.erb
index 402097644..3d062efc1 100644
--- a/app/views/challenges/choose_type_show.js.erb
+++ b/app/views/challenges/choose_type_show.js.erb
@@ -1,6 +1,5 @@
 $("#task_content").html("<%= j(render :partial => 'single_or_multiple_question_show')%>");
 $("#challenge_choose_tab").html("<%= j(render :partial => "challenges/choose_tab") %>");
-
 /*
 // JS局部刷新时，有可能加载不成功，需要重新加载一次（具体原因不明）
 editormd.loadKaTeX(function() {
diff --git a/public/stylesheets/css/taskstyle.css b/public/stylesheets/css/taskstyle.css
index baa656344..927835b6f 100644
--- a/public/stylesheets/css/taskstyle.css
+++ b/public/stylesheets/css/taskstyle.css
@@ -417,3 +417,7 @@ html>body #ajax-indicator-base { position: fixed; }
 .empty{background: #494A4C;display: inline; margin: 0 2px; padding: 0 3px;}
 .tab-key{background: #494A4C;display: inline; margin: 0 2px; padding: 0 6px;}
 .nav_check_item li{padding: 0px 17px!important;}
+
+/*选择题tab切换*/
+.nav_option li{overflow: hidden;width: 110px; text-align: center;cursor: pointer;height: 38px;line-height: 38px;border-top-right-radius: 5px;border-top-left-radius: 5px;border:1px solid #e2e2e2;border-bottom: 0px;color: #FF7500;border-right: none;}
+.nav_option li:last-child{border-right: 1px solid #e2e2e2;}
\ No newline at end of file