diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 2e8aebce5..43b488e96 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -74,7 +74,7 @@ class CoursesController < ApplicationController
     else
       @state = 5 #未登录
     end
-    @object_id = params[:object_id]
+    @object_id = @course.id if @course
     respond_to do |format|
       format.js #{ render :partial => 'set_join', :locals => {:user => @user, :course => @course, :object_id => params[:object_id]} }
     end
@@ -1305,12 +1305,12 @@ class CoursesController < ApplicationController
           sheet[count_row,7] = stu.teaching_asistant_score.nil? ? l(:label_without_score) : stu.teaching_asistant_score.round(2)
           if home.anonymous_comment ==0
             sheet[count_row,8] = stu.student_score.nil? ? l(:label_without_score) : stu.student_score.round(2)
-            sheet[count_row,9] = stu.absence_penalty
-            sheet[count_row,10] = stu.late_penalty
+            sheet[count_row,9] = home.teacher_priority == 1 ? 0 : stu.absence_penalty
+            sheet[count_row,10] = home.teacher_priority == 1 ? 0 : stu.late_penalty
             sheet[count_row,11] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
             sheet[count_row,12] = format_time(stu.created_at)
           else
-            sheet[count_row,8] = stu.late_penalty
+            sheet[count_row,8] = home.teacher_priority == 1 ? 0 : stu.late_penalty
             sheet[count_row,9] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
             sheet[count_row,10] = format_time(stu.created_at)
           end
@@ -1338,12 +1338,12 @@ class CoursesController < ApplicationController
           sheet[count_row,8] = stu.system_score.nil? ? l(:label_without_score) : stu.system_score.round(2)
           if home.anonymous_comment ==0
             sheet[count_row,9] = stu.student_score.nil? ? l(:label_without_score) : stu.student_score.round(2)
-            sheet[count_row,10] = stu.absence_penalty
-            sheet[count_row,11] = stu.late_penalty
+            sheet[count_row,10] = home.teacher_priority == 1 ? 0 : stu.absence_penalty
+            sheet[count_row,11] = home.teacher_priority == 1 ? 0 : stu.late_penalty
             sheet[count_row,12] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
             sheet[count_row,13] = format_time(stu.created_at)
           else
-            sheet[count_row,9] = stu.late_penalty
+            sheet[count_row,9] = home.teacher_priority == 1 ? 0 : stu.late_penalty
             sheet[count_row,10] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
             sheet[count_row,11] = format_time(stu.created_at)
           end
@@ -1369,12 +1369,12 @@ class CoursesController < ApplicationController
           sheet[count_row,6] = stu.teaching_asistant_score.nil? ? l(:label_without_score) : stu.teaching_asistant_score.round(2)
           if home.anonymous_comment ==0
             sheet[count_row,7] = stu.student_score.nil? ? l(:label_without_score) : stu.student_score.round(2)
-            sheet[count_row,8] = stu.absence_penalty
-            sheet[count_row,9] = stu.late_penalty
+            sheet[count_row,8] = home.teacher_priority == 1 ? 0 : stu.absence_penalty
+            sheet[count_row,9] = home.teacher_priority == 1 ? 0 : stu.late_penalty
             sheet[count_row,10] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
             sheet[count_row,11] = format_time(stu.created_at)
           else
-            sheet[count_row,7] = stu.late_penalty
+            sheet[count_row,7] = home.teacher_priority == 1 ? 0 : stu.late_penalty
             sheet[count_row,8] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
             sheet[count_row,9] = format_time(stu.created_at)
           end
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index b92dbb935..3a72ba55e 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -1230,12 +1230,12 @@ class StudentWorkController < ApplicationController
         sheet1[count_row,8] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : homework.teaching_asistant_score.round(2)
         if @homework.anonymous_comment ==0
           sheet1[count_row,9] = homework.student_score.nil? ? l(:label_without_score) : homework.student_score.round(2)
