diff --git a/app/views/news/index.html.erb b/app/views/news/index.html.erb
index cded25576..9718a30df 100644
--- a/app/views/news/index.html.erb
+++ b/app/views/news/index.html.erb
@@ -1,32 +1,33 @@
+<!-- added by huang -->
 <div style="padding-bottom: 10px">
 	<% if @project.project_type == 1%>
-<%= link_to(l(:label_news_notice),
-            new_project_news_path(@project),
-            :class => 'icon icon-add',
-            :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') if @project && User.current.allowed_to?(:manage_news, @project) %>
-    <% else %>
-    <%= link_to(l(:label_news_new),
-            new_project_news_path(@project),
-            :class => 'icon icon-add',
-            :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') if @project && User.current.allowed_to?(:manage_news, @project) %>
-    
-    <% end %>
+	<%= link_to(l(:label_news_notice),
+	new_project_news_path(@project),
+	:class => 'icon icon-add',
+	:onclick => 'showAndScrollTo("add-news", "news_title"); return false;') if @project && User.current.allowed_to?(:manage_news, @project) %>
+	<% else %>
+	<%= link_to(l(:label_news_new),
+	new_project_news_path(@project),
+	:class => 'icon icon-add',
+	:onclick => 'showAndScrollTo("add-news", "news_title"); return false;') if @project && User.current.allowed_to?(:manage_news, @project) %>
+
+	<% end %>
 </div>
 
 <div id="add-news" style="display:none;">
-<% if @project.project_type == 1 %>
-<h3><%=l(:bale_news_notice)%></h3>
-<% else %>
-<h3><%=l(:label_news_new)%></h3>
-<% end %>
-<%= labelled_form_for @news, :url => project_news_index_path(@project),
-                                           :html => { :id => 'news-form', :multipart => true } do |f| %>
-<%= render :partial => 'news/form', :locals => { :f => f } %>
-<%= submit_tag l(:button_create) %>
-<%= preview_link preview_news_path(:project_id => @project), 'news-form' %> |
-<%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()' %>
-<% end if @project %>
-<div id="preview" class="wiki"></div>
+	<% if @project.project_type == 1 %>
+	<h3><%= l(:bale_news_notice)%></h3>
+	<% else %>
+	<h3><%= l(:label_news_new)%></h3>
+	<% end %>
+	<%= labelled_form_for @news, :url => project_news_index_path(@project),
+	:html => { :id => 'news-form', :multipart => true } do |f| %>
+	<%= render :partial => 'news/form', :locals => { :f => f } %>
+	<%= submit_tag l(:button_create) %>
+	<%= preview_link preview_news_path(:project_id => @project), 'news-form' %> |
+	<%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()' %>
+	<% end if @project %>
+	<div id="preview" class="wiki"></div>
 </div>
 
 <!--<h3><%=l(:label_news_plural)%></h3>
@@ -35,62 +36,69 @@
 <p class="nodata"><%= l(:label_no_data) %></p>
 <% else %>
 <% @newss.each do |news| %>
-    <h3><%= avatar(news.author, :size => "24") %><%= link_to_project(news.project) + ': ' unless news.project == @project %>
-    <%= link_to h(news.title), news_path(news) %>
-    <%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %></h3>
-    <p class="author"><%= authoring news.created_on, news.author %></p>
-    <div class="wiki">
-    <%= textilizable(news, :description) %>
-    </div>
+<h3><%= avatar(news.author, :size => "24") %><%= link_to_project(news.project) + ': ' unless news.project == @project %>
+<%= link_to h(news.title), news_path(news) %>
+<%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %></h3>
+<p class="author"><%= authoring news.created_on, news.author %></p>
+<div class="wiki">
+<%= textilizable(news, :description) %>
+</div>
 <% end %>
 <% end %> -->
 
 <!--add by huang :list news-->
 <div style="padding-top: 15px">
-<% if @newss.empty? %>
-<p class="nodata"><%= l(:label_no_data) %></p>
-<% else %>
-<% @newss.each do |news| %>
-<table width="660px" border="0" align="center" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;">
-  <tr>
-    <td colspan="2" valign="top" width="50" ><%=link_to image_tag(url_to_avatar(news.author), :class => "avatar"), user_path(news.author) %></td>
-    <td><table width="580px" border="0">
-    	<% if @project.project_type == 1 %>
-      <tr>
-        <td colspan="2" valign="top"><strong><%=link_to_user(news.author)if news.respond_to?(:author) %></strong> <span class="font_lighter"><%= l(:label_project_notice)%></span> <%= link_to h(news.title), news_path(news) %></td>
-      </tr>
-        <% else %>
-        <tr>
-        <td colspan="2" valign="top"><strong><%=link_to_user(news.author)if news.respond_to?(:author) %></strong> <span class="font_lighter"><%= l(:label_project_newshare)%></span> <%= link_to h(news.title), news_path(news) %></td>
-      </tr>
-        <% end %>
-      <tr>
-        <td colspan="2" width="580px" ><span class="font_description"><%= textilizable(news, :description) %></span></td>
-        </tr>
-      <tr>
-        <td align="left"><span class="font_lighter"> <%= format_time(news.created_on) %></span></td>
-        <td width="350" align="right" class="a"><%= link_to l(:label_project_newother),news_path(news)%><%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count >= 0 %></td>
-      </tr>
-    </table></td>
-  </tr>
-</table>
-<% end %>
-<% end %></div>
+	<% if @newss.empty? %>
+	<p class="nodata">
+		<%= l(:label_no_data) %>
+	</p>
+	<% else %>
+	<% @newss.each do |news| %>
+	<table width="660px" border="0" align="center" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;">
+		<tr>
+			<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(news.author), :class => "avatar"), user_path(news.author) %></td>
+			<td>
+			<table width="580px" border="0">
+				<% if @project.project_type == 1 %>
+				<tr>
+					<td colspan="2" valign="top"><strong><%= link_to_user(news.author)if news.respond_to?(:author) %></strong><span class="font_lighter"><%= l(:label_project_notice)%></span><span><%= link_to h(news.title), news_path(news) %></span>
+						<span style="float: right"><%= delete_link news_path(news) if User.current.allowed_to?(:manage_news, @project) %> </span></td> 						
+				</tr>
+				<% else %>
+				<tr>
+					<td colspan="2" valign="top"><strong><%= link_to_user(news.author)if news.respond_to?(:author) %></strong><span class="font_lighter"><%= l(:label_project_newshare)%></span><span> <%= link_to h(news.title), news_path(news) %></span>
+						<span style="float: right"> <%= delete_link news_path(news) if User.current.allowed_to?(:manage_news, @project) %> </span></td>
+				</tr>
+				<% end %>
+				<tr>
+					<td colspan="2" width="580px" ><span class="font_description"><%= textilizable(news, :description) %></span></td>
+				</tr>
+				<tr>
+					<td align="left"><span class="font_lighter"> <%= format_time(news.created_on) %></span></td>
+					<td width="350" align="right" class="a"><%= link_to l(:label_project_newother),news_path(news)%><%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count >= 0 %></td>
+				</tr>
+			</table></td>
+		</tr>
+	</table>
+	<% end %>
+	<% end %>
+</div>
 <!--end-->
 <div style="padding-right: 10px">
 	<div class="pagination">
-	<ul>
-		<%= pagination_links_full @news_pages %>
-	</ul>
-</div>
+		<ul>
+			<%= pagination_links_full @news_pages %>
+		</ul>
+	</div>
 
-<% other_formats_links do |f| %>
-  <%= f.link_to 'Atom', :url => {:project_id => @project, :key => User.current.rss_key} %>
-<% end %>
+	<% other_formats_links do |f| %>
+	<%= f.link_to 'Atom', :url => {:project_id => @project, :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})) %>
-  <%= stylesheet_link_tag 'scm' %>
-<% end %>
+	<% content_for :header_tags do %>
+	<%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
+	<%= stylesheet_link_tag 'scm' %>
+	<% end %>
 
-<% html_title(l(:label_news_plural)) -%> </div>
+	<% html_title(l(:label_news_plural)) -%>
+</div>
diff --git a/app/views/news/show.html.erb b/app/views/news/show.html.erb
index b8296716d..3c7d0adad 100644
--- a/app/views/news/show.html.erb
+++ b/app/views/news/show.html.erb
@@ -8,7 +8,7 @@
 	<%= delete_link news_path(@news) if User.current.allowed_to?(:manage_news, @project) %>
 </div>
 
-<h3><strong><%= h @news.title %></strong></h3>
+<h3><strong><%=h @news.title %></strong></h3>
 
 <% if authorize_for('news', 'edit') %>
 <div id="edit-news" style="display:none;">