diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb
index dc33b059d..ee59dc8b5 100644
--- a/app/controllers/managements_controller.rb
+++ b/app/controllers/managements_controller.rb
@@ -147,6 +147,15 @@ class ManagementsController < ApplicationController
     end
   end
 
+  # 用户修改界面
+  def update_user
+    @menu_type = 7
+    @sub_type = 1
+    respond_to do |format|
+      format.js
+      format.html
+    end
+  end
   # 实训留言
   def shixun_feedback
     @menu_type = 9
@@ -168,7 +177,7 @@ class ManagementsController < ApplicationController
   # 专业列表
   def profession
     @major=Major.where("0=0")
-    @menu_type = 12
+    # @menu_type = 12
     @sub_type = 1
     @sx_order  = params[:sx_order].blank? ? "desc" : params[:sx_order]
     major_level_option = params[:major_level] if params[:major_level]
@@ -224,9 +233,9 @@ class ManagementsController < ApplicationController
 
   # 实训适用课程
   def applicable_course
-    @menu_type = 12
+    # @menu_type = 12
     @sub_type = 2
-    @major = Major.where(:major_level => 2)
+    @major = Major.where(:major_level => 2,:support_shixuns => 1)
     @courselist = CourseList.where("0=0")
     search=params[:search]
     unless search.blank?
@@ -273,7 +282,8 @@ end
     if search.blank?
         @department = @department
     else
-        @department = @department.where("name like '%#{search}%'")
+        apply = School.where("name like '%#{search}%'").map(&:id)
+        @department = @department.where(:school_id => apply)
     end
     @department = @department.reorder("created_at #{@sx_order}")
     @department_count =@department.count
@@ -603,32 +613,32 @@ end
     @sub_type = 1
     @syllabus = Syllabus.where("0=0")
     @sx_order  = params[:sx_order].blank? ? "desc" : params[:sx_order]
-    major_level_option = params[:major_level] if params[:major_level]
-    discipline_category_option = params[:discipline_category_id] if params[:discipline_category_id]
-    first_level_discipline_option = params[:first_level_discipline_id] if params[:first_level_discipline_id]
-    syllabus_major_option = params[:major_id] if params[:major_id]
+    # major_level_option = params[:major_level] if params[:major_level]
+    # discipline_category_option = params[:discipline_category_id] if params[:discipline_category_id]
+    # first_level_discipline_option = params[:first_level_discipline_id] if params[:first_level_discipline_id]
+    # syllabus_major_option = params[:major_id] if params[:major_id]
     keyword = params[:keyword]
     search = params[:search]
 
-    if major_level_option && major_level_option != '0'
-      @syllabus = @syllabus.where(:major_level=>major_level_option)
-    end
+    # if major_level_option && major_level_option != '0'
+    #   @syllabus = @syllabus.where(:major_level=>major_level_option)
+    # end
+    #
+    # if discipline_category_option && discipline_category_option != '0'
+    #   @syllabus=@syllabus.where(:discipline_category_id=>discipline_category_option)
+    # end
+    #
+    # if first_level_discipline_option && first_level_discipline_option != '0'
+    #   @syllabus=@syllabus.where(:first_level_discipline_id=>first_level_discipline_option)
+    # end
+    #
+    # if syllabus_major_option && syllabus_major_option != '0'
+    #   @syllabus=@syllabus.where(:major_id=>syllabus_major_option)
+    # end
 
-    if discipline_category_option && discipline_category_option != '0'
-      @syllabus=@syllabus.where(:discipline_category_id=>discipline_category_option)
-    end
-
-    if first_level_discipline_option && first_level_discipline_option != '0'
-      @syllabus=@syllabus.where(:first_level_discipline_id=>first_level_discipline_option)
-    end
-
-    if syllabus_major_option && syllabus_major_option != '0'
-      @syllabus=@syllabus.where(:major_id=>syllabus_major_option)
-    end
-
-    if params[:school_id] && params[:school_id] != ''
-      @syllabus = @syllabus.includes(:user => {:user_extensions => []}).where("user_extensions.school_id = #{params[:school_id]}")
-    end
+    # if params[:school_id] && params[:school_id] != ''
+    #   @syllabus = @syllabus.includes(:user => {:user_extensions => []}).where("user_extensions.school_id = #{params[:school_id]}")
+    # end
 
     if search.blank?
       @syllabus = @syllabus
@@ -807,7 +817,7 @@ end
     @sub_type = 1
     status     = params[:user_status].nil? ? 0 : params[:user_status].to_i
     @us_order  = params[:us_order].blank? ? "desc" : params[:us_order]         # 排序
-    @order_key = params[:order_key].blank? ? "created_on" : params[:order_key] # 排序关键字
+    @order_key = params[:order_key].blank? ? "last_login_on" : params[:order_key] # 排序关键字
     condition  = (params[:research_condition].nil? || params[:research_condition] == "name") ? "concat(lastname, firstname)" : params[:research_condition]
     if 0 == status
       if params[:research_condition] == "phone" && params[:research_contents].blank?
@@ -822,6 +832,9 @@ end
         @users = User.where("status = #{status} and #{condition} like '%#{params[:research_contents]}%'").order("#{@order_key} #{@us_order}").all
       end
     end
+    # if params[:school_id] && params[:school_id] !=''
+    #   @users = @users.find(params[:school_id])
+    # end
     @users_count =  @users.count
     @limit = 20
     @is_remote = true
@@ -1047,12 +1060,13 @@ end
     elsif params[:research_condition] == "email"
       @users = User.where(:id => user_id).where("mail like '%#{params[:research_contents]}%'").order("created_on desc")
     elsif params[:research_condition] == "phone"
+      @users = User.where(:id => user_id).where("phone like '%#{params[:research_contents]}%'").order("created_on desc")
+    elsif params[:research_condition] == "nickname"
       if params[:research_contents].blank?
         @users = User.where(:id => user_id).order("created_on desc")
       else
-        @users = User.where(:id => user_id).where("phone like '%#{params[:research_contents]}%'").order("created_on desc")
+        @users = User.where(:id => user_id).where("nickname like '%#{params[:research_contents]}%'").order("created_on desc")
       end
-
     end
 
     @users_count = @users.count
diff --git a/app/controllers/syllabuses_controller.rb b/app/controllers/syllabuses_controller.rb
index fae83cdc1..1105df424 100644
--- a/app/controllers/syllabuses_controller.rb
+++ b/app/controllers/syllabuses_controller.rb
@@ -14,24 +14,35 @@ class SyllabusesController < ApplicationController
 
   def index
     @status = params[:type].nil? ? 1 : params[:type].to_i # 1表示正在进行，2表示已结束
+    @tab = params[:tab].nil? ? 1 : params[:tab].to_i
 
     user = User.current
-    @my_syllabuses = user.syllabuses
+    if @status == 1
+      case @tab
+        when 2
+          @courses = user.courses.not_deleted_not_end.order("updated_at desc").select{ |course| user.has_teacher_role(course)}
+        when 3
+          @courses = user.courses.not_deleted_not_end.order("updated_at desc").select{ |course| !user.has_teacher_role(course)}
+        when 1
+          @courses = user.courses.not_deleted_not_end.order("updated_at desc")
+      end
+    else
+      case @tab
+        when 2
+          @courses = user.courses.not_deleted_but_is_end.order("updated_at desc").select{ |course| user.has_teacher_role(course)}
+        when 3
+          @courses = user.courses.not_deleted_but_is_end.order("updated_at desc").select{ |course| !user.has_teacher_role(course)}
+        when 1
+          @courses = user.courses.not_deleted_but_is_end.order("updated_at desc")
+      end
+    end
 