-          sheet1[count_row,10] = homework.absence_penalty
-          sheet1[count_row,11] = homework.late_penalty
+          sheet1[count_row,10] = @homework.teacher_priority == 1 ? 0 : homework.absence_penalty
+          sheet1[count_row,11] = @homework.teacher_priority == 1 ? 0 : homework.late_penalty
           sheet1[count_row,12] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
           sheet1[count_row,13] = format_time(homework.created_at)
         else
-          sheet1[count_row,9] = homework.late_penalty
+          sheet1[count_row,9] = @homework.teacher_priority == 1 ? 0 : homework.late_penalty
           sheet1[count_row,10] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
           sheet1[count_row,11] = format_time(homework.created_at)
         end
@@ -1263,12 +1263,12 @@ class StudentWorkController < ApplicationController
         sheet1[count_row,9] = homework.system_score.nil? ? l(:label_without_score) : homework.system_score.round(2)
         if @homework.anonymous_comment ==0
           sheet1[count_row,10] = homework.student_score.nil? ? l(:label_without_score) : homework.student_score.round(2)
-          sheet1[count_row,11] = homework.absence_penalty
-          sheet1[count_row,12] = homework.late_penalty
+          sheet1[count_row,11] = @homework.teacher_priority == 1 ? 0 : homework.absence_penalty
+          sheet1[count_row,12] = @homework.teacher_priority == 1 ? 0 : homework.late_penalty
           sheet1[count_row,13] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
           sheet1[count_row,14] = format_time(homework.created_at)
         else
-          sheet1[count_row,10] = homework.late_penalty
+          sheet1[count_row,10] = @homework.teacher_priority == 1 ? 0 : homework.late_penalty
           sheet1[count_row,11] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
           sheet1[count_row,12] = format_time(homework.created_at)
         end
@@ -1292,12 +1292,12 @@ class StudentWorkController < ApplicationController
           sheet1[count_row,5] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : homework.teaching_asistant_score.round(2)
           if @homework.anonymous_comment ==0
             sheet1[count_row,6] = homework.student_score.nil? ? l(:label_without_score) : homework.student_score.round(2)
-            sheet1[count_row,7] = homework.absence_penalty
-            sheet1[count_row,8] = homework.late_penalty
+            sheet1[count_row,7] = @homework.teacher_priority == 1 ? 0 : homework.absence_penalty
+            sheet1[count_row,8] = @homework.teacher_priority == 1 ? 0 : homework.late_penalty
             sheet1[count_row,9] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
             sheet1[count_row,10] = format_time(homework.created_at)
           else
-            sheet1[count_row,6] = homework.late_penalty
+            sheet1[count_row,6] = @homework.teacher_priority == 1 ? 0 : homework.late_penalty
             sheet1[count_row,7] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
             sheet1[count_row,8] = format_time(homework.created_at)
           end
diff --git a/app/models/course.rb b/app/models/course.rb
index 5186a4754..195e7cf9f 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -67,7 +67,7 @@ class Course < ActiveRecord::Base
   acts_as_attachable :view_permission => :view_course_files,
                      :delete_permission => :manage_files
   
-  validates_presence_of :password, :term,:name
+  validates_presence_of :term,:name
   validates_format_of  :class_period, :with =>/^[1-9]\d*$/
   validates_format_of  :name,:with =>/^[^ ]+[a-zA-Z0-9_\u4e00-\u9fa5\s\S]+$/
   validates_length_of :description, :maximum => 10000
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index bdd6564ae..60c053997 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -199,7 +199,7 @@ class CoursesService
       @course.extra = 'course' + DateTime.parse(Time.now.to_s).strftime('%Y-%m-%d_%H-%M-%S').to_s
       @course.send(:safe_attributes=, params[:course], current_user)
       #@course.safe_attributes(current_user,params[:course])
