<%= form_for @blog_comment, :as => :reply, :url => {:controller => 'blog_comments',:action => 'reply', :id => @blogComment.id}, :html => {:multipart => true, :id => 'new_form'} do |f| %>
+ <% if course_id%>
+
+ <% end %>
diff --git a/app/views/blog_comments/quote.js.erb b/app/views/blog_comments/quote.js.erb
index 4d16745ca..088b2cf67 100644
--- a/app/views/blog_comments/quote.js.erb
+++ b/app/views/blog_comments/quote.js.erb
@@ -1,5 +1,5 @@
if($("#reply_message_<%= @blogComment.id%>").length > 0) {
- $("#reply_message_<%= @blogComment.id%>").replaceWith("<%= escape_javascript(render :partial => 'simple_ke_reply_form', :locals => {:reply => @blogComment,:temp =>@temp,:subject =>@subject}) %>");
+ $("#reply_message_<%= @blogComment.id%>").replaceWith("<%= escape_javascript(render :partial => 'blog_comments/simple_ke_reply_form', :locals => {:reply => @blogComment,:temp =>@temp,:subject =>@subject,:course_id=>@course_id}) %>");
$(function(){
$('#reply_subject').val("<%= raw escape_javascript(@subject) %>");
$('#quote_quote').val("<%= raw escape_javascript(@temp.content.html_safe) %>");
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..b8a8bfd2a
--- /dev/null
+++ b/app/views/courses/_course_outlines_list.html.erb
@@ -0,0 +1,31 @@
+
+
请选择课程大纲
+
+
+
+
+
未搜索到对应大纲，请重新输入
+ <%= form_tag(url_for(:controller=>'courses',:action=>'set_course_outline',:id=>course.id),:method=>'post',:remote=>'true') do %>
+
+ <% unless articles.blank? %>
+ <% articles.each do |article|%>
+
+
发布时间：<%= format_date(article.created_at)%>
+ <% end %>
+ <% end %>
+
+
+
+<% end %>
diff --git a/app/views/courses/course_outline.js.erb b/app/views/courses/course_outline.js.erb
new file mode 100644
index 000000000..f747661b8
--- /dev/null
+++ b/app/views/courses/course_outline.js.erb
@@ -0,0 +1,9 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'course_outlines_list',:locals => {:articles=>@blog_articles,:course=>@course}) %>');
+showModal('ajax-modal', '300px');
+//$('#ajax-modal').css('height','250px');
+$('#ajax-modal').css('padding-top','0px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before('
');
+$('#ajax-modal').parent().css("top","30%").css("left","50%");
+$('#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/courses/set_course_outline.js.erb b/app/views/courses/set_course_outline.js.erb
new file mode 100644
index 000000000..febcb0b1f
--- /dev/null
+++ b/app/views/courses/set_course_outline.js.erb
@@ -0,0 +1,5 @@
+hideModal();
+<%if @course.tea_id == User.current.id && @course.outline == 0 %>
+<% else %>
+ $("#course_outline_bar").html('
')
+<%end %>
diff --git a/app/views/courses/show_course_outline.html.erb b/app/views/courses/show_course_outline.html.erb
new file mode 100644
index 000000000..ff503d983
--- /dev/null
+++ b/app/views/courses/show_course_outline.html.erb
@@ -0,0 +1,160 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor",'blog' %>
+
+
+
+
+
+
+ <%= link_to image_tag(url_to_avatar(@article.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@article.author) %>
+
+
+ <% if @article.author.id == User.current.id%>
+
+
+
+
+
+
+
[设置大纲]
+
+ <%end%>
+
+
+
+
+ <% if @article.try(:author).try(:realname) == ' ' %>
+ <%= link_to @article.try(:author), user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+ <% else %>
+ <%= link_to @article.try(:author).try(:realname), user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+ <% end %>
+
+
<%= format_time( @article.created_on)%>
+
+
+ <%= @article.content.html_safe%>
+
+
+
+ <%#= link_to_attachments_course @topic, :author => false %>
+ <% if @article.attachments.any?%>
+ <% options = {:author => true, :deletable => false} %>
+ <%= render :partial => 'blog_comments/attachments_links', :locals => {:attachments => @article.attachments, :options => options, :is_float => true} %>
+ <% end %>
+
+
+
+
+
+ <% count=0 %>
+ <% if @article.parent %>
+ <% count=@article.parent.children.count%>
+ <% else %>
+ <% count=@article.children.count%>
+ <% end %>
+
+ <% unless count == 0 %>
+
+
+ <%@article.children.reorder('created_on desc').each_with_index do |reply,i| %>
+
+
+
+ <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
+
+
+
+ <% if reply.try(:author).try(:realname) == ' ' %>
+ <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+ <% else %>
+ <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+ <% end %>
+
+
+ <%= reply.content.html_safe%>
+
+
+ <%= format_time(reply.created_on) %>
+
+
+
+
+
+
+ <% end %>
+
+
+ <% end %>
+
+ <% if !@article.locked? && User.current.logged?%>
+
+
+
+
+ <%= form_for :blog_comment, :url => {:action => 'reply',:controller => 'blog_comments',:user_id=>@article.author.id,:blog_id=>@article.blog_id, :id => @article.id}, :html => {:multipart => true, :id => 'message_form'} do |f| %>
+
+ <%= render :partial => 'blog_comments/reply_form', :locals => {:f => f,:user=>@user,:article=>@article} %>
+ <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'canel_message_replay();', :class => " grey_btn fr c_white mt10 mr5" %>
+ <%= link_to l(:button_submit), "javascript:void(0)", :onclick => 'submit_message_replay();', :class => "blue_btn fr c_white mt10", :style => "margin-right: 5px;" %>
+ <% end %>
+
+
+
+ <% end %>
+
+
\ 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 04d16a334..d7e7bba90 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -54,17 +54,47 @@