From a4953c3a5ac623e180b61d1ae74616ef6d2c8bbd Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 29 Sep 2015 11:02:46 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E5=8C=BF=E8=AF=84=E5=A4=B1=E8=B4=A5=E5=8F=91=E9=80=81=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E6=96=B9=E6=B3=95=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 52b7242dd..a8ba4f4ee 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -89,7 +89,7 @@ class Mailer < ActionMailer::Base
     recipients ||= []
     # 只给该课程的老师发送邮件提醒
     course.members.each do |member|
-      if m.user.allowed_to?(:as_teacher,course)
+      if member.user.allowed_to?(:as_teacher,course)
         user = User.find(member.user_id)
         #@subject = "[#{l(:mail_homework)} #{homework_common.name}]  #{l(:mail_anonymous_comment_failed)}"
         @token = Token.get_token_from_user(user, 'autologin')

From 774b00f2d446f96e0bdcf00d79c5ccfa206eb391 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 29 Sep 2015 11:19:53 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=81=E7=A7=BB?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/migrate/20150925025200_alter_activities.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/db/migrate/20150925025200_alter_activities.rb b/db/migrate/20150925025200_alter_activities.rb
index 638918e8e..8a5480617 100644
--- a/db/migrate/20150925025200_alter_activities.rb
+++ b/db/migrate/20150925025200_alter_activities.rb
@@ -4,7 +4,7 @@ class AlterActivities < ActiveRecord::Migration
       if activity.act_type == 'JournalsForMessage'
         if activity.act
           unless activity.act.m_parent_id.nil?
-            parent_act = UserActivity.where("act_id = #{activity.act.parent.id} and act_type='JournalsForMessage' and container_type='Course'").first
+            parent_act = UserActivity.where("act_id = #{activity.act.m_parent_id} and act_type='JournalsForMessage' and container_type='Course'").first
             if parent_act
               parent_act.created_at = activity.act.parent.children.maximum("created_on")
               parent_act.save
@@ -21,7 +21,7 @@ class AlterActivities < ActiveRecord::Migration
         if activity.course_act_type == 'JournalsForMessage'
           if activity.course_act
             unless activity.course_act.m_parent_id.nil?
-              parent_act = CourseActivity.where("course_act_id = #{activity.course_act.parent.id} and course_act_type='JournalsForMessage'").first
+              parent_act = CourseActivity.where("course_act_id = #{activity.course_act.m_parent_id} and course_act_type='JournalsForMessage'").first
               if parent_act
                 parent_act.created_at = activity.course_act.parent.children.maximum("created_on")
                 parent_act.save
@@ -34,7 +34,7 @@ class AlterActivities < ActiveRecord::Migration
         elsif activity.course_act_type == 'Message'
           if activity.course_act
             unless activity.course_act.parent_id.nil?
-              parent_act = CourseActivity.where("course_act_id = #{activity.course_act.parent.id} and course_act_type='Message'").first
+              parent_act = CourseActivity.where("course_act_id = #{activity.course_act.parent_id} and course_act_type='Message'").first
               if parent_act
                 parent_act.created_at = activity.course_act.parent.children.maximum("created_on")
                 parent_act.save

From 1f77b0587976b26e910d23369ead201dce855ae2 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 29 Sep 2015 14:16:27 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=98=AF=E8=87=AA?=
 =?UTF-8?q?=E5=B7=B1=E5=8F=91=E5=B8=83=E7=9A=84=E4=BD=9C=E4=B8=9A=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=EF=BC=8C=E6=8F=90=E7=A4=BA=E8=AF=AD=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E2=80=9C=E6=82=A8=E2=80=9D,=E8=80=8C=E9=9D=9E=E6=9F=90?=
 =?UTF-8?q?=E6=9F=90=E8=80=81=E5=B8=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_message_course.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index 7d6044e64..809a87085 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -138,7 +138,7 @@
           <div style="display: none" class="message_title_red system_message_style">
             <p>
               <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师' : '同学' %>您好！
-              <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师开启了匿评，作业详情如下：
+              <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>开启了匿评，作业详情如下：
             </p>
             <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
             <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
