From 1c8b4c5bdd24c35cebe8be31f5ae0a1ba6edb11b Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Fri, 27 Mar 2015 16:59:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=AF=BC=E5=87=BAATOM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/_course_show.html.erb | 6 +++---
 app/views/news/_course_news.html.erb   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index e2faaf846..c27546e85 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -70,9 +70,9 @@
 <ul class="wlist">
   <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
 </ul>
-<% other_formats_links do |f| %>
-    <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
-<% end %>
+<%# other_formats_links do |f| %>
+    <%#= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
+<%# end %>
 
 <% html_title @board.name %>
 
diff --git a/app/views/news/_course_news.html.erb b/app/views/news/_course_news.html.erb
index aa286b540..a9af6551c 100644
--- a/app/views/news/_course_news.html.erb
+++ b/app/views/news/_course_news.html.erb
@@ -66,9 +66,9 @@
       <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
     </ul>
 
-  <% other_formats_links do |f| %>
-      <%= f.link_to 'Atom', :url => {:course_id => @course, :key => User.current.rss_key} %>
-  <% end %>
+  <%# other_formats_links do |f| %>
+      <%#= f.link_to 'Atom', :url => {:course_id => @course, :key => User.current.rss_key} %>
+  <%# end %>
 
   <% content_for :header_tags do %>
       <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>

From 9fcdaee0ccb83801a4f7d1ea4f0be6d5cf9e091a Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Fri, 27 Mar 2015 17:42:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AE=A8=E8=AE=BA?=
 =?UTF-8?q?=E5=8C=BA=E5=9B=9E=E5=A4=8D=E5=90=8E=E9=99=84=E4=BB=B6=E6=B6=88?=
 =?UTF-8?q?=E5=A4=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/messages/_course_show.html.erb | 6 +++---
 app/views/messages/_form_course.html.erb | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 613444c15..58043b077 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -141,9 +141,9 @@
 <% end %>
 <% if !@topic.locked? && authorize_for_course('messages', 'reply') %>
     <div id="reply" style="display:none;">
-      <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
+      <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message_form'} do |f| %>
           <%= render :partial => 'form_course', :locals => {:f => f, :replying => true} %>
-          <a href="#" onclick="submit_message_replay();"class="blue_btn fl c_white"><%= l(:button_submit)%></a>
+          <a href="#" onclick="submit_message_replay();"class="blue_btn fl c_white" style="margin-left: 50px;"><%= l(:button_submit)%></a>
       <% end %>
       <div id="preview" class="wiki"></div>
     </div>
@@ -162,7 +162,7 @@
     {
         if(flag)
         {
-            $("#message-form").submit();
+            $("#message_form").submit();
         }
     }
     function regexContent()
diff --git a/app/views/messages/_form_course.html.erb b/app/views/messages/_form_course.html.erb
index e6dc99995..8f806ac97 100644
--- a/app/views/messages/_form_course.html.erb
+++ b/app/views/messages/_form_course.html.erb
@@ -35,7 +35,9 @@
 <div class="cl"></div>
 <li>
   <label class="fl">&nbsp;&nbsp;<%= l(:label_attachment_plural) %>&nbsp;&nbsp;：</label>
-  <%= render :partial => 'attachments/new_form', :locals => {:container => @message,:isReply => @isReply} %>
+  <div  class="fl">
+    <%= render :partial => 'attachments/form_course', :locals => {:container => @message,:isReply => @isReply} %>
+  </div>
 </li>
 <li >
   <div class="cl"></div>