-    archive_ids = Course.where("tea_id = #{user.id} and is_delete = 1 and syllabus_id is NOT NULL").blank? ? "(-1)" : "(" + Course.where("tea_id = #{user.id} and is_delete = 1 and syllabus_id is NOT NULL").map{|course| course.syllabus_id}.join(",") + ")"
-    @archive_syllabuses = Syllabus.where("id in #{archive_ids}")
-
-    sy_courses = user.courses.visible.not_deleted
-    syllabus_ids = sy_courses.empty? ? '(-1)' : "(" + sy_courses.map{|course| !course.syllabus_id.nil? && course.syllabus_id}.join(",") + ")"
-    syllabus_members = SyllabusMember.where("user_id = #{user.id}")
-    syllabus_member_ids = syllabus_members.empty? ? "(-1)" : "(" + syllabus_members.map{|syl_mem| syl_mem.syllabus_id}.join(',') + ")"
-    @join_syllabuses = Syllabus.where("(id in #{syllabus_ids} or id in #{syllabus_member_ids}) and user_id != #{user.id}")
-
-    @my_syllabuses = syllabus_course_list_sort @my_syllabuses
-    @join_syllabuses = syllabus_course_list_sort @join_syllabuses
-    @my_syllabuses = @my_syllabuses.sort{|x,y| y[:last_update] <=> x[:last_update]}
-    @join_syllabuses = @join_syllabuses.sort{|x,y| y[:last_update] <=> x[:last_update]}
-    @is_course = 1
+    @limit = 15
+    @is_remote = true
+    @courses_count = @courses.count
+    @courses_pages = Paginator.new @courses_count, @limit, params['page'] || 1
+    @offset ||= @courses_pages.offset
+    @courses = paginateHelper @courses, @limit
 
     respond_to do |format|
       format.html{ render :layout => 'base_edu'}
diff --git a/app/views/layouts/base_edu.html.erb b/app/views/layouts/base_edu.html.erb
index e6e1c2dc4..fa4982b2b 100644
--- a/app/views/layouts/base_edu.html.erb
+++ b/app/views/layouts/base_edu.html.erb
@@ -30,7 +30,7 @@
     });
   </script>
 </head>
-<body onload="prettyPrint();" style="height: 100%">
+<body onload="prettyPrint();" style="height: 100%; background: #fff;">
 <div class="newContainer">    <!-- 页面全部内容 -->
   <div class="newHeader">     <!-- 头部 -->
     <%= render :partial => User.current.logged? ? 'layouts/logined_header' : 'layouts/unlogin_header' %>
diff --git a/app/views/layouts/base_management.html.erb b/app/views/layouts/base_management.html.erb
index a851c7840..e35bd484c 100644
--- a/app/views/layouts/base_management.html.erb
+++ b/app/views/layouts/base_management.html.erb
@@ -30,28 +30,32 @@
         <% when 3 %>
            <%= @sub_type == 1 ? "实训列表" :(@sub_type == 2 ? "已发布的实训": (@sub_type == 3 ? "已关闭的实训": "镜像管理")) %>
         <% when 4 %>
-           <%= @sub_type == 1 ? "实训路径" : "已发布实训套件" %>
+           <%= @sub_type == 1 ? "实训路径列表" : "已发布实训路径" %>
         <% when 5 %>
            竞赛
         <% when 6 %>
            <%= @sub_type == 1 ? "单位列表" :"单位部门列表" %>
         <% when 7 %>
            <%= @sub_type == 1 ? "用户列表" :"试用授权列表" %>
+           <!--<%# case @next_type %>-->
+           <!--<%# when 1 %>-->
+              <!--&gt;用户列表-->
+           <!--<%# end %>-->
         <% when 8 %>
            消息
         <% when 9 %>
            <%= @sub_type == 1 ? "实训留言列表" : "" %>
         <% when 10 %>
-           <%= @sub_type == 1 ? "实名认证":(@sub_type == 2? "试用授权":(@sub_type == 3?"部门审批":(@sub_type == 4?"单位审批":(@sub_type == 5?"全部实训发布":(@sub_type == 6?"课程实训发布":"职业认证")))))%>
+           <%= @sub_type == 1 ? "实名认证":(@sub_type == 2? "试用授权":(@sub_type == 3?"部门审批":(@sub_type == 4?"单位审批":(@sub_type == 5?"实训发布":(@sub_type == 6?"实训路径发布":"职业认证")))))%>
         <% when 11 %>
           工程认证+
          <% when 12 %>
-           <%= @sub_type == 1 ?"专业列表" : "实训适用课程列表" %>
+           <%#= @sub_type == 1 ?"专业列表" : "实训适用课程列表" %>
         <% end %>
         </span>
       </p>
       <ul class="edu-admin-nav clearfix ">
-        <li class="fl edu-admin-nav-li"><a href="javascript:void(0);" class="edu-admin-nav-a">主页</a></li>
+        <!--<li class="fl edu-admin-nav-li"><a href="javascript:void(0);" class="edu-admin-nav-a">主页</a></li>-->
         <li class="fl edu-admin-nav-li edu-position <%= 'active' if @menu_type == 2 %>"><a href="javascript:void(0);" class="edu-admin-nav-a">课堂+</a>
           <ul class="edu-admin-nav-inner edu-absolute">
             <li><%= link_to "课程列表", classroom_managements_path %></li>
@@ -68,8 +72,8 @@
         </li>
         <li class="fl edu-admin-nav-li edu-position <%= 'active' if @menu_type == 4 %>" style="width: 100px"><a href="javascript:void(0);" class="edu-admin-nav-a" >实训路径+</a>
           <ul class="edu-admin-nav-inner edu-absolute">
-            <li style="width: 100px"><%= link_to "实训套件列表", class_shixuns_managements_path %></li>
-            <li style="width: 100px"><%= link_to "已发布实训套件", class_publish_shixuns_managements_path %></li>
+            <li style="width: 100px"><%= link_to "实训路径列表", class_shixuns_managements_path %></li>
+            <li style="width: 100px"><%= link_to "已发布实训路径", class_publish_shixuns_managements_path %></li>
           </ul>
         </li>
         <li class="fl edu-admin-nav-li"><a href="javascript:void(0);" class="edu-admin-nav-a">竞赛+</a></li>
@@ -99,16 +103,16 @@
             <li><%= link_to "试用授权", :controller => "managements", :action => "trial_authorization" %></li>
             <li><%= link_to "部门审批", depart_managements_path %></li>
             <li><%= link_to '单位审批', unit_managements_path %></li>
-            <li><%= link_to '全部实训发布', shixun_authorization_managements_path %></li>
-            <li><%= link_to '课程实训发布', subject_authorization_managements_path %></li>
+            <li><%= link_to '实训发布', shixun_authorization_managements_path %></li>
+            <li><%= link_to '实训路径发布', subject_authorization_managements_path %></li>
           </ul>
         </li>
         <li class="fl edu-admin-nav-li "><a href="javascript:void(0);" class="edu-admin-nav-a">工程认证+</a></li>
-        <li class="fl edu-admin-nav-li  edu-position  <%= 'active' if @menu_type == 12 %>" style="width: 120px"><a href="javascript:void(0);" class="edu-admin-nav-a" style="border-right:none;">其它</a>
-          <ul class="edu-admin-nav-inner">
-            <li style="width: 120px"><%= link_to "专业列表",profession_managements_path %></li>
-            <li style="width: 120px"><%= link_to "实训适用课程列表", applicable_course_managements_path %></li>
-          </ul>
+        <li class="fl edu-admin-nav-li  edu-position  <%= 'active' if @menu_type == 12 %>" ><a href="javascript:void(0);" class="edu-admin-nav-a" style="border-right:none;">其它</a>
+          <!--<ul class="edu-admin-nav-inner">-->
+            <!--<li style="width: 120px"><%#= link_to "专业列表",profession_managements_path %></li>-->
+            <!--<li style="width: 120px"><%#= link_to "实训适用课程列表", applicable_course_managements_path %></li>-->
+          <!--</ul>-->
         </li>
       </ul>
       <%= render_flash_messages %>
diff --git a/app/views/managements/_classroom_classment_list.html.erb b/app/views/managements/_classroom_classment_list.html.erb
index 61255f9ce..7b3dfeffe 100644
--- a/app/views/managements/_classroom_classment_list.html.erb
+++ b/app/views/managements/_classroom_classment_list.html.erb
@@ -2,7 +2,7 @@
   <thead>
   <tr>
     <th width="9%">ID</th>
-    <th width="20%" class="edu-txt-left">课堂名称</th>
+    <th width="18%" class="edu-txt-left">课堂名称</th>
     <th width="4%">成员</th>
     <th width="4%">资源</th>
     <th width="4%">作业</th>
@@ -10,9 +10,9 @@
     <th width="4%">私有</th>
     <th width="8%">状态</th>
     <th width="13%" class="edu-txt-left">创建者单位</th>