@@ -164,7 +164,7 @@
           <div  style="display: none" class="message_title_red system_message_style">
             <p>
               <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好！
-              <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师关闭了匿评，作业详情如下：
+              <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>关闭了匿评，作业详情如下：
             </p>
             <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
             <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>

From 515e2be4f85e95d6893ccb12c004e77287665498 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 29 Sep 2015 14:23:50 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=86=85=E7=9A=84?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8=E5=8C=BF=E8=AF=84=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E7=A1=AE=E5=AE=9A=E6=8C=89=E9=92=AE=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/course.js | 204 +++++++++++++++++++++--------------
 1 file changed, 123 insertions(+), 81 deletions(-)

diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 4a6f10360..46a98ed6d 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -446,63 +446,45 @@ function check_late_penalty(id)
 }
 
 //验证匿评数量
-function regex_evaluation_num()
-{
-    if($("#evaluation_num").length == 0){ return true;}
-    var evaluation_num = $.trim($("#evaluation_num").val());
-    var regex = /^\d+$/;
-    if(evaluation_num=="")
-    {
-        $("#evaluation_num_notice").html("匿评分配数量不能为空");
-        $("#evaluation_num_notice").removeClass("c_red").addClass("c_red");
-        return false;
-    }
-    else if(regex.test(evaluation_num))
-    {
-        if(evaluation_num > 0)
-        {
-            $("#evaluation_num_notice").html("每个学生将收到<span class='c_red'>&nbsp;"+ parseInt(evaluation_num) + "&nbsp;</span>份待匿评作品");
-            $("#evaluation_num_notice").removeClass("c_red");
-            return true;
-        }
-        else
-        {
-            $("#evaluation_num_notice").html("匿评分配数量必须为大于0");
-            $("#evaluation_num_notice").removeClass("c_red").addClass("c_red");
-            return false;
-        }
-    }
-    else
-    {
-        $("#evaluation_num_notice").html("匿评分配数量只能为数字");
-        $("#evaluation_num_notice").removeClass("c_red").addClass("c_red");
-        return false;
-    }
-}
+//function regex_evaluation_num()
+//{
+//    if($("#evaluation_num").length == 0){ return true;}
+//    var evaluation_num = $.trim($("#evaluation_num").val());
+//    var regex = /^\d+$/;
+//    if(evaluation_num=="")
+//    {
+//        $("#evaluation_num_notice").html("匿评分配数量不能为空");
+//        $("#evaluation_num_notice").removeClass("c_red").addClass("c_red");
+//        return false;
+//    }
+//    else if(regex.test(evaluation_num))
+//    {
+//        if(evaluation_num > 0)
+//        {
+//            $("#evaluation_num_notice").html("每个学生将收到<span class='c_red'>&nbsp;"+ parseInt(evaluation_num) + "&nbsp;</span>份待匿评作品");
+//            $("#evaluation_num_notice").removeClass("c_red");
+//            return true;
+//        }
+//        else
+//        {
+//            $("#evaluation_num_notice").html("匿评分配数量必须为大于0");
+//            $("#evaluation_num_notice").removeClass("c_red").addClass("c_red");
+//            return false;
+//        }
+//    }
+//    else
+//    {
+//        $("#evaluation_num_notice").html("匿评分配数量只能为数字");
+//        $("#evaluation_num_notice").removeClass("c_red").addClass("c_red");
+//        return false;
+//    }
+//}
 
 //点击是否开启匿评单选框效果
 $(function(){
-    //$("#homework_common_homework_type").click(function(){
-    //    if($("#homework_common_homework_type").attr("checked") == "checked")
-    //    {
-    //        $("#evaluation_setting").slideDown();
-    //        $("#ta_proportion").removeAttr("disabled");
-    //    }
-    //    else
-    //    {
-    //        $("#evaluation_setting").slideUp();
-    //        $("#ta_proportion").attr("disabled","disabled");
-    //    }
-    //});
-
     $("#absence_penalty").change(function(){
         $("#absence_penalty_notice").html("&nbsp;"+ $("#absence_penalty").val() +"&nbsp;");
     });
-
-    //$("#ta_proportion").change(function(){
-    //    var ta_proportion = $("#ta_proportion").val();
-    //    $("#student_proportion").val((100 - parseInt(ta_proportion * 100)) + "%");
-    //});
 });
 
 //生成select
