From a7c006c59fec38264de2f239632939562a3325b5 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 18 Dec 2015 15:02:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AE=A8=E8=AE=BA=E5=8C=BA?=
 =?UTF-8?q?=E7=9A=84=E5=B1=95=E5=BC=80=E6=9B=B4=E5=A4=9A=E4=B8=8D=E5=8F=AF?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/_course_show.html.erb        | 74 +------------------
 app/views/boards/_course_show_detail.html.erb | 70 ++++++++++++++++++
 app/views/boards/show.js.erb                  |  2 +-
 3 files changed, 73 insertions(+), 73 deletions(-)
 create mode 100644 app/views/boards/_course_show_detail.html.erb

diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index 306a0c7ce..de3b038e6 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -1,20 +1,3 @@
-<%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false) %>
-    <%= javascript_include_tag "init_activity_KindEditor" %>
-<% end %>
-
-<style type="text/css">
-    /*回复框*/
-    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}
-    .homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-outline {border: none;}
-    .homepagePostReplyInputContainer .ke-inline-block {display: none;}
-    .homepagePostReplyInputContainer .ke-container {float: left;}
-</style>
 <script type="text/javascript">
     $(function(){
         $("#RSide").removeAttr("id");
@@ -45,61 +28,8 @@
   <% if User.current.logged? %>
     <%= labelled_form_for @message, :url =>{:controller=>'messages',:action => 'new',  :board_id => @board.id, :is_board => 'true'},
                           :html => {:nhname=>'form',:multipart => true, :id => 'message-form'} do |f| %>
-        <%= render :partial => 'course_new', :locals => {:f => f, :topic => @message, :edit_mode => false, :course => course} %>
+        <%= render :partial => 'course_new', :locals => {:f => f, :topic => @message, :edit_mode => false, :course => @board.course} %>
     <% end %>
   <% end %>
-
-  <% if topics%>
-  <% topics.each do |topic| %>
-      <script>
-          function expand_reply(container, btnid) {
-              var target = $(container);
-              var btn = $(btnid);
-              if (btn.data('init') == '0') {
-                  btn.data('init', 1);
-                  btn.html('收起回复');
-                  target.show();
-              } else {
-                  btn.data('init', 0);
-                  btn.html('展开更多');
-                  target.hide();
-                  target.eq(0).show();
-                  target.eq(1).show();
-                  target.eq(2).show();
-              }
-          }
-
-          function expand_reply_input(id) {
-              $(id).toggle();
-          }
-
-          $(function () {
-              init_activity_KindEditor_data(<%= topic.id%>, null, "87%");
-              showNormalImage('activity_description_<%= topic.id %>');
-              /*var description_images=$("div#activity_description_<%#= topic.id %>").find("img");
-              if (description_images.length>0) {
-                  for (var i=0; i<description_images.length; i++){
-                      var image=$(description_images[i]);
-                      var element=$("<a></a>").attr("href",image.attr('src'));
-                      image.wrap(element);
-                  }
-              }
-              $('#activity_description_<%#= topic.id %> a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false});*/
-          });
-      </script>
-      <% if topic %>
-          <%= render :partial => 'users/course_message', :locals => {:activity => topic, :user_activity_id => topic.id} %>
-      <% end %>
-  <% end %>
-
-  <% if topics.count == 10 %>
-      <div id="show_more_course_topic" class="loadMore mt10 f_grey">展开更多<%= link_to "", boards_topic_path(@board, :course_id => @board.course.id ,:page => page), :id => "more_topic_link", :remote => "true", :class => "none" %></div>
-  <% end %>
-<% end%>
+  <%= render :partial=> 'course_show_detail',:locals =>{:topics => @topics, :page => 0} %>
 </div>
-
-  <script type="text/javascript">
-      $("#show_more_course_topic").mouseover(function () {
-          $("#more_topic_link").click();
-      });
-  </script>
diff --git a/app/views/boards/_course_show_detail.html.erb b/app/views/boards/_course_show_detail.html.erb
new file mode 100644
index 000000000..c324f1d69
--- /dev/null
+++ b/app/views/boards/_course_show_detail.html.erb
@@ -0,0 +1,70 @@
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= javascript_include_tag "init_activity_KindEditor" %>
+<% end %>
+
+<style type="text/css">
+    /*回复框*/
+    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
+    .homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}
+    .homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}
+    .homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}
+    .homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}
+    .homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}
+    .homepagePostReplyInputContainer .ke-outline {border: none;}
+    .homepagePostReplyInputContainer .ke-inline-block {display: none;}
+    .homepagePostReplyInputContainer .ke-container {float: left;}
+</style>
+<% if topics%>
+    <% topics.each do |topic| %>
+        <script>
+            function expand_reply(container, btnid) {
+                var target = $(container);
+                var btn = $(btnid);
+                if (btn.data('init') == '0') {
+                    btn.data('init', 1);
+                    btn.html('收起回复');
+                    target.show();
+                } else {
+                    btn.data('init', 0);
+                    btn.html('展开更多');
+                    target.hide();
+                    target.eq(0).show();
+                    target.eq(1).show();
+                    target.eq(2).show();
+                }
+            }
+
+            function expand_reply_input(id) {
+                $(id).toggle();
+            }
+
+            $(function () {
+                init_activity_KindEditor_data(<%= topic.id%>, null, "87%");
+                showNormalImage('activity_description_<%= topic.id %>');
+                /*var description_images=$("div#activity_description_<%#= topic.id %>").find("img");
+                 if (description_images.length>0) {
+                 for (var i=0; i<description_images.length; i++){
+                 var image=$(description_images[i]);
+                 var element=$("<a></a>").attr("href",image.attr('src'));
+                 image.wrap(element);
+                 }
+                 }
+                 $('#activity_description_<%#= topic.id %> a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false});*/
+            });
+        </script>
+        <% if topic %>
+            <%= render :partial => 'users/course_message', :locals => {:activity => topic, :user_activity_id => topic.id} %>
+        <% end %>
+    <% end %>
+
+    <% if topics.count == 10 %>
+        <div id="show_more_course_topic" class="loadMore mt10 f_grey">展开更多<%= link_to "", boards_topic_path(@board, :course_id => @board.course.id ,:page => page), :id => "more_topic_link", :remote => "true", :class => "none" %></div>
+    <% end %>
+<% end%>
+
+<script type="text/javascript">
+    $("#show_more_course_topic").mouseover(function () {
+        $("#more_topic_link").click();
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/boards/show.js.erb b/app/views/boards/show.js.erb
index dd5fa4688..c088abce5 100644
--- a/app/views/boards/show.js.erb
+++ b/app/views/boards/show.js.erb
@@ -1 +1 @@
-$("#show_more_course_topic").replaceWith("<%= escape_javascript( render :partial =>  'boards/course_show',:locals => {:topics => @topics, :page => @page} )%>");
\ No newline at end of file
+$("#show_more_course_topic").replaceWith("<%= escape_javascript( render :partial =>  'boards/course_show_detail',:locals => {:topics => @topics, :page => @page} )%>");
\ No newline at end of file