diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index d41491349..f71a77ca7 100644
--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -152,6 +152,9 @@ class NewsController < ApplicationController
   end
 
   def edit
+    if @course
+      render :layout => "base_courses"
+    end
   end
 
   def update
diff --git a/app/views/news/_course_form.html.erb b/app/views/news/_course_form.html.erb
index b8b3e36a4..b757ab274 100644
--- a/app/views/news/_course_form.html.erb
+++ b/app/views/news/_course_form.html.erb
@@ -1,10 +1,10 @@
 <%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
-<li  class="ml45">
+<li>
     <label><span class="c_red">*</span>&nbsp;<%= l(:field_title) %>&nbsp;&nbsp;：</label>
     <input  type="text" name="news[title]" class="hwork_input" id="news_title" size="60" onkeyup="regexTitle();" maxlength="60" placeholder="60个字符以内" value="<%= is_new ? '' : @news.title %>">
     <p id="title_notice_span" class="ml55"></p>
   </li>
-  <li class="ml45 mb10">
+  <li class="mb10">
     <% if is_new %>
       <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
       <label class="fl" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;&nbsp;：</label>
@@ -18,12 +18,12 @@
 
   </li>
   <div class="cl"></div>
-  <li class="ml45">
-    <label class="fl">&nbsp;&nbsp;<%= l(:label_attachment_plural) %>&nbsp;&nbsp;：</label>
+  <li>
+    <label class="fl mt5">&nbsp;&nbsp;<%= l(:label_attachment_plural) %>&nbsp;&nbsp;：</label>
     <%= render :partial => 'attachments/new_form', :locals => {:container => @news} %>
     <div class="cl"></div>
   </li>
-  <li class=" ml90" >
+  <li class="ml40" >
     <% if is_new %>
       <%= link_to l(:button_create), "#", :onclick => 'submitNews();', :onmouseover => 'submitFocus(this);', :class => 'blue_btn fl c_white' %>
       <%= link_to l(:button_cancel), course_news_index_path(@course), :onclick => '$("#add-news").hide()', :class => 'blue_btn grey_btn fl c_white' %>
diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb
index 63e2ffb85..1160f09e3 100644
--- a/app/views/news/_course_show.html.erb
+++ b/app/views/news/_course_show.html.erb
@@ -8,16 +8,6 @@
 <div class="project_r_h">
   <h2 class="project_h2"><%= l(:label_course_news) %></h2>
 </div>
-<% if authorize_for_course('news', 'edit') %>
-    <div id="edit-news" style="display:none;">
-      <%= labelled_form_for :news, @news, :url => news_path(@news),
-                            :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
-          <%= render :partial => 'course_form', :locals => { :f => f, :is_new => false } %>
-      <% end %>
-      <div id="preview" class="wiki"></div>
-    </div>
-<% end %>
-
 <div class="problem_main">
   <%= link_to image_tag(url_to_avatar(@news.author),:width => 42,:height => 42), user_path(@news.author), :class => "problem_pic fl" %>
   <div class="problem_txt fl mt5">
@@ -26,9 +16,7 @@
     </h4>
     <%= link_to(l(:button_edit),
                 edit_news_path(@news),
-                :class => 'talk_edit fr',
-                :accesskey => accesskey(:edit),
-                :onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_news, @course) %>
+                :class => 'talk_edit fr') if User.current.allowed_to?(:manage_news, @course) %>
     <%= delete_link(news_path(@news),:class => 'talk_edit fr') if User.current.allowed_to?(:manage_news, @course) %>
     <div class="cl"></div>
     <div class="mb5 upload_img">
diff --git a/app/views/news/edit.html.erb b/app/views/news/edit.html.erb
index 3e9860feb..758976d1b 100644
--- a/app/views/news/edit.html.erb
+++ b/app/views/news/edit.html.erb
@@ -1,12 +1,11 @@
-<h3><%=l(:label_news)%></h3>
-
-<%= labelled_form_for @news, :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
-<%= render :partial => 'form', :locals => { :f => f } %>
-<%= submit_tag l(:button_save) %>
-<%#= preview_link preview_news_path(:project_id => @project, :id => @news), 'news-form' %>
-<% end %>
-<div id="preview" class="wiki"></div>
-
-<% content_for :header_tags do %>
-  <%= stylesheet_link_tag 'scm' %>
-<% end %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<div class="project_r_h">
+  <h2 class="project_h2"><%= l(:label_course_news) %></h2>
+</div>
+<div id="edit-news">
+  <%= labelled_form_for :news, @news, :url => news_path(@news),
+                        :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
+      <%= render :partial => 'course_form', :locals => { :f => f, :is_new => false } %>
+  <% end %>
+  <div id="preview" class="wiki"></div>
+</div>
\ No newline at end of file