@@ -519,41 +501,101 @@ function build_selector(max_num){
     return html;
 }
 
-//第一次加载时，如果未开启匿评作业，隐藏显示匿评配置信息
-//$(function(){
-//    if($("#homework_common_homework_type").attr("id") != null && $("#homework_common_homework_type").val() != 2)
-//    {
-//        if($("#homework_common_homework_type").attr("checked") == "checked")
-//        {
-//            $("#evaluation_setting").show();
-//            $("#ta_proportion").removeAttr("disabled");
-//        }
-//        else
-//        {
-//            $("#evaluation_setting").hide();
-//            $("#ta_proportion").attr("disabled","disabled");
-//        }
-//    }
-//});
-
-//老师提交 新建/修改 作业
-function submit_homework(id)
-{
-    if(!regex_homework_name())
-    {
-        $("#homework_name").focus();
+//提交匿评参数设置
+function submit_set_evaluation_attr(end_time){
+    if(!regex_evaluation_start(end_time)){
+        $("#evaluation_start_time").focus();
     }
-    else if(!regex_evaluation_num())
-    {
+    else if(!regex_evaluation_end()){
+        $("#evaluation_end_time").focus();
+    }
+    else if(!regex_evaluation_num()){
         $("#evaluation_num").focus();
     }
-    else
-    {
-        homework_description_editor.sync();
-        $("#"+id).submit();
+    else{
+        $('#popbox02 form').submit();
+    }
+}
+
+//验证匿评开启时间：大于截止时间,或者为空
+function regex_evaluation_start(end_time){
+    var evaluation_start = $.trim($("#evaluation_start_time").val());
+    if(evaluation_start == ""){
+        $("#homework_evaluation_start_time").text("开启匿评日期不能为空");
+        return false;
+    }
+    var end_time = new Date(end_time);
+    var evaluation_start_time = new Date(evaluation_start);
+    if(evaluation_start_time > end_time){
+        $("#homework_evaluation_start_time").text("");
+        return true;
+    }else{
+        $("#homework_evaluation_start_time").text("开启匿评日期必须大于截止日期");
+        return false;
+    }
+}
+
+//验证匿评结束时间：大于匿评开启时间,或者为空。当匿评开启时间为空时，匿评结束时间必须为空
+function regex_evaluation_end(){
+    var evaluation_start = $.trim($("#evaluation_start_time").val());
+    var evaluation_end = $.trim($("#evaluation_end_time").val());
+    if(evaluation_end == ""){
+        $("#homework_evaluation_end_time").text("关闭匿评日期不能为空");
+        return true;
+    }
+    var evaluation_start_time = new Date(evaluation_start);
+    var evaluation_end_time = new Date(evaluation_end);
+    if(evaluation_end_time > evaluation_start_time){
+        $("#homework_evaluation_end_time").text("");
+        return true;
+    }else{
+        $("#homework_evaluation_end_time").text("关闭匿评日期必须大于开启匿评日期");
+        return false;
+    }
+}
+
+//验证匿评数量
+function regex_evaluation_num(){
+    var evaluation_num = $.trim($("#evaluation_num").val());
+    var regex = /^\d+$/;
+    if(evaluation_num==""){
+        $("#evaluation_num_notice").text("匿评人数不能为空");
+        return false;
+    }
+    else if(regex.test(evaluation_num)){
+        if(evaluation_num > 0){
+            $("#evaluation_num_notice").html("");
+            return true;
+        }
+        else{
+            $("#evaluation_num_notice").text("匿评人数必须为大于0");
+            return false;
+        }
+    }
+    else{
+        $("#evaluation_num_notice").text("匿评人数只能为数字");
+        return false;
     }
 }
 
+//老师提交 新建/修改 作业
+//function submit_homework(id)
+//{
+//    if(!regex_homework_name())
+//    {
+//        $("#homework_name").focus();
+//    }
+//    else if(!regex_evaluation_num())
+//    {
+//        $("#evaluation_num").focus();
+//    }
+//    else
+//    {
+//        homework_description_editor.sync();
+//        $("#"+id).submit();
+//    }
+//}
+
 function regexHomeworkCommonName()
 {
     var name = $.trim($("#homework_attach_name").val());
@@ -661,7 +703,7 @@ $(document).ready(function () {
 // 日历选择日期后关闭
 function regexDeadLine()
 {
-    ('#ui-datepicker-div').hide;
+    ('#ui-datepicker-div').hide();
 }
 
 //新建、修改课程明码显示

From b22669e36fa9c34413a83216564e778326996bdf Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 29 Sep 2015 14:50:29 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/avatar/_new_avatar_form.html.erb | 7 +++----
 public/stylesheets/courses.css             | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/views/avatar/_new_avatar_form.html.erb b/app/views/avatar/_new_avatar_form.html.erb
index 64abfbc30..de3bf2b65 100644
--- a/app/views/avatar/_new_avatar_form.html.erb
+++ b/app/views/avatar/_new_avatar_form.html.erb
@@ -1,11 +1,10 @@
 <a href="javascript:void(0)" class="upimg fl">
   <%= image_tag(url_to_avatar(source), id: "avatar_image", :width =>"60", :height =>"60",:alt=>"上传图片")%>
 </a>
-<%#= link_to l(:button_delete_file),{:controller => :avatar,:action => :delete_image,:remote=>true,:source_type=> source.class,:source_id=>source.id},:confirm => l(:text_are_you_sure), :method => :post, :class => "upbtn fl" %>
-<a href="javascript:void(0)" class="upbtn fl"><%= l(:button_upload_photo) %></a>
+<a href="javascript:void(0)" class="upbtn fl" onclick="$('#upload_img').click();"><%= l(:button_upload_photo) %></a>
 <%= file_field_tag 'avatar[image]',
-                   :id => nil,
-                   :class => 'upload_file',
+                   :id => "upload_img",
+                   :class => 'undis',
                    :size => "1",
                    :multiple => true,
                    :data => {
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index ff6fdb32a..8661626c8 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -163,7 +163,7 @@ a.f_grey:hover {color:#000000;}
 .resourcesIcon {margin-top:15px; display:block; width:25px; height:20px;}
 .nolink_btn{ background:#BCBCBC; color: #fff; padding:2px 5px;}
 .more_btn{-moz-border-radius:3px;  -webkit-border-radius:3px; border:1px solid #9DCEFF; color:#9DCEFF;  border-radius:3px; padding:0px 3px;}
-.upbtn{ margin:42px 0 0 10px; border:none; color:#999; width:150px;}
+/*.upbtn{ margin:42px 0 0 10px; border:none; color:#999; width:150px;}*/
 .red_btn_cir{ background:#e74c3c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
 .green_btn_cir{ background:#28be6c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
 .grey_btn_cir{ background:#b2b2b2; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
@@ -511,7 +511,7 @@ a:hover.st_add{ color:#ff8e15;}
 .upimg{ border:1px solid  #eaeaea; display:block; width:60px; height:60px; padding:1px;}
 .upimg:hover{ border:1px solid #64bdd9; }
 .upbtn{ margin:40px 0 0 15px; display:block; padding:2px 5px; border:1px solid #eaeaea;}
-.upbtn:hover{border:1px solid #64bdd9; color:#64bdd9;cursor: pointer;}
+.upbtn:hover{color:#64bdd9;cursor: pointer;}
 .upload_file{margin-left: -60px;margin-top: 40px;width: 50px;position: absolute;height: 24px;opacity: 0;cursor: pointer}
 /* 功能倒计时*/
 .w_img{ float:left; margin:10px 10px 15px 0px;}

From 138b24b34cc61b396a57ded981ba80d20dc7c99f Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Tue, 29 Sep 2015 15:13:05 +0800
Subject: [PATCH 06/11] =?UTF-8?q?oschina=E6=A8=A1=E5=BC=8F=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=92=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base.html.erb               |   2 +-
 app/views/layouts/base_courses.html.erb       |   2 +-
 app/views/layouts/base_forums.html.erb        |   2 +-
 app/views/layouts/base_projects.html.erb      |   2 +-
 app/views/layouts/base_users_new.html.erb     |   2 +-
 app/views/layouts/new_base.html.erb           |   2 +-
 app/views/layouts/new_base_user.html.erb      |   2 +-
 app/views/layouts/users_base.html.erb         |   2 +-
 public/assets/kindeditor/kindeditor.js        |   6 +-
 .../kindeditor/plugins/code/previewcode.css   | 110 +++++++-----------
 10 files changed, 50 insertions(+), 82 deletions(-)

diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index fbc545607..489820f0c 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -19,7 +19,7 @@
 <%= yield :header_tags -%>
   <%= stylesheet_link_tag 'base','header', :media => 'all'%>
 </head>
-<body class="<%=h body_css_classes %>">
+<body class="<%=h body_css_classes %>" onload="prettyPrint();">
 
 <div class="cl"></div>
 <div class="navContainer mb10">
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 4dd5b0b27..7499b7f33 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -23,7 +23,7 @@
   <%= yield :header_tags -%>
 </head>
 <!--add by huang-->
-<body>
+<body onload="prettyPrint();">
 <div class="navContainer mb10">
   <% if User.current.logged? %>
       <%= render :partial => 'layouts/logined_header' %>
diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index 9faecd964..54edaa455 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -130,7 +130,7 @@
         }
     </script>
 	</head>
-	<body class="<%= h body_css_classes %>">
+	<body class="<%= h body_css_classes %>" onload="prettyPrint();">
 
     <div class="cl"></div>
     <div class="navContainer mb10">
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index c9bc68c33..02085b95a 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -21,7 +21,7 @@
 
 </head>
 <!--add by huang-->
-<body onload=" ">
+<body onload="prettyPrint();">
 <div class="navContainer mb10">
   <% if User.current.logged? %>
       <%= render :partial => 'layouts/logined_header' %>
diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb
index 9f77b248d..bb5dcbde2 100644
--- a/app/views/layouts/base_users_new.html.erb
+++ b/app/views/layouts/base_users_new.html.erb
@@ -25,7 +25,7 @@
 
 
 </head>
-<body>
+<body onload="prettyPrint();">
 <div id="Container">
   <%= render :partial => 'layouts/base_header_new'%>
   <div id="TopBar">
diff --git a/app/views/layouts/new_base.html.erb b/app/views/layouts/new_base.html.erb
index 98eea13bf..6ab83d393 100644
--- a/app/views/layouts/new_base.html.erb
+++ b/app/views/layouts/new_base.html.erb
@@ -19,7 +19,7 @@
   <%= yield :header_tags -%>
 </head>
 <!--add by huang-->
-<body>
+<body onload="prettyPrint();">
 
 <div class="navContainer mb10">
   <% if User.current.logged? %>
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 7583eb4a4..b175d8a2f 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -16,7 +16,7 @@
   <%= yield :header_tags -%>
 </head>
 
-<body>
+<body onload="prettyPrint();">
 <div class="navContainer">
   <% is_current_user = User.current.logged? && User.current == @user%>
   <% if User.current.logged? %>
diff --git a/app/views/layouts/users_base.html.erb b/app/views/layouts/users_base.html.erb
index 6c1edbd1b..2078636dd 100644
--- a/app/views/layouts/users_base.html.erb
+++ b/app/views/layouts/users_base.html.erb
@@ -18,7 +18,7 @@
   <%= yield :header_tags -%>
   <%= stylesheet_link_tag 'base','header','new_user' ,:media => 'all'%>
 </head>
-<body>
+<body onload="prettyPrint();">
 <div class="cl"></div>
 <div class="navContainer mb10">
   <% if User.current.logged? %>
diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index b045a27cc..645767e87 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -264,7 +264,7 @@ K.options = {
 	minHeight : 100,
 	minChangeSize : 50,
 	zIndex : 811213,
-	items : ['emoticons','fontname',
+	items : ['code','emoticons','fontname',
         'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist','insertunorderedlist', '|',
 		'formatblock', 'fontsize', '|','indent', 'outdent',
 		 '|','imagedirectupload','table',   'media', 'preview',"more"
@@ -4986,7 +4986,7 @@ KEditor.prototype = {
         htmlList.unshift('<div style="display:block" id="define"/>')
         htmlList.push('</div>')
         var htmlListFull = [];
-        var fullItems =  ['emoticons','fontname',
+        var fullItems =  ['code','emoticons','fontname',
             'forecolor', 'hilitecolor', 'bold','|', 'justifyleft', 'justifycenter',  'insertorderedlist', 'insertunorderedlist', '|',
             'formatblock', 'fontsize', '|', 'indent', 'outdent',
               '|','imagedirectupload','table',   'media', 'preview', "less",
@@ -5068,7 +5068,7 @@ KEditor.prototype = {
 					}
 					self.updateState();
 					self.addBookmark();
-                    prettyPrint("",self.edit.doc.body);
+                    //prettyPrint("",self.edit.doc.body);
 					if (self.options.afterChange) {
 						self.options.afterChange.call(self);
 					}
diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css
index f67f04149..5cb46628b 100644
--- a/public/assets/kindeditor/plugins/code/previewcode.css
+++ b/public/assets/kindeditor/plugins/code/previewcode.css
@@ -1,79 +1,47 @@
-/* Pretty printing styles. Used with prettify.js. */
-
-/* SPAN elements with the classes below are added by prettyprint. */
-.pln { color: #000 }  /* plain text */
-
-@media screen {
-    .str { color: #080 }  /* string content */
-    .kwd { color: #008 }  /* a keyword */
-    .com { color: #800 }  /* a comment */
-    .typ { color: #606 }  /* a type name */
-    .lit { color: #066 }  /* a literal value */
-    /* punctuation, lisp open bracket, lisp close bracket */
-    .pun, .opn, .clo { color: #660 }
-    .tag { color: #008 }  /* a markup tag name */
-    .atn { color: #606 }  /* a markup attribute name */
-    .atv { color: #080 }  /* a markup attribute value */
-    .dec, .var { color: #606 }  /* a declaration; a variable name */
-    .fun { color: red }  /* a function name */
+.ke-content {
+    font-size: 10pt;
+}
+.ke-content pre {
+    font-size:9pt;
+    font-family:Courier New,Arial;
+    border:1px solid #ddd;
+    border-left:5px solid #6CE26C;
+    background:#f6f6f6;
+    padding:5px;
 }
 
-/* Use higher contrast and text-weight for printable form. */
-@media print, projection {
-    .str { color: #060 }
-    .kwd { color: #006; font-weight: bold }
-    .com { color: #600; font-style: italic }
-    .typ { color: #404; font-weight: bold }
-    .lit { color: #044 }
-    .pun, .opn, .clo { color: #440 }
-    .tag { color: #006; font-weight: bold }
-    .atn { color: #404 }
-    .atv { color: #060 }
+.ke-content code {
+    margin: 0 2px;
+    padding: 0 5px;
+    white-space: nowrap;
+    border: 1px solid #DDD;
+    background-color: #F6F6F6;
+    border-radius: 3px;
 }
 
-/* Put a border around prettyprinted code snippets. */
-pre.prettyprint { padding: 2px;
-    border-left:1px solid #ccc;
-    border-bottom: 1px solid #ccc;
-    border-right: 1px solid #ccc,
-border-top: 1px solid #ccc }
+.ke-content pre>code {
+    margin: 0;
+    padding: 0;
+    white-space: pre;
+    border: none;
+    background: transparent;
+}
 
-pre li,ol li {
-    list-style-type: decimal;
+.ke-content pre code {
+    background-color: transparent;
+    border: none;
 }
-ul li{
-    list-style-type: disc;
+
+.ke-content p {
+    margin: 0 0 15px 0;
+    margin-bottom:15pt;
+    line-height:1.5;
+    letter-spacing: 1px;
 }
-/* Specify class=linenums on a pre to get line numbering */
-ol.linenums { margin-top: 0; margin-bottom: 0 } /* IE indents via margin-left */
-li.L0,
-li.L1,
-li.L2,
-li.L3,
-li.L5,
-li.L6,
-li.L7,
-li.L8 { list-style-type: decimal }
-/* Alternate shading for lines */
-li.L1,
-li.L3,
-li.L5,
-li.L7,
-li.L9 { background: #eee }
 
-.prettyprint *{font-family:'courier new',monospace;}
-/*.prettyprint .com { color: #93a1a1; }*/
-/*.prettyprint .lit { color: #AE81FF; }*/
-/*.prettyprint .pun,*/
-/*.prettyprint .opn,*/
-/*.prettyprint .clo { color: #F8F8F2; }*/
-/*.prettyprint .fun { color: #dc322f; }*/
-/*.prettyprint .str,*/
-/*.prettyprint .atv { color: #E6DB74; }*/
-/*.prettyprint .kwd,*/
-/*.prettyprint .tag { color: #F92659; }*/
-/*.prettyprint .typ,*/
-/*.prettyprint .atn,*/
-/*.prettyprint .dec,*/
-/*.prettyprint .var { color: #A6E22E; }*/
-/*.prettyprint .pln { color: #66D9EF; }*/
+.ke-content div.ref {border:1px solid #ddd;margin:0 0 10px 0;padding:2px;font-size:9pt;background:#ffe;}
+.ke-content div.ref h4 {margin:0;padding:1px 3px;background:#CC9966;color:#fff;font-size:9pt;font-weight:normal;}
+.ke-content div.ref .ref_body {margin:0;padding:2px;line-height:20px;color:#666;font-size:9pt;}
+
+
+.ke-content blockquote {margin:15px 10px;border:2px solid #eee;padding:5px 5px 5px 35px;background:#f4f5f7 url('../img/blockquote.gif') no-repeat left top;color:#060;font-size:9pt;}
\ No newline at end of file

From ab82fff1a02c6cd18cfc9a21070c08c7e08a9e9c Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 29 Sep 2015 15:15:00 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E4=BF=AE=E6=94=B9=E2=80=9C=E8=AF=84=E8=AE=BA?=
 =?UTF-8?q?=E4=BA=86=E9=80=9A=E7=9F=A5=E2=80=9D=E7=9A=84=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E5=92=8Ctips?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_message_course.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index 809a87085..a95645571 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -23,15 +23,15 @@
           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %></a></li>
           <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">评论了通知：</span></li>
           <li class="homepageNewsContent fl">
-            <%= link_to ma.course_message.comments.html_safe, {:controller => 'news', :action => 'show', :id => ma.course_message.commented.id },
+            <%= link_to  ma.course_message.commented.title, {:controller => 'news', :action => 'show', :id => ma.course_message.commented.id },
                         :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
                         :onmouseover =>"message_titile_show($(this),event)",
                         :onmouseout => "message_titile_hide($(this))" %></li>
           <div  style="display: none" class="message_title_red system_message_style">
-            <p><strong>标题：</strong><%= ma.course_message.commented.title %></p>
+            <p><strong>评论对象：</strong><%= ma.course_message.commented.title %></p>
             <% unless ma.course_message.comments.nil? %>
-                <div class="fl"><strong>内容：</strong></div>
-                <div class="ml36"><%= ma.course_message.comments.html_safe %></div>
+                <div class="fl"><strong>评论内容：</strong></div>
+                <div class="ml60"><%= ma.course_message.comments.html_safe %></div>
             <% end %>
           </div>
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>

From 16333d69f7a628b420002a4c5ec4e148e3751a37 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 29 Sep 2015 15:20:33 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/files_controller.rb | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 7b81d12db..0f8330afe 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -176,12 +176,6 @@ class FilesController < ApplicationController
 
   def index
     @flag = params[:flag] || false
-    #sort_init 'filename', 'asc'
-    # sort_init 'created_on', 'desc'
-    # sort_update   'created_on' => "#{Attachment.table_name}.created_on",
-    #               'filename' => "#{Attachment.table_name}.filename",
-    #               'size' => "#{Attachment.table_name}.filesize",
-    #               'downloads' => "#{Attachment.table_name}.downloads"
     sort = ""
     @sort = ""
     @order = ""

From c8b5ccdd344198356c9e16a4d5b080dd359a57e5 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Tue, 29 Sep 2015 15:23:09 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E8=A1=8C=E9=AB=98=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/public/stylesheets/prettify.css b/public/stylesheets/prettify.css
index ffd4802fb..8e50cf32f 100644
--- a/public/stylesheets/prettify.css
+++ b/public/stylesheets/prettify.css
@@ -43,7 +43,7 @@ pre li,ul,ol {
 }
 
 /* Specify class=linenums on a pre to get line numbering */
-ol.linenums { margin-top: 0; margin-bottom: 0;line-height: 3px } /* IE indents via margin-left */
+ol.linenums { margin-top: 0; margin-bottom: 0;line-height: 10px } /* IE indents via margin-left */
 li.L0,
 li.L1,
 li.L2,

From 971ff1e6923701fae6c2a323e92d45ecd5fa17e6 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Tue, 29 Sep 2015 15:24:15 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E8=B4=B4=E5=90=A7=E7=82=B9=E8=B5=9E?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_forums.html.erb | 2 +-
 app/views/memos/show.html.erb          | 8 ++++----
 public/stylesheets/new_user.css        | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index 5a58993ce..b884517fa 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -133,7 +133,7 @@
 	<body class="<%= h body_css_classes %>">
 
     <div class="cl"></div>
-    <div class="navContainer mb10">
+    <div class="navContainer">
       <% if User.current.logged? %>
           <%= render :partial => 'layouts/logined_header' %>
       <% else%>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index b42bc9523..f2ab0c525 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -58,11 +58,11 @@
         </ul>
       </div>
       <%end%>
-      <div class="postDetailTitle">
-        <a href="javascript:void(0);" class="f14 linkGrey4 fb" style="word-break: break-all; word-wrap:break-word;white-space:pre-wrap;">主题: <%= @memo.subject%></a>
-        <%= render :partial => "memos/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%>
-        <div class="cl"></div>
+      <div class="postDetailTitle fl">
+        <a href="javascript:void(0);" class="f14 linkGrey4 fb" style="overflow:hidden;">主题: <%= @memo.subject%></a>
       </div>
+      <%= render :partial => "memos/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%>
+      <div class="cl"></div>
 
       <div class="postDetailCreater"><a href="javascript:void(0);" class="linkBlue2" target="_blank"><%= @memo.author.name%></a></div>
       <div class="postDetailDate mb5"><%= format_date( @memo.created_at)%></div>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 95e9fd227..d55da7e75 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -663,7 +663,7 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;}
 .homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}
 a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;}
-a.postOptionLink:hover {color:#ffffff; background-color:#15bccf;}
+a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyPortrait {float:left; width:33px;}
 .imageFuzzy {filter:alpha(opacity=50); -moz-opacity:0.5; -khtml-opacity:0.5;opacity: 0.5;}
 .homepagePostReplyDes {float:left; width:632px; margin-left:15px;}
@@ -796,7 +796,7 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re
 .postDetailRow {width:720px; border-bottom:1px solid #efefef; padding:15px 0;}
 .postDetailPortrait {width:50px; height:50px; float:left; margin-right:15px;}
 .postDetailWrap {width:580px; float:left;}
-.postDetailTitle {width:650px; max-width:650px; margin-bottom:5px;}
+.postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;}
 .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}

From 81092a7e32b370cb9e3bf390f4d03b0c6c843b33 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Tue, 29 Sep 2015 15:24:50 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E8=A1=8C=E9=AB=98=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/public/stylesheets/prettify.css b/public/stylesheets/prettify.css
index 8e50cf32f..c7d16ffd4 100644
--- a/public/stylesheets/prettify.css
+++ b/public/stylesheets/prettify.css
@@ -43,7 +43,7 @@ pre li,ul,ol {
 }
 
 /* Specify class=linenums on a pre to get line numbering */
-ol.linenums { margin-top: 0; margin-bottom: 0;line-height: 10px } /* IE indents via margin-left */
+ol.linenums { margin-top: 0; margin-bottom: 0;line-height: 15px } /* IE indents via margin-left */
 li.L0,
 li.L1,
 li.L2,