-      @course.password = params[:course][:password]
+      #@course.password = params[:course][:password]
       @course.tea_id = current_user.id
       @course.term = params[:term]
       @course.time = params[:time]
@@ -258,7 +258,7 @@ class CoursesService
   def edit_course(params,course,current_user)
     course.send(:safe_attributes=, params[:course], current_user)
     #course.safe_attributes = params[:course]
-    course.password = params[:course][:password]
+    #course.password = params[:course][:password]
     course.time = params[:time]
     course.term = params[:term]
     course.end_time = params[:end_time]
@@ -326,11 +326,7 @@ class CoursesService
   #object_id：课程id
   #course_password ：加入课程的密码
   def join_course params,current_user
-    course = if params[:invite_code]
-      Course.find_by_invite_code(params[:invite_code])
-    else
-      Course.find_by_id params[:object_id]
-    end
+    course = Course.find_by_invite_code(params[:invite_code]) if params[:invite_code]
 
     @state = 10
     if course
@@ -340,7 +336,7 @@ class CoursesService
         if current_user.member_of_course?(course) #如果已经是成员
           member = course.members.where("user_id=#{current_user.id} and course_id=#{course.id}")[0]
           roleName = member.roles[0].name if member
-          if params[:course_password] == course.password || params[:invite_code].present?
+          if params[:invite_code].present?
             #如果加入角色为学生 并且当前是学生
             if params[:role] == "10" && roleName == "Student"
               @state = 3
@@ -366,19 +362,19 @@ class CoursesService
             elsif params[:role] == "10" && roleName != "Student"
               member.role_ids = [params[:role]]
               member.save
-              StudentsForCourse.create(:student_id => current_user.id, :course_id => params[:object_id])
+              StudentsForCourse.create(:student_id => current_user.id, :course_id => course.id)
               @state = 0
             end
           else
             @state = 1
           end
         else
-          if params[:course_password] == course.password || params[:invite_code].present?
+          if params[:invite_code].present?
             if params[:role] == "10" || params[:role] == nil
               members = []
               members << Member.new(:role_ids => [10], :user_id => current_user.id)
               course.members << members
-              StudentsForCourse.create(:student_id => current_user.id, :course_id => params[:object_id])
+              StudentsForCourse.create(:student_id => current_user.id, :course_id => course.id)
               @state = 0
             else
               #如果已经发送过消息了，那么就要给个提示