-    <th width="11%">创建者</th>
+    <th width="8%">创建者</th>
     <th class="eud-pointer" width="11%">动态时间<i class="fa <%= @sx_order == "desc" ? "fa-long-arrow-down" : "fa-long-arrow-up" %> color-light-green ml5" title="功能完善中，敬请期待"></i></th>
-    <th>首页显示</th>
+    <th>操作</th>
   </tr>
   </thead>
   <tbody>
@@ -30,8 +30,9 @@
         <td> <%= link_to course.teacher.show_real_name, user_path(course.teacher) %></td>
         <td> <%= format_time(course.updatetime) %></td>
         <td>
+          <a href="script:void(0)">删除</a>
           <input type="checkbox" name="homepage_show"  value="<%= course.id %>" <%= course.homepage_show ? "checked" : "" %> class="ml-3 mr5 magic-checkbox" id="join_course_role_<%= course.id %>">
-          <label style="top:-14px;padding-left: 55px;float:right;" for="join_course_role_<%= course.id %>"></label>
+          <label style="top:0px;padding-left: 25px;float:right;" for="join_course_role_<%= course.id %>">首页显示</label>
         </td>
       </tr>
   <% end %>
diff --git a/app/views/managements/_classroom_list.html.erb b/app/views/managements/_classroom_list.html.erb
index a77607945..c005118e3 100644
--- a/app/views/managements/_classroom_list.html.erb
+++ b/app/views/managements/_classroom_list.html.erb
@@ -2,28 +2,42 @@
   <thead>
   <tr>
     <th width="9%">ID</th>
-    <th width="10%">层级</th>
-    <th width="12%" class="edu-txt-left">学科门类</th>
-    <th width="12%">一级学科</th>
-    <th width="12%">专业名称</th>
-    <th width="15%" class="edu-txt-left">课程名称</th>
-    <th width="12%">创建者</th>
-    <th class="eud-pointer">创建时间<i class="fa <%= @sx_order == "desc" ? "fa-long-arrow-down" : "fa-long-arrow-up" %> color-light-green ml5"></i></th>
+    <!--<th width="10%">层级</th>-->
+    <!--<th width="12%" class="edu-txt-left">学科门类</th>-->
+    <!--<th width="12%">一级学科</th>-->
+    <!--<th width="12%">专业名称</th>-->
+    <th width="35%" class="edu-txt-left">课程名称</th>
+    <th width="8%">课堂</th>
+    <th width="8%">实训</th>
+    <th width="10%">创建者</th>
+    <th width="15%" class="eud-pointer">创建时间<i class="fa <%= @sx_order == "desc" ? "fa-long-arrow-down" : "fa-long-arrow-up" %> color-light-green ml5"></i></th>
+    <th>操作</th>
   </tr>
   </thead>
   <tbody>
   <% @syllabus.each_with_index do |syllabus,index| %>
       <tr>
         <td><%= index + 1 %></td>
-        <td><%= syllabus.syllabus_major_level == '' ? "--" : syllabus.syllabus_major_level %></td>
-        <td class="edu-txt-left"><%= syllabus.syllabus_discipline_category == '' ? "--" : syllabus.syllabus_discipline_category %></td>
-        <td><%= syllabus.syllabus_first_level_discipline == "" ? "--" : syllabus.syllabus_first_level_discipline %></td>
-        <td><%= syllabus.syllabus_major == "" ? "--" : syllabus.syllabus_major %></td>
+        <!--<td><%#= syllabus.syllabus_major_level == '' ? "--" : syllabus.syllabus_major_level %></td>-->
+        <!--<td class="edu-txt-left"><%#= syllabus.syllabus_discipline_category == '' ? "--" : syllabus.syllabus_discipline_category %></td>-->
+        <!--<td><%#= syllabus.syllabus_first_level_discipline == "" ? "--" : syllabus.syllabus_first_level_discipline %></td>-->
+        <!--<td><%#= syllabus.syllabus_major == "" ? "--" : syllabus.syllabus_major %></td>-->
         <td class="edu-txt-left">
             <%= link_to syllabus.title,syllabus_path(syllabus.id) %>
         </td>
+        <td>
+           <%= syllabus.courses.count %>
+        </td>
+        <td>
+          <%=  %>
+        </td>
         <td><%= link_to syllabus.user.show_real_name, user_path(syllabus.user) %></td>
         <td><%= format_time syllabus.created_at %></td>
+        <td>
+          <a href="script:void(0)">删除</a>
+          <input type="checkbox" name="homepage_show"  value="<%= syllabus.id %>" class="ml-3 mr5 magic-checkbox" id="join_course_role_<%= syllabus.id %>">
+          <label style="top:0px;padding-left: 25px;float:right;" for="join_course_role_<%= syllabus.id %>">支持实训检索</label>
+        </td>
       </tr>
   <% end %>
   </tbody>
diff --git a/app/views/managements/_departments_part_list.html.erb b/app/views/managements/_departments_part_list.html.erb
index c233826d9..8c4ec992b 100644
--- a/app/views/managements/_departments_part_list.html.erb
+++ b/app/views/managements/_departments_part_list.html.erb
@@ -25,7 +25,7 @@
          </span>
       </td>
       <td><%= schools.province %></td>
-      <td class="edu-txt-left"><%= schools.province == nil ? "--" :schools.province%><%= schools.city == nil ? "" :schools.city %><%= schools.address == nil ? "" :schools.address %></td>
+      <td class="edu-txt-left"><%= ApplyAddSchools.where(:school_id => schools.id,:status => 1).map(&:address).join("-") %></td>
       <td><%= UserExtensions.where(:school_id => schools.id).count %></td>
       <td><%= schools.departments.count %></td>
       <td><%= format_time schools.created_at %></td>
diff --git a/app/views/managements/_user_list.html.erb b/app/views/managements/_user_list.html.erb
index 464973fa0..e7144f7b6 100644
--- a/app/views/managements/_user_list.html.erb
+++ b/app/views/managements/_user_list.html.erb
@@ -15,7 +15,9 @@
   <% @users.each do |user| %>
       <tr>
         <td><%= user.login %></td>
-        <td><a href="<%= user_path(user) %>" class="edu-txt-w100 task-hide" title="<%= user.try(:show_real_name) %>"><%= user.try(:show_real_name) %></a></td>
+        <td>
+          <%= link_to user.try(:show_real_name),user_path(user) %>
+        </td>
         <td><span class="edu-txt-w140 task-hide" title="<%= user.mail.blank? ? "--" : user.mail %>"><%= user.mail.blank? ? "--" : user.mail %></span></td>
         <td title="<%= user.phone.blank? ? "--" : user.phone %>"><%= user.phone.blank? ? "--" : user.phone %></td>
         <td>
diff --git a/app/views/managements/_users_authorization_list.html.erb b/app/views/managements/_users_authorization_list.html.erb
index 4f62413f7..f4ba918d8 100644
--- a/app/views/managements/_users_authorization_list.html.erb
+++ b/app/views/managements/_users_authorization_list.html.erb
@@ -4,6 +4,7 @@
     <th >&nbsp;</th>
     <th>ID</th>
     <th>真实姓名</th>
+    <th>昵称</th>
     <th>职业</th>
     <th><a href="javascript:void(0);">学号</a></th>
     <th>实名</th>
@@ -26,6 +27,7 @@
         <td>
           <%= link_to user.try(:show_real_name), user_path(user), :class => "edu-txt-w100 task-hide2" %>
         </td>
+        <td><%= user.nickname == ""? "--" : user.nickname %></td>
         <td><%= user.identity %></td>
         <td><%= user.try(:user_extensions).try(:student_id).blank? ? "--" : user.try(:user_extensions).try(:student_id) %></td>
         <td><%= user.authentication ? "已认证" : "未认证" %></td>
diff --git a/app/views/managements/classroom.html.erb b/app/views/managements/classroom.html.erb
index 708ed6726..da83c96fc 100644
--- a/app/views/managements/classroom.html.erb
+++ b/app/views/managements/classroom.html.erb
@@ -1,16 +1,16 @@
 <%= form_tag(url_for(classroom_managements_path),:id=>"classroom",:method => "post",:remote=>true) do %>
 <div class="edu-con-top clearfix xmt10">
