diff --git a/Gemfile b/Gemfile
index 87cd6dba2..3027c16cd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ unless RUBY_PLATFORM =~ /w32/
gem 'iconv'
end
-gem 'grack', path:'./lib/grack'
+gem 'grack', path:'lib/grack'
gem 'gitlab', path: 'lib/gitlab-cli'
gem 'rest-client'
gem "mysql2", "= 0.3.18"
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index c8c482f81..1113de159 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -711,6 +711,11 @@ class CoursesController < ApplicationController
end
end
+ #从课程创建的老师那里选择课程大纲
+ def course_outline
+
+ end
+
#删除课程
#删除课程只是将课程的is_delete状态改为false,is_delete为false状态的课程只有管理员可以看到
def destroy
diff --git a/app/views/courses/_course_outlines_list.html.erb b/app/views/courses/_course_outlines_list.html.erb
new file mode 100644
index 000000000..efadbede9
--- /dev/null
+++ b/app/views/courses/_course_outlines_list.html.erb
@@ -0,0 +1,66 @@
+
+
请选择课程大纲
+
+
+
+
+ 未搜索到对应大纲,请重新输入
+
+
+
发布时间:2015-05-11
+
+
发布时间:2014-05-11
+
+
发布时间:2014-03-04
+
+
发布时间:2013-05-11
+
+
发布时间:2013-05-10
+
+
发布时间:2013-05-08
+
+
发布时间:2013-05-01
+
+
+
diff --git a/app/views/courses/course_outline.js.erb b/app/views/courses/course_outline.js.erb
new file mode 100644
index 000000000..ea8f95c86
--- /dev/null
+++ b/app/views/courses/course_outline.js.erb
@@ -0,0 +1,8 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'course_outlines_list') %>');
+showModal('ajax-modal', '300px');
+$('#ajax-modal').css('height','360px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("");
+$('#ajax-modal').parent().css("top","40%").css("left","46%");
+$('#ajax-modal').parent().addClass("courseOutlinePopup");
+$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
\ No newline at end of file
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 9b1dfbb7f..4eb036bbf 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -63,6 +63,11 @@
<%= l(:field_is_private)%>
<% end %>
+ <%if @course.tea_id == User.current.id && @course.outline == 0%>
+
+ 设置大纲
+
+ <% end %>