diff --git a/app/views/courses/_copy_course.html.erb b/app/views/courses/_copy_course.html.erb
index 3b6d55d96..dbe03d67f 100644
--- a/app/views/courses/_copy_course.html.erb
+++ b/app/views/courses/_copy_course.html.erb
@@ -1,6 +1,6 @@
 <script type="text/javascript">
     function submit_copy_course() {
-        if(regex_course_name('new')&&regex_course_class_period('new')&&regex_time_term('new')&&regex_course_password('new'))
+        if(regex_course_name('new')&&regex_course_class_period('new')&&regex_time_term('new'))
         {
             $("#new_course").submit();
             document.getElementById("submit_copy_course").onclick = "";
@@ -79,15 +79,15 @@
       <span class="mr15 c_red">仅针对跨越多个学期的班级，否则不用修改。</span>
     </li>
     <div class="cl"></div>
-    <li class="ml45 mb10">
-      <label><span class="c_red">*</span>&nbsp;<%= l(:label_new_course_password)%>&nbsp;&nbsp;：</label>
+    <!--<li class="ml45 mb10">
+      <label><span class="c_red">*</span>&nbsp;<%#= l(:label_new_course_password)%>&nbsp;&nbsp;：</label>
       <input type="text" style="display: none;">
-      <input  type="text" name="course[password]" id="new_course_course_password" class="hwork_input02 grey_border" onkeyup="regex_course_password('new');" value="<%=@course.password %>">
-      <!--<a id="psw_btn" href="javascript:void(0)">显示明码</a>-->
+      <input  type="text" name="course[password]" id="new_course_course_password" class="hwork_input02 grey_border" onkeyup="regex_course_password('new');" value="<%#=@course.password %>">
+      &lt;!&ndash;<a id="psw_btn" href="javascript:void(0)">显示明码</a>&ndash;&gt;
       <span class="c_red" id="new_course_course_password_notice"></span>
       <div class="cl"></div>
       <span class="ml95 c_red">学生或其他成员申请加入课程时候需要使用该口令，该口令可以由老师在课堂上公布。</span>
-    </li>
+    </li>-->
     <li class="ml50">
       <label class="fl" >&nbsp;&nbsp;<%= l(:label_new_course_description)%>&nbsp;&nbsp;：</label>
       <textarea  name="course[description]" placeholder="最多3000个汉字(或6000个英文字符)"  class="courses_text fl grey_border"  ><%= @course.description.nil? ? "" : @course.description %></textarea>
diff --git a/app/views/courses/_join_private_course.html.erb b/app/views/courses/_join_private_course.html.erb
index 873144afe..0799953bf 100644
--- a/app/views/courses/_join_private_course.html.erb
+++ b/app/views/courses/_join_private_course.html.erb
@@ -50,7 +50,7 @@
   <div class="C"  >
     <div class="C_top">
       <h2>快速进入课程通道</h2>
-      <p>只要持有课程ID和密码，就可快速加入所在课程。课程页面搜索不到的私有课程只能从此通道进入哦！</p>
+      <p>只要持有课程邀请码，就可以快速加入所在课程。课程页面搜索不到的私有课程只能从此通道进入哦！</p>
     </div>
     <div class="C_form">
       <%= form_tag({:controller => 'courses',
@@ -62,16 +62,12 @@
             <li>
               <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
               <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
-              <span class="tips" style="width: 68px; display: inline-block;">课&nbsp;程&nbsp;ID：</span>
-              <input class=" width190" name="object_id" id="object_id" type="text" value="" >
+              <span class="tips" style="width: 90px; display: inline-block;">课程邀请码：</span>
+              <input class="width190" style="margin-left: 0px;" name="invite_code" id="object_id" type="text" value="" >
               <input type="text" style="display: none"/>
             </li>
-            <li class="mB5">课程ID是所在课程网址中显示的序号</li>
-            <li>
-              <span class="tips" style="width: 68px; display: inline-block;">密&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;码：</span>
-              <input class=" width190" type="password" name="course_password" id="course_password" value="" >
-            </li>
-            <li style="margin-top: 30px;">
+            <li class="mB5">课程邀请码是所在课程页面中显示的邀请码</li>
+            <li style="margin-top: 15px;">
               <span style="margin-right: 20px;">身&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;份：</span>
               <% if User.current.logged? && User.current.extensions &&  User.current.extensions.identity == 0%>
                   <select name="role" class="IDType">
diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb
index ef1a0fc58..ddaf17ae8 100644
--- a/app/views/courses/new.html.erb
+++ b/app/views/courses/new.html.erb
@@ -32,15 +32,15 @@
           <span class="mr15 c_red">仅针对跨越多个学期的班级，否则不用修改。</span>
         </li>
         <div class="cl"></div>
-        <li class="ml45 mb10">
-          <label><span class="c_red">*</span>&nbsp;<%= l(:label_new_course_password)%>&nbsp;&nbsp;：</label>
+        <!--<li class="ml45 mb10">
+          <label><span class="c_red">*</span>&nbsp;<%#= l(:label_new_course_password)%>&nbsp;&nbsp;：</label>
           <input type="text" style="display: none;">
           <input  type="password" name="course[password]" id="new_course_course_password" class="hwork_input02" onkeyup="regex_course_password('new');">
           <a id="psw_btn" href="javascript:void(0)">显示明码</a>
           <span class="c_red" id="new_course_course_password_notice"></span>
           <div class="cl"></div>
           <span class="ml80 c_red">学生或其他成员申请加入课程时候需要使用该口令，该口令可以由老师在课堂上公布。</span>
-        </li>
+        </li>-->
         <li class="ml45">
           <label class="fl" >&nbsp;&nbsp;<%= l(:label_new_course_description)%>&nbsp;&nbsp;：</label>
           <textarea  name="course[description]" placeholder="最多3000个汉字(或6000个英文字符)"  class="courses_text fl"  ></textarea>
diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb
index 82123a767..3afa8387a 100644
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@@ -57,14 +57,14 @@
             <span class="c_red" id="edit_course_time_term_notice"></span>
           </li>
           <div class="cl"></div>
-          <li class="ml45 mb10">
-            <label><span class="c_red">*</span>&nbsp;<%= l(:label_new_course_password)%>&nbsp;&nbsp;：</label>
-            <input  type="password" name="course[password]" id="edit_course_course_password" class="hwork_input02" value="<%= @course.password%>" onkeyup="regex_course_password('edit');">
+          <!--<li class="ml45 mb10">
+            <label><span class="c_red">*</span>&nbsp;<%#= l(:label_new_course_password)%>&nbsp;&nbsp;：</label>
+            <input  type="password" name="course[password]" id="edit_course_course_password" class="hwork_input02" value="<%#= @course.password%>" onkeyup="regex_course_password('edit');">
             <a id="psw_btn" href="javascript:void(0)">显示明码</a>
             <span class="c_red" id="edit_course_course_password_notice"></span>
             <div class="cl"></div>
             <span class=" ml80 c_orange">学生或其他成员申请加入课程时候需要使用该口令，该口令可以由老师在课堂上公布。</span>
-          </li>
+          </li>-->
           <li class="ml45">
             <label class="fl" >&nbsp;&nbsp;<%= l(:label_new_course_description)%>&nbsp;&nbsp;：</label>
             <textarea  name="course[description]" placeholder="最多3000个汉字(或6000个英文字符)"  class="courses_text fl"  maxlength="6000"><%= @course.description%></textarea>
diff --git a/app/views/exercise/_student_table.html.erb b/app/views/exercise/_student_table.html.erb
index f3a72b20e..bdfd2c96f 100644
--- a/app/views/exercise/_student_table.html.erb
+++ b/app/views/exercise/_student_table.html.erb
@@ -1,6 +1,4 @@
-<%= javascript_include_tag 'resizeable_table'%>
-
-<table class="hwork-table-wrap">
+<table class="hwork-table-wrap" style="border-bottom:1px solid #eaeaea;">
   <tr class="b_grey hworkH30">
     <th class="hworkList30 pl5 pr5"><span class="c_dark f14 fb">序号</span></th>
     <th class="hworkList50">&nbsp;&nbsp;</th>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 181eefb98..62ccb3a86 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -57,6 +57,12 @@
       <div class="project_info" style="position: relative" id="project_info_<%=@course.id %>">
         <%=render :partial=>'layouts/project_info' %>
       </div><!--课程信息 end-->
+      <% if (User.current.logged? && User.current.member_of_course?(@course)) || is_teacher %>
+          <div class="info_box mb10">
+            <p class="f14">邀请码</p>
+            <p class="f14 fontBlue2"><%=@course.generate_invite_code %></p>
+          </div>
+      <% end %>
       <div class="info_box">
         <ul>
           <li><%= l(:label_main_teacher)%> :&nbsp;&nbsp;<%= link_to(@course.teacher.lastname+@course.teacher.firstname, user_path(@course.teacher), :class => 'c_dblue') %></li>
diff --git a/app/views/student_work/_evaluation_title.html.erb b/app/views/student_work/_evaluation_title.html.erb
index cec5b91ec..9875a4cc6 100644
--- a/app/views/student_work/_evaluation_title.html.erb
+++ b/app/views/student_work/_evaluation_title.html.erb
@@ -1,4 +1,4 @@
-<table class="hwork-table-wrap" id="homework_table" onmouseenter="<%= @homework.homework_type == 3 ? '' : 'resizeable_table(2,4,1,1)' %>">
+<table class="hwork-table-wrap" id="homework_table">
   <tr class="b_grey hworkH30">
     <th class="hworkList30 hworkH30 pl5 pr5">序号</th>
     <th class="hworkList50">&nbsp;</th>
diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb
index 5ed2e82d6..1b3683506 100644
--- a/app/views/student_work/_evaluation_un_title.html.erb
+++ b/app/views/student_work/_evaluation_un_title.html.erb
@@ -1,4 +1,4 @@
-<table class="hwork-table-wrap" id="homework_table" onmouseenter="<%= @homework.homework_type == 3 ? '' : 'resizeable_table(2,4,11,11)' %>">
+<table class="hwork-table-wrap" id="homework_table">
   <tr class="b_grey hworkH30">
     <th class="hworkList30 hworkH30 pl5 pr5">序号</th>
     <th class="hworkList50">&nbsp;</th>
diff --git a/app/views/student_work/index.js.erb b/app/views/student_work/index.js.erb
index f65782805..16aac9945 100644
--- a/app/views/student_work/index.js.erb
+++ b/app/views/student_work/index.js.erb
@@ -1,3 +1,2 @@
 $("#homework_student_work_list").html("<%= escape_javascript(render :partial => 'student_work/student_work_list') %>");
 $("#export_student_work").replaceWith("<%= escape_javascript( link_to "导出作业成绩", student_work_index_path(:homework => @homework.id,:order => @order, :sort => @b_sort, :group => @group, :name => @name, :format => 'xls'),:class=>'hworkExport postTypeGrey', :id => 'export_student_work') %>");
-$("th").each(function(){$(this).css("width",$(this).width()-1);});
diff --git a/app/views/users/_all_replies.html.erb b/app/views/users/_all_replies.html.erb
index 45404ed84..a74acc77c 100644
--- a/app/views/users/_all_replies.html.erb
+++ b/app/views/users/_all_replies.html.erb
@@ -13,7 +13,7 @@
         <div class="homepagePostReplyDes">
           <div class="homepagePostReplyPublisher">
             <%= link_to comment.creator_user.show_name, user_url_in_org(comment.creator_user.id), :class => "newsBlue mr10 f14" %>
-            <%= time_from_now(comment.created_on) %>
+            <%= time_from_now(comment.created_time) %>
             <span id="reply_praise_count_<%=comment.id %>">
                  <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
             </span>
diff --git a/app/views/users/_journal_reply_banner.html.erb b/app/views/users/_journal_reply_banner.html.erb
index 31934328f..c231f473d 100644
--- a/app/views/users/_journal_reply_banner.html.erb
+++ b/app/views/users/_journal_reply_banner.html.erb
@@ -10,7 +10,7 @@
   <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
   <%if count>3 %>
       <div class="homepagePostReplyBannerMore">
-        <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'<%=activity.class %>',<%=user_activity_id %>,<%=allow_delete %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+        <a id="reply_btn_<%=user_activity_id%>" onclick="expand_journal_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'<%=activity.class %>',<%=user_activity_id %>,<%=allow_delete %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
           展开更多
         </a>
       </div>
diff --git a/app/views/users/_reply_to.html.erb b/app/views/users/_reply_to.html.erb
index a0c76b957..621b56fbd 100644
--- a/app/views/users/_reply_to.html.erb
+++ b/app/views/users/_reply_to.html.erb
@@ -2,8 +2,8 @@
   <% if User.current.logged? %>
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
       <div class="orig_textarea mb10 fl">
-      <div nhname='new_message_<%= reply.id%>'>
-      <% if @type == 'HomeworkCommon' %>
+        <div nhname='new_message_<%= reply.id%>'>
+          <% if @type == 'HomeworkCommon' %>
               <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'reply_to_homework', :id => reply.id},:method => "post", :remote => true) do |f| %>
                   <input type="hidden" name="is_in_course" value=<%=@is_in_course %>>
                   <input type="hidden" name="user_activity_id" value=<%=@user_activity_id %>>
@@ -29,10 +29,11 @@
                   <div class="cl"></div>
               <% end%>
           <% end %>
+        </div>
+        <div class="cl"></div>
       </div>
   <% else %>
     <%= render :partial => "users/show_unlogged_reply" %>
-  <% end %>    <div class="cl"></div>
-  </div>
+  <% end %>
   <div class="cl"></div>
 </div>
\ No newline at end of file
diff --git a/app/views/users/all_journals.js.erb b/app/views/users/all_journals.js.erb
index d4c42368d..6d227e93b 100644
--- a/app/views/users/all_journals.js.erb
+++ b/app/views/users/all_journals.js.erb
@@ -3,5 +3,5 @@ $('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :p
 <% elsif params[:type] == 'JournalsForMessage' %>
 $('#reply_div_<%= @user_activity_id %>').html('<%=escape_javascript(render :partial => 'users/journal_replies', :locals => {:comments => @journals,:user_activity_id => @user_activity_id, :type => @type, :allow_delete => @allow_delete, :activity_id =>params[:id].to_i}) %>');
 <% else %>
-$('#reply_div_<%= @user_activity_id %>').html('<%=escape_javascript(render :partial => 'users/all_replies', :locals => {:comments => @journals,:user_activity_id => @user_activity_id, :type => @type, :allow_delete => @allow_delete, :activity_id =>params[:id].to_i}) %>');
+$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/all_replies', :locals => {:comments => @journals}) %>');
 <% end %>
diff --git a/db/schema.rb b/db/schema.rb
index 9db65aca0..148a6e21b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -550,11 +550,13 @@ ActiveRecord::Schema.define(:version => 20160624032138) do
     t.integer  "excellent_option",              :default => 0
     t.integer  "is_copy",                       :default => 0
     t.integer  "visits",                        :default => 0
+    t.integer  "syllabus_id"
     t.string   "invite_code"
     t.string   "qrcode"
   end
 
   add_index "courses", ["invite_code"], :name => "index_courses_on_invite_code", :unique => true
+  add_index "courses", ["syllabus_id"], :name => "index_courses_on_syllabus_id"
 
   create_table "custom_fields", :force => true do |t|
     t.string  "type",            :limit => 30, :default => "",    :null => false
@@ -1123,6 +1125,23 @@ ActiveRecord::Schema.define(:version => 20160624032138) do
     t.integer  "viewed_count",  :default => 0
   end
 
+  create_table "mess", :id => false, :force => true do |t|
+    t.string   "课程名"
+    t.integer  "课程ID",                    :default => 0,  :null => false
+    t.string   "教师姓",                     :default => "", :null => false
+    t.string   "教师名",       :limit => 30, :default => "", :null => false
+    t.string   "主贴名",                     :default => "", :null => false
+    t.integer  "主贴或回帖ID",                 :default => 0,  :null => false
+    t.integer  "回帖对应主贴ID"
+    t.integer  "帖子点赞数"
+    t.integer  "主贴回复数",                   :default => 0,  :null => false
+    t.text     "主贴或回帖内容"
+    t.datetime "发帖时间",                                    :null => false
+    t.integer  "发帖或回帖用户ID",               :default => 0,  :null => false
+    t.string   "发帖或回帖用户姓",                :default => "", :null => false
+    t.string   "发帖或回帖用户名",  :limit => 30, :default => "", :null => false
+  end
+
   create_table "message_alls", :force => true do |t|
     t.integer  "user_id"
     t.integer  "message_id"
@@ -1830,6 +1849,16 @@ ActiveRecord::Schema.define(:version => 20160624032138) do
     t.datetime "updated_at",      :null => false
   end
 
+  create_table "syllabuses", :force => true do |t|
+    t.string   "title"
+    t.text     "description"
+    t.integer  "user_id"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  add_index "syllabuses", ["user_id"], :name => "index_syllabuses_on_user_id"
+
   create_table "system_messages", :force => true do |t|
     t.integer  "user_id"
     t.string   "content"
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 8f32e2644..06304a8b0 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1290,7 +1290,40 @@ function clear_data(k,mdu){
     }
 }
 
-function expand_reply(container, btnid, id, type, div_id, allow_delete) {
+function expand_reply(container, btnid, id, type, div_id) {
+    var target = $(container);
+    var btn = $(btnid);
+    if (btn.data('init') == '0') {
+        btn.data('init', 1);
+        $.get(
+            '/users/all_journals',
+            {
+                type: type,
+                id: id,
+                div_id: div_id
+            },
+            function(data) {
+
+            }
+        );
+        btn.html('收起回复');
+        //target.show();
+    } else if(btn.data('init') == '1') {
+        btn.data('init', 3);
+        btn.html('展开更多');
+        target.hide();
+        target.eq(0).show();
+        target.eq(1).show();
+        target.eq(2).show();
+    }
+    else {
+        btn.data('init', 1);
+        btn.html('收起回复');
+        target.show();
+    }
+}
+
+function expand_journal_reply(container, btnid, id, type, div_id, allow_delete) {
     var target = $(container);
     var btn = $(btnid);
     if (btn.data('init') == '0') {
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 6fbf9f8c4..8b5e58618 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -185,7 +185,7 @@ function regex_course_password(str)
 //提交新建课程
 function submit_new_course()
 {
-    if(regex_course_name('new')&&regex_course_class_period('new')&&regex_time_term('new')&&regex_course_password('new'))
+    if(regex_course_name('new')&&regex_course_class_period('new')&&regex_time_term('new'))
     {
         $("#new_course").submit();
     }
@@ -193,7 +193,7 @@ function submit_new_course()
 
 function submit_edit_course(id)
 {
-    if(regex_course_name('edit')&&regex_course_class_period('edit')&&regex_time_term('edit')&&regex_course_password('edit'))
+    if(regex_course_name('edit')&&regex_course_class_period('edit')&&regex_time_term('edit'))
     {
         $("#edit_course_"+id).submit();
     }
diff --git a/public/javascripts/resizeable_table.js b/public/javascripts/resizeable_table.js
index 0b46f9a35..e5b57844a 100644
--- a/public/javascripts/resizeable_table.js
+++ b/public/javascripts/resizeable_table.js
@@ -1,7 +1,7 @@
 /**
  * Created by ttang on 2016/5/24.
  */
-    $(document).ready(function(){
+   /* $(document).ready(function(){
         $("th").each(function(){
             $(this).css("width",$(this).width()-1);
         });
@@ -80,4 +80,5 @@
                element.addEventListener?element.addEventListener(type,listener,useCapture):element.attachEvent("on" + type,listener);
            }
        }
-    });
\ No newline at end of file
+    });
+*/
\ No newline at end of file
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index aaa8bbd6e..d0a5e7ab3 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -109,7 +109,7 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re
 
 /*20160520作品列表table*/
 .hwork-table-wrap {width:720px; border-collapse:collapse; vertical-align:middle; table-layout:fixed;}
-.hwork-table-wrap th {font-size:14px; color:#2d2d2d; border:1px solid #e1e1e1; text-align:center;}
+.hwork-table-wrap th {font-size:14px; color:#2d2d2d; border-bottom:1px solid #e1e1e1; text-align:center;}
 
 /*作业信息*/
 .mt-2 {margin-top:-2px;}