diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 36a5d9d4f..6c62c642a 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -96,7 +96,7 @@ class AdminController < ApplicationController
   def courses
     @name = params[:name].to_s.strip.downcase
     if @name && @name != ""
-      @courses = Course.select{ |course| (course.teacher[:lastname].to_s.downcase + course.teacher[:firstname].to_s.downcase).include?(@name) || course.name.include?(@name)}
+      @courses = Course.select{ |course| course.teacher && ((course.teacher.show_name).include?(@name) || course.name.include?(@name))}
       @courses = @courses.sort{|x, y| y.created_at <=> x.created_at}
     else
       @courses = Course.order('created_at desc')
@@ -135,6 +135,17 @@ class AdminController < ApplicationController
     end
   end
 
+  #修改课程名称
+  def update_syllabus_title
+    @syllabus = Syllabus.where("id = #{params[:syllabus_id].to_i}").first
+    unless @syllabus.nil?
+      @syllabus.update_column("title", params[:name])
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+
   #管理员界面精品课程列表
   def excellent_courses
     @courses = Course.where("is_excellent =? or excellent_option =?", 1, 1 )
diff --git a/app/views/admin/_rename_syllabus_title.html.erb b/app/views/admin/_rename_syllabus_title.html.erb
new file mode 100644
index 000000000..e3a175215
--- /dev/null
+++ b/app/views/admin/_rename_syllabus_title.html.erb
@@ -0,0 +1,3 @@
+<span>
+  <a title="<%= syllabus.title %>" id="rename_syllabus_title_<%= syllabus.id %>" ondblclick="rename_syllabus_title($(this),'<%=syllabus.title %>','<%=syllabus.id %>');"><%= syllabus.title %></a>
+</span>
\ No newline at end of file
diff --git a/app/views/admin/syllabuses.html.erb b/app/views/admin/syllabuses.html.erb
index 782f6b01c..194091abc 100644
--- a/app/views/admin/syllabuses.html.erb
+++ b/app/views/admin/syllabuses.html.erb
@@ -46,10 +46,8 @@
           <td style="text-align: center;">
             <%= syllabus.id %>
           </td>
-          <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=syllabus.title%>'>
-            <span>
-              <%= link_to(syllabus.title, syllabus_path(syllabus.id)) %>
-            </span>
+          <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=syllabus.title%>' id="syllabus_title_<%=syllabus.id %>">
+            <%= render :partial => 'admin/rename_syllabus_title', :locals => {:syllabus => syllabus} %>
           </td>
           <td class="center">
           </td>
@@ -89,23 +87,24 @@
 </div>
 
 <script type="text/javascript">
-    var tagNameHtml; //当前双击的链接的父节点的html
-    var parentCssBorder; //当前双击的链接的父节点
-    var ele;    //当前双击的链接
-    var tagId; //班级的id
-    var tagName; //班级名称
+    var CourseTagNameHtml; //当前双击的链接的父节点的html
+    var CourseParentCssBorder; //当前双击的链接的父节点
+    var CourseEle;    //当前双击的链接
+    var CourseTagId; //班级的id
+    var CourseTagName; //班级名称
+    var CourseIsdb;
 
     function rename_course_name(domEle,name,id){
-        isdb = true; //这是双击
+        CourseIsdb = true; //这是双击
         //clearTimeout(clickFunction);
         if (domEle.children().get(0) != undefined) { //已经是编辑框的情况下不要动
             return;
         }
-        tagNameHtml = domEle.parent().html();
-        parentCssBorder = domEle.parent().css("border");
-        ele = domEle;
-        tagId = id;
-        tagName = name;
+        CourseTagNameHtml = domEle.parent().html();
+        CourseParentCssBorder = domEle.parent().css("border");
+        CourseEle = domEle;
+        CourseTagId = id;
+        CourseTagName = name;
         domEle.html('<input name=""  id="renameCourseName" maxlength="120" minlength="1" style="width:125px;" value="' + name + '"/>');
         domEle.parent().css("border", "1px solid #ffffff");
         $("#renameCourseName").focus();
@@ -119,20 +118,66 @@
                 updateCourseName();
             }
         });