-  <%= select_tag :major_level,options_for_select(major_level_option, 0), {:id=>"major_level", :class=>"fl task-form-15 task-height-30", :style => "margin:0px 10px 0px 25px;"} %>
-  <%= select_tag :discipline_category_id,options_for_select(discipline_category_option, nil), {:id=>"discipline_category_id", :class=>"fl task-form-15 task-height-30", :style => "margin:0px 30px 0px 50px;"} %>
-  <%= select_tag :first_level_discipline_id,options_for_select(first_level_discipline_option, nil), {:id=>"first_level_discipline_id", :class=>"fl task-form-20 task-height-30", :style => "margin:0px 30px 0px 25px;"} %>
-  <%= select_tag :major_id,options_for_select(syllabus_major_option, nil), {:id=>"major_id", :class=>"fl task-form-20 task-height-30", :style => "margin:0px 30px 0px 25px;"} %>
-  <li class="clearfix mb10 ml35 mt15 fl" style="display: inline-block">
-    <input nhname="tag" autocomplete="off" maxlength="36"  nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="school" class="task-height-40 panel-box-sizing fl" type="text"  placeholder="请选择学校" style="width: 330px" />
-    <input nhname="tag" nh_tag_5="true" class="fl" id="school_id" name="school_id" style="display:none;" type="text"/> <!-- 单位名称的test框选中下拉列表框的id -->
-    <div class="cl"></div>
-  </li>
-  <div id="search_school_result_list" style="width: 330px;line-height: 1.5;min-height:20px; max-height: 200px; height: auto !important;display:none;background: white;overflow: scroll;border: solid 1px #cccccc; overflow-x: hidden; overflow-y: auto;">
-  </div>
+  <%#= select_tag :major_level,options_for_select(major_level_option, 0), {:id=>"major_level", :class=>"fl task-form-15 task-height-30", :style => "margin:0px 10px 0px 25px;"} %>
+  <%#= select_tag :discipline_category_id,options_for_select(discipline_category_option, nil), {:id=>"discipline_category_id", :class=>"fl task-form-15 task-height-30", :style => "margin:0px 30px 0px 50px;"} %>
+  <%#= select_tag :first_level_discipline_id,options_for_select(first_level_discipline_option, nil), {:id=>"first_level_discipline_id", :class=>"fl task-form-20 task-height-30", :style => "margin:0px 30px 0px 25px;"} %>
+  <%#= select_tag :major_id,options_for_select(syllabus_major_option, nil), {:id=>"major_id", :class=>"fl task-form-20 task-height-30", :style => "margin:0px 30px 0px 25px;"} %>
+  <!--<li class="clearfix mb10 ml35 mt15 fl" style="display: inline-block">-->
+    <!--<input nhname="tag" autocomplete="off" maxlength="36"  nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="school" class="task-height-40 panel-box-sizing fl" type="text"  placeholder="请选择学校" style="width: 330px" />-->
+    <!--<input nhname="tag" nh_tag_5="true" class="fl" id="school_id" name="school_id" style="display:none;" type="text"/> &lt;!&ndash; 单位名称的test框选中下拉列表框的id &ndash;&gt;-->
+    <!--<div class="cl"></div>-->
+  <!--</li>-->
+  <!--<div id="search_school_result_list" style="width: 330px;line-height: 1.5;min-height:20px; max-height: 200px; height: auto !important;display:none;background: white;overflow: scroll;border: solid 1px #cccccc; overflow-x: hidden; overflow-y: auto;">-->
+  <!--</div>-->
   <!--</select>-->
   <select class="fl task-form-15 task-height-30"  style="margin:20px 0px 10px 25px;width: 11%" name="keyword" id="condition">
     <option value="u_name">创建者姓名搜索</option>
diff --git a/app/views/managements/classroom_classment.html.erb b/app/views/managements/classroom_classment.html.erb
index 40f68d736..0be932dba 100644
--- a/app/views/managements/classroom_classment.html.erb
+++ b/app/views/managements/classroom_classment.html.erb
@@ -15,7 +15,7 @@
 
       <select class="fl task-form-15 task-height-30"  style="margin:0px 0px 10px 25px;width: 11%" name="keyword" id="condition_status">
         <option value="u_name">创建者姓名搜索</option>
-        <option value="cla_name">班级名称搜索</option>
+        <option value="cla_name">课程名称搜索</option>
       </select>
       <input class="fl task-form-20 task-height-30" name="search" maxlength="" placeholder="输入关键字进行搜索" type="text" style="height: 21px;" id="Look_name"  >
       <a href="javascript:void(0);" class="fl task-btn task-btn-blue ml5" onclick="$('#class_publish_shixuns_search').submit();">搜索</a>
diff --git a/app/views/managements/departments.html.erb b/app/views/managements/departments.html.erb
index 52d67560e..cfdc9db60 100644
--- a/app/views/managements/departments.html.erb
+++ b/app/views/managements/departments.html.erb
@@ -1,6 +1,6 @@
 <%= form_tag(url_for(departments_managements_path),:id=>"department_search",:method => "post",:remote=>true) do %>
 <div class="edu-con-top clearfix mb20 xmt10">
-  <input class="fl task-form-20 task-height-30 ml35" id="shixun_Look_name" name="search" maxlength="" placeholder="输入关键字进行搜索" type="text" style="height: 21px;" onkeyup="myFunction()">
+  <input class="fl task-form-20 task-height-30 ml35" id="shixun_Look_name" name="search" maxlength="" placeholder="输入关键字进行搜索" type="text" style="height: 21px;">
   <a href="javascript:void(0);" class="fl task-btn task-btn-blue ml5 mt2" onclick="$('#department_search').submit();">搜索</a>
   <a href="javascript:clearSearchCondition();" class="fl task-btn ml5 mt2" id="clear_contents">清除</a>
   <%= link_to '创建',{:controller => 'managements', :action => 'create_departments'}, :remote => true, :class => "task-btn task-btn-green fr mt6 mr30" %>
diff --git a/app/views/managements/users.html.erb b/app/views/managements/users.html.erb
index 506df5b60..7da7b7f54 100644
--- a/app/views/managements/users.html.erb
+++ b/app/views/managements/users.html.erb
@@ -20,13 +20,78 @@
         </ul>
       </div>
       <div class="fl with30">
-        <input type="text" class="fl task-form-60 task-height-40 panel-box-sizing" name="research_contents" placeholder="输入关键字进行搜索">
-        <a href="javascript:void(0);" class="fl task-btn task-btn-blue ml5 mt5" onclick="$('#managements_users_search').submit();">搜索</a>
-        <a href="javascript:void(0);" class="fl task-btn ml5 mt5" id="clear_contents">清除</a>
+        <input type="text" class="fl task-form-100 task-height-40 panel-box-sizing" name="research_contents" placeholder="输入关键字进行搜索">
       </div>
-     <!-- <a href="javascript:void(0);" class="fr task-btn task-btn-green mt5">新建用户</a>-->
+      <li class="fl task-height-30 mb10 ml35" style="display: inline-block">
+        <input nhname="tag" autocomplete="off" maxlength="36"  nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="school" class="task-height-40 panel-box-sizing fl" type="text"  placeholder="请输入单位名称关键字进行搜索" style="width: 330px" />
+        <input nhname="tag" nh_tag_5="true" class="fl" id="school_id" name="school_id" style="display:none;" type="text"/> <!-- 单位名称的test框选中下拉列表框的id -->
+        <div class="cl"></div>
+      </li>
+      <div id="search_school_result_list" style="width: 330px;line-height: 1.5;min-height:20px; max-height: 200px; height: auto !important;display:none;background: white;overflow: scroll;border: solid 1px #cccccc; overflow-x: hidden; overflow-y: auto;">
+      </div>
+
+      <a href="javascript:void(0);" class="fl task-btn task-btn-blue ml5 mt5" onclick="$('#managements_users_search').submit();">搜索</a>
+      <a href="javascript:void(0);" class="fl task-btn ml5 mt5" id="clear_contents">清除</a>
+
+      <!-- <a href="javascript:void(0);" class="fr task-btn task-btn-green mt5"> 新建用户</a>-->
+
   <% end %>
 </div>
 <div class="edu-con-bg01 mt15" id="managements_user_list">
   <%= render :partial => "managements/user_list" %>
