Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course

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 %>
 

app/views/messages/_course_show.html.erb

@@ -85,9 +85,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>
@@ -106,7 +106,7 @@
     {
         if(flag)
         {
-            $("#message-form").submit();
+            $("#message_form").submit();
         }
     }
     function regexContent()

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>

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})) %>