+        $("#renameSyllabusTitle").live("blur",function(){
+            updateSyllabusTitle();
+        }).live("keypress",function(e){
+            if (e.keyCode == '13') {
+                updateSyllabusTitle();
+            }
+        });
     });
 
     //执行修改TAGName方法
     function updateCourseName(){
-        if(isdb){
-            isdb = false;
-            if($("#renameCourseName").val() == tagName){ //如果值一样，则恢复原来的状态
+        if(CourseIsdb){
+            CourseIsdb = false;
+            if($("#renameCourseName").val() == CourseTagName){ //如果值一样，则恢复原来的状态
                 ele.parent().css("border","");
-                ele.parent().html(tagNameHtml);
+                ele.parent().html(CourseTagNameHtml);
             }
             else{
                 $.post(
                         '<%= admin_update_course_name_path %>',
-                        {"course_id": tagId, "name": $("#renameCourseName").val().trim()}
+                        {"course_id": CourseTagId, "name": $("#renameCourseName").val().trim()}
+                );
+            }
+        }
+    }
+
+    var SyllabusTagNameHtml; //当前双击的链接的父节点的html
+    var SyllabusParentCssBorder; //当前双击的链接的父节点
+    var SyllabusEle;    //当前双击的链接
+    var SyllabusTagId; //课程的id
+    var SyllabusTagName; //课程名称
+    var SyllabusIsdb;
+    function rename_syllabus_title(domEle,name,id){
+        SyllabusIsdb = true; //这是双击
+        //clearTimeout(clickFunction);
+        if (domEle.children().get(0) != undefined) { //已经是编辑框的情况下不要动
+            return;
+        }
+        SyllabusTagNameHtml = domEle.parent().html();
+        SyllabusParentCssBorder = domEle.parent().css("border");
+        SyllabusEle = domEle;
+        SyllabusTagId = id;
+        SyllabusTagName = name;
+        domEle.html('<input name=""  id="renameSyllabusTitle" maxlength="120" minlength="1" style="width:125px;" value="' + name + '"/>');
+        domEle.parent().css("border", "1px solid #ffffff");
+        $("#renameSyllabusTitle").focus();
+    }
+
+    //执行修改TAGName方法
+    function updateSyllabusTitle(){
+        if(SyllabusIsdb){
+            SyllabusIsdb = false;
+            if($("#renameSyllabusTitle").val() == SyllabusTagName){ //如果值一样，则恢复原来的状态
+                ele.parent().css("border","");
+                ele.parent().html(SyllabusTagNameHtml);
+            }
+            else{
+                $.post(
+                        '<%= admin_update_syllabus_title_path %>',
+                        {"syllabus_id": SyllabusTagId, "name": $("#renameSyllabusTitle").val().trim()}
                 );
             }
         }
diff --git a/app/views/admin/update_syllabus_title.js.erb b/app/views/admin/update_syllabus_title.js.erb
new file mode 100644
index 000000000..eb96b5d3d
--- /dev/null
+++ b/app/views/admin/update_syllabus_title.js.erb
@@ -0,0 +1 @@
+$("#syllabus_title_<%=@syllabus.id %>").html("<%=escape_javascript(render :partial => 'admin/rename_syllabus_title', :locals => {:syllabus => @syllabus}) %>");
diff --git a/app/views/layouts/_syllabus_info.html.erb b/app/views/layouts/_syllabus_info.html.erb
index a5207af68..076ae964b 100644
--- a/app/views/layouts/_syllabus_info.html.erb
+++ b/app/views/layouts/_syllabus_info.html.erb
@@ -8,14 +8,14 @@
     <div id="syllabus_title_show" class="homepageSyllabusName mb5">
       <%= render :partial => 'layouts/syllabus_title', :locals => {:syllabus => @syllabus}%>
     </div>
-  <textarea class="syllabusTitleTextarea none" placeholder="请编辑课程名称" id="syllabus_title_edit" onblur="edit_syllabus_title('<%= edit_syllabus_title_syllabus_path(@syllabus.id)%>');"><%= @syllabus.title %></textarea>
+  <textarea class="syllabusTitleTextarea none" placeholder="请编辑课程名称" id="syllabus_title_edit"></textarea>
 </div>
 <div class="cl"></div>
 <div>
   <div class="mb5" id="syllabus_eng_name_show" style="word-break:normal;word-wrap:normal;">
     <%= render :partial => 'layouts/syllabus_eng_name', :locals => {:syllabus => @syllabus}%>
   </div>
-  <textarea class="homepageSignatureTextarea none" placeholder="请编辑英文名称" id="syllabus_eng_name_edit" onblur="edit_syllabus_eng_name('<%= edit_syllabus_eng_name_syllabus_path(@syllabus.id)%>');"><%= @syllabus.eng_name %></textarea>
+  <textarea class="homepageSignatureTextarea none" placeholder="请编辑英文名称" id="syllabus_eng_name_edit"></textarea>
 </div>
 <!--
 <div class="pr_info_foot ">
diff --git a/app/views/layouts/_syllabus_title.html.erb b/app/views/layouts/_syllabus_title.html.erb
index 51737fe4e..c5d195ab8 100644
--- a/app/views/layouts/_syllabus_title.html.erb
+++ b/app/views/layouts/_syllabus_title.html.erb
@@ -1,5 +1,5 @@
 <span style="word-break: normal; word-wrap: break-word;"><%=@syllabus.title %></span>
 
 <% if User.current == syllabus.user || User.current.admin? %>
-    <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);",:id => "syllabus_edit_title_png", :class => "none", :onclick => "show_edit_title();"%>
+    <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);",:id => "syllabus_edit_title_png", :class => "none", :onclick => "show_edit_title('#{@syllabus.title}');"%>
 <% end %>
\ No newline at end of file
diff --git a/app/views/layouts/base_syllabus.html.erb b/app/views/layouts/base_syllabus.html.erb
index b0ecea006..6e52ede8d 100644
--- a/app/views/layouts/base_syllabus.html.erb
+++ b/app/views/layouts/base_syllabus.html.erb
@@ -121,15 +121,21 @@
   <span><%= l(:label_loading) %></span>
 </div>
 <script type="text/javascript">
-    $(function(){
+    $(function() {
         $('#user_hide_course').hide();
-    });
+        $("#syllabus_title_edit").live("blur", function () {
+            edit_syllabus_title('<%= edit_syllabus_title_syllabus_path(@syllabus.id)%>');
+        });
+        $("#syllabus_eng_name_edit").live("blur", function () {
+            edit_syllabus_eng_name('<%= edit_syllabus_eng_name_syllabus_path(@syllabus.id)%>');
+        });
 
-    $("#courseMenu").mouseenter(function(){
-        $("#topnav_course_menu").show();
-    });
-    $("#courseMenu").mouseleave(function(){
-        $("#topnav_course_menu").hide();
+        $("#courseMenu").mouseenter(function () {
+            $("#topnav_course_menu").show();
+        });
+        $("#courseMenu").mouseleave(function () {
+            $("#topnav_course_menu").hide();
+        });
     });
     function leftCourseslistChange(){
         $('#homepageLeftMenuCourses').slideToggle();
diff --git a/app/views/syllabuses/edit_syllabus_title.js.erb b/app/views/syllabuses/edit_syllabus_title.js.erb
index 70f1be362..ee6cc4bcd 100644
--- a/app/views/syllabuses/edit_syllabus_title.js.erb
+++ b/app/views/syllabuses/edit_syllabus_title.js.erb
@@ -1,3 +1,4 @@
 $("#syllabus_title_show").html("<%= escape_javascript render :partial => 'layouts/syllabus_title', :locals => {:syllabus => @syllabus} %>");
+$("#syllabus_title_edit").text("");
 $("#syllabus_title_show").show();
 $("#syllabus_title_edit").hide();
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index a570fef55..539d78df3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1039,6 +1039,7 @@ RedmineApp::Application.routes.draw do
   get 'admin/syllabuses', as: :all_syllabuses
   get 'admin/non_syllabus_courses', as: :non_syllabus_courses
   post 'admin/update_course_name'
+  post 'admin/update_syllabus_title'
   get 'admin/excellent_courses', as: :excellent_courses
   get 'admin/excellent_all_courses', as: :excellent_all_courses
   match 'admin/set_excellent_course/:id', :to => 'admin#set_excellent_course'
diff --git a/public/javascripts/syllabus.js b/public/javascripts/syllabus.js
index e3dc2e09b..4dd387595 100644
--- a/public/javascripts/syllabus.js
+++ b/public/javascripts/syllabus.js
@@ -32,6 +32,7 @@ function submit_syllabus() {
 
 //编辑英文名称
 function show_edit_eng_name() {
+    EngEdit = true;
     $("#syllabus_eng_name_show").hide();
     $("#syllabus_eng_name_edit").show();
     $("#syllabus_eng_name_edit").focus();
@@ -39,31 +40,39 @@ function show_edit_eng_name() {
 
 //编辑英文名称之后提交
 function edit_syllabus_eng_name(url){
-    $.get(
-        url,
-        { eng_name: $("#syllabus_eng_name_edit").val() },
-        function (data) {
+    if(EngEdit) {
+        EngEdit = false;
+        $.get(
+            url,
+            { eng_name: $("#syllabus_eng_name_edit").val() },
+            function (data) {
 
-        }
-    );
+            }
+        );
+    }
 }
 
 //编辑课程名称
-function show_edit_title() {
+function show_edit_title(str) {
+    IsEdit = true;
     $("#syllabus_title_show").hide();
     $("#syllabus_title_edit").show();
+    $("#syllabus_title_edit").text(str);
     $("#syllabus_title_edit").focus();
 }
 
 //编辑课程名称之后提交
 function edit_syllabus_title(url){
-    $.get(
-        url,
-        { title: $("#syllabus_title_edit").val().trim() },
-        function (data) {
+    if(IsEdit) {
+        IsEdit = false;
+        $.get(
+            url,
+            { title: $("#syllabus_title_edit").val().trim() },
+            function (data) {
 
-        }
-    );
+            }
+        );
+    }
 }
 
 //展开所有属性