-</div>
\ No newline at end of file
+</div>
+<script>
+    $("input[name='school']").on('input', function (e) {
+        throttle(department_search_fn, window, e);
+    });
+    var d_lastSearchCondition = '';
+    var d_page = 1; //唯一控制页码 变量
+    var d_count = 0; //查询结果的总量
+    var d_maxPage = 0;//最大页面值
+    function department_search_fn(e) {
+        if($(e.target).val().trim() == ''){
+            $("#search_school_result_list").hide();
+            $("input[name='school_id']").val("");
+            return;
+        }
+        if ($(e.target).val().trim() == d_lastSearchCondition && $(e.target).val().trim() != '') {//如果输入框没有改变或者输入框为空就返回
+            return;
+        }
+        d_lastSearchCondition = $(e.target).val().trim();
+        page = 1; //有新的搜索，页面重置为1
+        $.ajax({
+            url: '<%= url_for(:controller => 'school',:action => 'on_search') %>' + '?name=' + e.target.value + '&school_id=' + $("input[name='occupation']").val() + '&page=' + d_page,
+            type: 'post',
+            success: function (data) {
+                d_schoolsResult = data.schools;
+                count = data.count;
+                maxPage = Math.ceil(count / 100); //最大页码值
+                if (d_schoolsResult.length != undefined && d_schoolsResult.length != 0) {
+                    var i = 0;
+                    $("#search_school_result_list").html('');
+                    for (; i < d_schoolsResult.length; i++) {
+                        link = '<a onclick="window.changeSchoolValue(\'' + d_schoolsResult[i].school.name.replace(/\s/g, " ") + '\',\'' + d_schoolsResult[i].school.id + '\')" href="javascript:void(0)">' + d_schoolsResult[i].school.name + '</a><br/>';
+                        $("#search_school_result_list").append(link);
+                    }
+                    $("#search_school_result_list").css('left', $(e.target).offset().left);
+                    $("#search_school_result_list").css('top', $(e.target).offset().top + 40);
+                    $("#search_school_result_list").css("position", "absolute");
+                    $("#search_school_result_list").show();
+                } else {
+                    $("#search_school_result_list").css('left', $(e.target).offset().left);
+                    $("#search_school_result_list").css('top', $(e.target).offset().top + 40);
+                    $("#search_school_result_list").css("position", "absolute");
+                    $("#search_school_result_list").html('你的学校不在列表中？请确认后输入');
+                    $("#search_school_result_list").show();
+                }
+            }
+        });
+    }
+    //修改部门
+    function changeSchoolValue(value, data) {
+        console.log(value+","+data)
+        $("input[name='school']").val(value);
+        $("input[name='school_id']").val(data);
+        $("#search_school_result_list").hide();
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/managements/users_trial.html.erb b/app/views/managements/users_trial.html.erb
index 176f1ed04..e3932c533 100644
--- a/app/views/managements/users_trial.html.erb
+++ b/app/views/managements/users_trial.html.erb
@@ -26,6 +26,7 @@
         <li data-val="name">真实姓名搜索</li>
         <li data-val="email">邮箱地址搜索</li>
         <li data-val="phone">手机号码搜索</li>
+        <li data-val="nickname">用户昵称搜索</li>
       </ul>
     </div>
     <div class="fl with30">
diff --git a/app/views/shixuns/_send_shixuns.html.erb b/app/views/shixuns/_send_shixuns.html.erb
index fe3fe993a..6d44ee90b 100644
--- a/app/views/shixuns/_send_shixuns.html.erb
+++ b/app/views/shixuns/_send_shixuns.html.erb
@@ -1,50 +1,50 @@
-<div class="task-popup" style="width:550px;">
-  <div class="task-popup-title clearfix task-popup-bggrey">
-    <h3 class="fl">发送实训</h3>
-    <a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a>
-  </div>
-  <div class="task_popup_con">
-    <div class="newupload_conbox">
-      <div class="alert alert-orange mb15 font-12">
-        <button data-dismiss="alert" class="task-close fr" type="button">×</button>
-        选择的实训将会发送到指定课堂
-      </div>
-      <div class="mb10 edu-position">
-        <input class="task-form-100 task-height-40 panel-box-sizing" id="hb_search_course_input" name="search" 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 mb5 edu-bg-light-blue edu-max-h260">
-        <input type="hidden" name="homework_id[]">
-        <ul class="" id="search_course_list">
-          <li class="clearfix">
-            <label class="fl mt5 ml5 edu-class-pop-label edu-color-grey">
-              <input id="send_shixun_1" type="checkbox" class="fl mt8 mr5 magic-checkbox" name="shixun" value="0">
-              <label for="send_shixun_1" class="edu-info-dark task-hide fl" title="C++基本课程">C++基本课程</label>
-            </label>
-          </li>
-          <li class="clearfix">
-            <label class="fl mt5 ml5 edu-class-pop-label edu-color-grey">
-              <input id="send_shixun_2" type="checkbox" class="fl mt8 mr5 magic-checkbox" name="shixun" value="1">
-              <label for="send_shixun_2" class="edu-info-dark task-hide fl" title="软件测试">软件测试</label>
-            </label>
-          </li>
-        </ul>
-      </div>
-      <p><span class="c_red undis notice">请至少选择一个实训</span></p>
-      <div>
-        <div class="fl pages_little_show">
-          <ul>
-            <li><a href="" class="pages-big" data-remote="true">上一页</a></li>
-            <li><a class="active">1</a></li>
-            <li><a href="" class="pages-big pages-border-right" data-remote="true">下一页</a></li>
-          </ul>
-          <div class="cl"></div>
-        </div>
-        <span class="color-red undis fl" id="search_course_notice_h"></span>
-        <a href="javascript:void(0);" class="task-btn task-btn-blue fr">确定</a>
-        <a href="javascript:void(0);" class="pop_close task-btn fr mr10">取消</a>
-        <div class="cl"></div>
-      </div>
-    </div>
-  </div>
+<div class="task-popup" style="width:550px;">
+  <div class="task-popup-title clearfix task-popup-bggrey">
+    <h3 class="fl">发送实训</h3>
+    <a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a>
+  </div>
+  <div class="task_popup_con">
+    <div class="newupload_conbox">
+      <div class="alert alert-orange mb15 font-12">
+        <button data-dismiss="alert" class="task-close fr" type="button">×</button>
+        选择的实训将会发送到指定课堂
+      </div>
+      <div class="mb10 edu-position">
+        <input class="task-form-100 task-height-40 panel-box-sizing" id="hb_search_course_input" name="search" 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 mb5 edu-bg-light-blue edu-max-h260">
+        <input type="hidden" name="homework_id[]">
+        <ul class="" id="search_course_list">
+          <li class="clearfix">
+            <label class="fl mt5 ml5 edu-class-pop-label edu-color-grey">
+              <input id="send_shixun_1" type="checkbox" class="fl mt8 mr5 magic-checkbox" name="shixun" value="0">
+              <label for="send_shixun_1" class="edu-info-dark task-hide fl" title="C++基本课程">C++基本课程</label>
+            </label>
+          </li>
+          <li class="clearfix">
+            <label class="fl mt5 ml5 edu-class-pop-label edu-color-grey">
+              <input id="send_shixun_2" type="checkbox" class="fl mt8 mr5 magic-checkbox" name="shixun" value="1">
+              <label for="send_shixun_2" class="edu-info-dark task-hide fl" title="软件测试">软件测试</label>
+            </label>
+          </li>
+        </ul>
+      </div>
+      <p><span class="c_red undis notice">请至少选择一个实训</span></p>
+      <div>
+        <div class="fl pages_little_show">
+          <ul>
+            <li><a href="" class="pages-big" data-remote="true">上一页</a></li>
+            <li><a class="active">1</a></li>
+            <li><a href="" class="pages-big pages-border-right" data-remote="true">下一页</a></li>
+          </ul>
+          <div class="cl"></div>
+        </div>
+        <span class="color-red undis fl" id="search_course_notice_h"></span>
+        <a href="javascript:void(0);" class="task-btn task-btn-blue fr">确定</a>
+        <a href="javascript:void(0);" class="pop_close task-btn fr mr10">取消</a>
+        <div class="cl"></div>
+      </div>
+    </div>
+  </div>
 </div>
\ No newline at end of file
diff --git a/app/views/syllabuses/_join_syllabuses.html.erb b/app/views/syllabuses/_join_syllabuses.html.erb
index 99c74ac56..253ce22ff 100644
--- a/app/views/syllabuses/_join_syllabuses.html.erb
+++ b/app/views/syllabuses/_join_syllabuses.html.erb
@@ -4,16 +4,16 @@
         <% if !(@status == 2 && course_count == 0) %>
             <div class="clearfix edu-class-con-list padding15">
               <div class="fl task-form-90">
-                <a href="javascript:void(0)" class="edu-class-inner-list fl" style="color: #333;" id="join_syllabus_list_<%= index %>"><i class="fa fa-plus-circle color-blue mr10"></i><%= syllabus.title.strip() %></a>
-                <span class="fr font-12 color-grey mt3"><%= format_time syllabus.updated_at %> 更新</span>
+                <a href="javascript:void(0)" class="edu-class-inner-list fl" style="color: #333;" id="join_syllabus_list_<%= index %>"><i class="fa fa-plus-circle color-orange02 mr10"></i><%= syllabus.title.strip() %></a>
+                <!--<span class="fr font-12 color-grey mt3"><%#= format_time syllabus.updated_at %> 更新</span>-->
               </div>
               <script>
                   $("#join_syllabus_list_<%= index %>").click(function(e){
-                      $(this).toggleClass("color-blue");
+//                      $(this).toggleClass("color-blue");
 
                       $t = $(e.target);
                       if($t.is('a')){
-                          window.open("<%= syllabus_path(syllabus.id) %>");
+//                          window.open("<%#= syllabus_path(syllabus.id) %>");
                       }else if($t.is('i')){
                           if($t.hasClass("fa-minus-circle")){
                               $t.removeClass("fa-minus-circle");
@@ -26,18 +26,18 @@
                       }
                   })
               </script>
-              <div class="fr edu-position edu-position-hidebox mr5 mt7">
-                <a href="javascript:void(0);"><i class="fa fa-bars font-16"></i></a>
-                <ul class="edu-position-hide undis">
-                  <li><%= link_to "新建班级", new_course_path(:syllabus_id => syllabus.id), :target => '_blank', :title => "新建班级"%></li>
-                  <li><%= link_to '查看课程', syllabus_path(syllabus.id), :target =>'_blank', :title => '查看课程' %></li>
-                  <li>
-                    <% if User.current == syllabus.user || User.current.admin? %>
-                        <%= link_to '删除课程', delete_syllabus_syllabus_path(syllabus), :remote => 'true' %>
-                    <% end %>
-                  </li>
-                </ul>
-              </div>
+              <!--<div class="fr edu-position edu-position-hidebox mr5 mt7">-->
+                <!--<a href="javascript:void(0);"><i class="fa fa-bars font-16"></i></a>-->
+                <!--<ul class="edu-position-hide undis">-->
+                  <!--<li><%#= link_to "新建班级", new_course_path(:syllabus_id => syllabus.id), :target => '_blank', :title => "新建班级"%></li>-->
+                  <!--<li><%#= link_to '查看课程', syllabus_path(syllabus.id), :target =>'_blank', :title => '查看课程' %></li>-->
+                  <!--<li>-->
+                    <!--<%# if User.current == syllabus.user || User.current.admin? %>-->
+                        <!--<%#= link_to '删除课程', delete_syllabus_syllabus_path(syllabus), :remote => 'true' %>-->
+                    <!--<%# end %>-->
+                  <!--</li>-->
+                <!--</ul>-->
+              <!--</div>-->
             </div>
             <ul class="edu-class-list-inner none" id="join_syllabus_course_list_<%= index %>">
               <% if @status == 1 %>
diff --git a/app/views/syllabuses/_my_syllabuses.html.erb b/app/views/syllabuses/_my_syllabuses.html.erb
index 2ae67576a..d1e5ceb67 100644
--- a/app/views/syllabuses/_my_syllabuses.html.erb
+++ b/app/views/syllabuses/_my_syllabuses.html.erb
@@ -1,54 +1,25 @@
-<% if @my_syllabuses.count > 0 %>
-    <% @my_syllabuses.each_with_index do |syllabus, index|%>
-        <% course_count = @status == 1 ? syllabus.courses.where("is_delete = 0 and is_end = 0").count : syllabus.courses.where("is_delete = 0 and is_end = 1").count %>
-        <% if !(@status == 2 && course_count == 0) %>
-            <div class="clearfix edu-class-con-list padding15">
-              <div class="fl task-form-90">
-                <a href="javascript:void(0)" class="edu-class-inner-list fl" style="color: #333;" id="syllabus_list_<%= index %>" ><i class="fa fa-plus-circle color-blue mr10"></i><%= syllabus.title.strip() %></a>
-                <span class="fr font-12 color-grey mt3"><%= format_time syllabus.updated_at %> 更新</span>
-              </div>
-              <script>
-                  $("#syllabus_list_<%= index %>").click(function(e){
-                      $(this).toggleClass("color-blue");
-
-                      $t = $(e.target);
-                      if($t.is('a')){
-                          window.open("<%= syllabus_path(syllabus.id) %>");
-                      }else if($t.is('i')){
-                          if($t.hasClass("fa-minus-circle")){
-                              $t.removeClass("fa-minus-circle");
-                              $t.addClass("fa-plus-circle");
-                          }else{
-                              $t.addClass("fa-minus-circle");
-                              $t.removeClass("fa-plus-circle");
-                          }
-                          $("#syllabus_course_list_<%= index %>").toggle();
-                      }
-                  })
-              </script>
-              <div class="fr edu-position edu-position-hidebox mr5 mt7">
-                <a href="javascript:void(0);"><i class="fa fa-bars font-16"></i></a>
-                <ul class="edu-position-hide undis">
-                  <li><%= link_to "新建班级", new_course_path(:syllabus_id => syllabus.id), :target => '_blank', :title => "新建班级"%></li>
-                  <li><%= link_to '查看课程', syllabus_path(syllabus.id), :target =>'_blank', :title => '查看课程' %></li>
-                  <li>
-                    <% if User.current == syllabus.user || User.current.admin? %>
-                        <%= link_to '删除课程', delete_syllabus_syllabus_path(syllabus), :remote => 'true' %>
-                    <% end %>
-                  </li>
-                </ul>
-              </div>
-            </div>
-            <ul class="edu-class-list-inner none" id="syllabus_course_list_<%= index %>">
-              <% if @status == 1 %>
-                  <% courses = syllabus.courses.where("is_delete = 0 and is_end = 0").select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("updatetime desc") %>
-              <% else %>
-                  <% courses = syllabus.courses.where("is_delete = 0 and is_end = 1").select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("updatetime desc") %>
-              <% end %>
-              <%= render :partial => 'syllabuses/courses_list', :locals => { :courses => courses, :syllabus => syllabus} %>
-            </ul>
-        <% end %>
-    <% end %>
-<% else %>
+<% if @courses.blank? %>
     <%= render :partial => 'welcome/no_data' %>
-<% end %>
\ No newline at end of file
+<% else %>
+    <div class="homepage-list-show">
+      <% @courses.each do |course| %>
+          <p class="clearfix pl10">
+            <a href="<%= course_path(course) %>" target="_blank" class="font-16 first color-grey3 color-grey"><i class="fa fa-circle-o color-orange02 font-12 ml5 mr5" aria-hidden="true"></i><%= course.name %></a>
+            <span class="font-14 hasmargin color-grey"></span>
+            <span class="font-14 hasmargin"><a href="<%= user_path(course.tea_id) %>" class="color-grey" target="_blank"><%= User.where(:id => course.tea_id).first.show_name %></a></span>
+            <span class="font-14 mr25 color-grey fr"><%= time_from_now course.updated_at %>更新</span>
+          </p>
+      <% end %>
+    </div>
+    <%# if @courses_count > 15 %>
+        <div class="cl"></div>
+        <div style="text-align:center;" class="new_expand">
+          <div class="pages_user_show" style="width:auto; display:inline-block;margin: 18px 0;">
+            <ul id="homework_pository_ref_pages">
+              <%= pagination_links_full @courses_pages, @courses_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>
+            </ul>
+            <div class="cl"></div>
+          </div>
+        </div>
+    <%# end %>
+<% end %>
diff --git a/app/views/syllabuses/_syllabus_index.html.erb b/app/views/syllabuses/_syllabus_index.html.erb
new file mode 100644
index 000000000..139b18b01
--- /dev/null
+++ b/app/views/syllabuses/_syllabus_index.html.erb
@@ -0,0 +1,11 @@
+<div class="edu-class-inner-max" style="min-height:700px;">
+  <p class="edu-con-top clearfix" style="height: 50px">
+    <a href="<%= syllabuses_path(:type => 1, :tab => @tab) %>" class="fl ml15 edu-filter-cir-grey mr5 font-12 active mt12" data-remote="true" id="syllabuses_processing">正在进行</a>
+    <a href="<%= syllabuses_path(:type => 2, :tab => @tab) %>" class="fl edu-filter-cir-grey mr5 font-12 mt12" data-remote="true" id="syllabuses_end">已结束</a>
+    <a href="/courses/new" class="color-light-green fr font-14 mr30 mt12" >+&nbsp;新建</a>
+    <a href="/courses/join_private_courses" class="color-light-green fr mr20 font-14 mt12" data-method="post" data-remote="true" rel="nofollow" >+&nbsp;加入</a>
+  </p>
+  <div id="my_syllabuses">
+    <%= render :partial => "syllabuses/my_syllabuses" %>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/syllabuses/index.html.erb b/app/views/syllabuses/index.html.erb
index 6dd582a21..ecb82bfd1 100644
--- a/app/views/syllabuses/index.html.erb
+++ b/app/views/syllabuses/index.html.erb
@@ -1,42 +1,25 @@
-<div class="edu-class-container" >
+<div class="edu-class-container">
   <p class="mb10"><i class="fa fa-map-marker mr5 color-grey" ></i>
     <%= link_to User.current.show_real_name, user_path(User.current) %> > <%= link_to '在线课堂', courses_path() %> > 我的课堂
   </p>
-  <div class="edu-con-bg01 edu-bg-shadow">
+  <div class="edu-con-bg01">
     <div class="">
       <div class="edu-tab clearfix mb20">
         <ul id="edu-tab-nav" class="border-bottom-orange">
-          <li id="edu-tab-nav-1" class="new-tab-nav background-orange" onclick="HoverLi(1)">
-            <a href="javascript:void(0);" class="tab_type">我的发布</a>
+          <li id="edu-tab-nav-1" class="new-tab-nav background-orange">
+            <%=link_to "全部", syllabuses_path(:tab => 1), :class => "tab_type", :remote => true %>
           </li>
-          <li id="edu-tab-nav-2" class="new-tab-nav" onclick="HoverLi(2)">
-            <a href="javascript:void(0);" class="tab_type">我的参与</a>
+          <li id="edu-tab-nav-2" class="new-tab-nav">
+            <%=link_to "我的发布", syllabuses_path(:tab => 2), :class => "tab_type", :remote => true %>
+          </li>
+          <li id="edu-tab-nav-3" class="new-tab-nav">
+            <%=link_to "我的参与", syllabuses_path(:tab => 3), :class => "tab_type", :remote => true %>
           </li>
         </ul>
         <div class="cl"></div>
 
-        <div id="edu-tab-con-1">
-          <div class=" edu-class-inner-max" style="min-height:700px;">
-            <p class="edu-con-top clearfix">
-              <a href="<%= syllabuses_path(:type => 1, :tab => 1) %>" class="fl ml15 edu-filter-cir-grey mr5 font-12 active" data-remote="true" id="syllabuses_processing">正在进行</a>
-              <a href="<%= syllabuses_path(:type => 2, :tab => 1) %>" class="fl edu-filter-cir-grey mr5 font-12" data-remote="true" id="syllabuses_end">已结束</a>
-            </p>
-            <div id="my_syllabuses">
-              <%= render :partial => "syllabuses/my_syllabuses" %>
-            </div>
-          </div>
-        </div>
-
-        <div id="edu-tab-con-2" class="undis">
-          <p class="edu-con-top clearfix">
-            <a href="<%= syllabuses_path(:type => 1, :tab => 2) %>" class="fl ml15 edu-filter-cir-grey mr5 active font-12" data-remote="true" id="syllabuses_processing">正在进行</a>
-            <a href="<%= syllabuses_path(:type => 2, :tab => 2) %>" class="fl edu-filter-cir-grey mr5 font-12" data-remote="true" id="syllabuses_end">已结束</a>
-          </p>
-          <div class="edu-class-inner-max" style="min-height:700px;">
-            <div id="join_syllabuses">
-              <%= render :partial => "syllabuses/join_syllabuses" %>
-            </div>
-          </div>
+        <div id="edu-tab-con" class="edu-bg-shadow">
+          <%= render :partial => "syllabus_index" %>
         </div>
         <div class="cl"></div>
       </div>
diff --git a/app/views/syllabuses/index.js.erb b/app/views/syllabuses/index.js.erb
index 0539df6fa..8e72c4998 100644
--- a/app/views/syllabuses/index.js.erb
+++ b/app/views/syllabuses/index.js.erb
@@ -1,5 +1,7 @@
-<% if params[:tab].to_i == 1 %>
+<% if params[:page] || params[:type] %>
     $("#my_syllabuses").html("<%= j( render :partial => "syllabuses/my_syllabuses") %>");
-<% elsif params[:tab].to_i == 2 %>
-    $("#join_syllabuses").html("<%= j( render :partial => "syllabuses/join_syllabuses") %>");
+<% elsif params[:tab] %>
+    $(".new-tab-nav").removeClass('background-orange');
+    $('#edu-tab-nav-<%= @tab %>').addClass('background-orange');
+    $("#edu-tab-con").html("<%= j( render :partial => "syllabuses/syllabus_index") %>");
 <% end %>
diff --git a/app/views/users/shixuns.html.erb b/app/views/users/shixuns.html.erb
index 246a0ec86..521884686 100644
--- a/app/views/users/shixuns.html.erb
+++ b/app/views/users/shixuns.html.erb
@@ -1,7 +1,7 @@
 <div class="edu-class-container "  >
   <p class="mb10"><i class="fa fa-map-marker mr5 color-grey " ></i><a href="<%= user_path(@user) %>"><%= @user.show_name %> </a> >
     <a href="<%= shixuns_path %>">全部实训 </a> > 我的实训 </p>
-  <div class="edu-con-bg01 edu-bg-shadow" >
+  <div class="edu-con-bg01" >
     <div class="">
       <div class="edu-tab clearfix mb20"   >
         <ul id="edu-tab-nav" class="border-bottom-orange">
@@ -11,15 +11,16 @@
           <li id="edu-tab-nav-2" class="new-tab-nav">
             <a href="javascript:void(0);" class="tab_type" >我已参与</a>
           </li>
+          <a href="javascript:void(0);" class="color-light-green fr font-16 mr30 mt10" onclick="shixun_new(<%= @mail %>)">+&nbsp;新建</a>
         </ul>
         <div class="cl"></div>
-        <div id="edu-tab-con-1">
+        <div id="edu-tab-con-1" class=" edu-bg-shadow">
           <%= render :partial => "users/myshixuns_list" %>
         </div>
         <div class="cl"></div>
         <div style="text-align:center;" class="mt10">
           <div class="pages_user_show" style="width:auto; display:inline-block;">
-            <ul  id="homework_pository_ref_pages">
+            <ul id="homework_pository_ref_pages">
               <%= pagination_links_full @shixun_pages, @shixuns_count, :per_page_links => false, :remote => true, :flag => true, :is_new => true %>
             </ul>
             <div class="cl"></div>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 590f7a5b8..805b52131 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -226,7 +226,7 @@
                 <li><%= link_to "+ 新建", new_shixun_path, :target => "_blank", :class => "color-light-green fr font-14 mr20", :style => "line-height:56px" %></li>
             <% end %>
           </div>
-          <div class="lesson clearfix" id="my_shixuns_list">
+          <div class="lesson clearfix homepage-list-show" id="my_shixuns_list">
             <%= render :partial => "my_homepage_shixuns_list" %>
           </div>
         </div>
@@ -249,7 +249,7 @@
             <a href="/courses/new" class="color-light-green fr font-14 mr30" style="line-height:56px">+&nbsp;新建</a>
             <a href="/courses/join_private_courses" class="color-light-green fr mr20 font-14" data-method="post" data-remote="true" rel="nofollow" style="line-height:56px">+&nbsp;加入</a>
           </div>
-          <div class="lesson clearfix" id="my_courses_list">
+          <div class="lesson clearfix homepage-list-show" id="my_courses_list">
             <%#= render :partial => "my_homepage_courses_list" %>
           </div>
         </div>
diff --git a/config/routes.rb b/config/routes.rb
index 1e7c6a9be..bc1a8e856 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -227,6 +227,7 @@ RedmineApp::Application.routes.draw do
       get 'create_departments'
       post 'add_department'
       get 'shixun_feedback'
+      match 'update_user',:via=>[:get,:post]
     end
   end
   # Enable Grack support
diff --git a/public/stylesheets/css/edu-admin.css b/public/stylesheets/css/edu-admin.css
index de8a3553e..4402e24c1 100644
--- a/public/stylesheets/css/edu-admin.css
+++ b/public/stylesheets/css/edu-admin.css
@@ -67,7 +67,7 @@ table.table-pa5 th,table.table-pa5 td{ padding:0 5px;}
 
 /* 与课程通用框架和tab   17/05/11 bylinda*/
 .edu-class-con{ width:50%; margin:0px auto; font-size:14px; padding:50px 0;}
-.edu-con-bg01{ width: 100%; background:#fff;}
+.edu-con-bg01{ width: 100%; -background:#fff;}
 .edu-class-box{ width:100%;}
 .edu-class-container{ width: 1200px; margin:10px auto 20px;}
 .edu-class-top{ background:#fff; padding:20px;}
@@ -96,12 +96,12 @@ a.edu-ad-user{ }
 
 /* 试用授权用户列表  17/06/05 bylinda*/
 .edu-admin-nav{ width:100%; background:#fff; height: 50px; }
-.edu-admin-nav-li{ width:8.1%; text-align: center; border-bottom:3px solid #fff; height:47px; line-height:47px;}
+.edu-admin-nav-li{ width:9%; text-align: center; border-bottom:3px solid #fff; height:47px; line-height:47px;}
 .edu-admin-nav-li:hover,.edu-admin-nav-li.active{border-bottom:3px solid #5faee3;}
 a.edu-admin-nav-a{ display: block; height: 24px; border-right:1px solid #ddd; line-height:24px; margin-top:13px; color:#333;}
 a:hover.edu-admin-nav-a,.active a.edu-admin-nav-a{color: #5faee3;}
 .edu-admin-nav-inner{ border:1px solid #ccc; border-top:none;top:50px; position:absolute; background:#fff; z-index:999; display: none;}
-.edu-admin-nav-inner li{ width:97px; height: 40px; line-height: 40px; border-bottom:none;}
+.edu-admin-nav-inner li{ width:108px; height: 40px; line-height: 40px; border-bottom:none;}
 .edu-admin-nav-inner li:hover{ background:#eee;}
 .edu-admin-nav-inner li a{  height: 40px; line-height:40px; }
 .edu-admin-nav-li:hover .edu-admin-nav-inner{ display: block;}
diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css
index 0f01cea4d..6dc761ca8 100644
--- a/public/stylesheets/css/edu-common.css
+++ b/public/stylesheets/css/edu-common.css
@@ -336,12 +336,12 @@ html>body #ajax-indicator { position: fixed; }
 .user_course_filtrate:hover .user_filtrate_span1{color: #FF7500!important;}
 .user_course_filtrate:hover .user_filtrate_span2{background: #FF7500!important;}
 /*课堂----------筛选切换（没有数字，默认白色背景）*/
-.course_filtrate{width: auto;padding:0px 10px;text-align: center;background: #fff;border-radius: 10px;margin-right: 20px;line-height: 26px;}
-.course_filtrate:hover{background: #FF7500; color: #ffffff; }
-.course_filtrate_bg{background: #FF7500; color: #ffffff!important;}
+.course_filtrate{width: auto;padding:0px 10px;text-align: center;background: #fff;border-radius: 10px;margin-right: 20px;line-height: 26px;border: 1px solid #d1d1d1}
+.course_filtrate:hover{background: #FF7500; color: #ffffff;border: 0px solid white }
+.course_filtrate_bg{background: #FF7500; color: #ffffff!important;border: 0px solid white }
 /*我的课堂----------筛选切换（没有数字，默认灰色背景）*/
 .edu-filter-cir-grey{color: #666;width: auto;padding:0px 15px;text-align: center;background: #eeeeee;border-radius: 10px;margin-right: 20px;display: block; height:25px; line-height:25px;}
-.edu-filter-cir-grey:hover{background: #FF7500; color: #ffffff; }
+.edu-filter-cir-grey:hover{background: #FF7500; color: #ffffff;}
 .edu-filter-cir-grey.active{background: #FF7500; color: #ffffff!important;}
 
 
diff --git a/public/stylesheets/css/edu-public.css b/public/stylesheets/css/edu-public.css
index 3e80dc170..9d20c98d9 100644
--- a/public/stylesheets/css/edu-public.css
+++ b/public/stylesheets/css/edu-public.css
@@ -368,6 +368,17 @@ input::-ms-input-placeholder,textarea::-ms-input-placeholder {color:#cccccc;}
 .down-select p{height: 35px;line-height: 35px;padding-left: 5px;}
 .down-select p:hover{background: #f3f4f6}
 
+/*课程、实训的条状样式*/
+.homepage-list-show p{height:70px;line-height:70px;}
+.homepage-list-show p:nth-child(odd){background:#fafbfb;}
+.homepage-list-show p .first{width:35%;display:inline-block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+.homepage-list-show p .hasmargin{width:23%;display:inline-block;text-align: center;color:#888;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+.homepage-list-show p .haspadding{width:16.7%;display:inline-block;margin-right:12%;color:#888;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+.homepage-list-show p .last{width:8.33%;display:inline-block;color:#888;cursor: pointer; display: none;}
+.homepage-list-show p .last:hover{color:#5faee3;}
+.homepage-list-show p .last:hover .blue{color:#5faee3;}
+
 /*-----课程名称下拉框--------*/
 .course_list_ul{display: none;position: absolute;top:40px;left: -1px;width: 100% !important;border:1px solid #eeeeee;background: #FFFFFF;padding-bottom: 5px; max-height: 150px;z-index: 10}
-.course_list_ul li{height:20px;padding:5px 10px;clear:both;line-height:28px;margin-bottom: 0 !important;cursor: pointer;}
\ No newline at end of file
+.course_list_ul li{height:20px;padding:5px 10px;clear:both;line-height:28px;margin-bottom: 0 !important;cursor: pointer;}
+
diff --git a/public/stylesheets/css/edu-user.css b/public/stylesheets/css/edu-user.css
index 1b68308e4..e043f8f5f 100644
--- a/public/stylesheets/css/edu-user.css
+++ b/public/stylesheets/css/edu-user.css
@@ -88,16 +88,8 @@ a.btn-focus:hover{color: #FFFFFF!important;background:#FC7033;border: 1px solid
 .-task-con-int .passageway .hascon .title span{display:inline-block;}
 .-task-con-int .passageway .hascon .title span em{font-size:12px;font-style:normal!important;padding:0 5px;border-radius:8px;background:#ddd;line-height:14px;}
 .-task-con-int .passageway .hascon .lesson{min-height: 420px}
-.-task-con-int .passageway .hascon .lesson p{height:70px;line-height:70px;}
-.-task-con-int .passageway .hascon .lesson p:nth-child(odd){background:#fafbfb;}
 .-task-con-int .passageway .hascon .train p:nth-child(odd){background:#eee;}
 .-task-con-int .passageway .hascon .train p{height:70px;line-height:70px;border-bottom:1px dotted #eee;}
-.-task-con-int .passageway .hascon .lesson p .first{width:35%;display:inline-block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-.-task-con-int .passageway .hascon .lesson p .hasmargin{width:23%;display:inline-block;text-align: center;color:#888;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-.-task-con-int .passageway .hascon .lesson p .haspadding{width:16.7%;display:inline-block;margin-right:12%;color:#888;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-.-task-con-int .passageway .hascon .lesson p .last{width:8.33%;display:inline-block;color:#888;cursor: pointer; display: none;}
-.-task-con-int .passageway .hascon .lesson p .last:hover{color:#5faee3;}
-.-task-con-int .passageway .hascon .lesson p .last:hover .blue{color:#5faee3;}
 
 .-task-con-int .passageway .hascon .train p .first{width:35%;display:inline-block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .-task-con-int .passageway .hascon .train p .hasmargin{width:40%;margin-right: 16.7%;color:#888;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}