From 7b3c201469bcd0eda4c285307346bdb07deefed7 Mon Sep 17 00:00:00 2001
From: huangjingquan <huang@163.com>
Date: Tue, 6 Aug 2013 16:32:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=B8=80=E4=B8=AAbu?=
 =?UTF-8?q?g=EF=BC=88=E6=96=B0=E9=97=BB=E5=AD=90=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=BA=95=E6=A1=86=E4=B9=B1=E9=A3=9E=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/documents/_document.html.erb |  3 ---
 app/views/news/show.html.erb           | 24 +++++++-----------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/app/views/documents/_document.html.erb b/app/views/documents/_document.html.erb
index 20d3af415..b585f5dff 100644
--- a/app/views/documents/_document.html.erb
+++ b/app/views/documents/_document.html.erb
@@ -6,9 +6,6 @@
 </div> -->
 
 <!--add by huang-->
-
-
-
 <table width="660px" align="center">
 	<tr><td class="font_title_document"><%= link_to h(document.title), document_path(document) %></td></tr>
 	<tr><td colspan="2">
diff --git a/app/views/news/show.html.erb b/app/views/news/show.html.erb
index 516b46a54..bef124796 100644
--- a/app/views/news/show.html.erb
+++ b/app/views/news/show.html.erb
@@ -8,7 +8,8 @@
 <%= delete_link news_path(@news) if User.current.allowed_to?(:manage_news, @project) %>
 </div>
 
-<h3><%=h @news.title %></h3>	
+<h3><%=h @news.title %></h3>
+
 <% if authorize_for('news', 'edit') %>
 <div id="edit-news" style="display:none;">
 <%= labelled_form_for :news, @news, :url => news_path(@news),
@@ -34,19 +35,8 @@
 <% end if @comments.any? %>
 </div>  -->
 <!--add by huang-->
-<% if @news.commentable? %>
 <div id="comments" style="margin-bottom:16px;">
-<h3 class="comments"><%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments" %></h3>
-<%= form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form", :style => "display:none;") do %>
-<div class="box">
-    <%= text_area 'comment', 'comments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>
-    <%= wikitoolbar_for 'comment_comments' %>
-</div>
-<p><%= submit_tag l(:button_add) %></p>
-<% end %>
-<% end %>
-</div>
-<h3><%= l(:label_comment_plural) %></h3>
+<h3 class="comments"><%= l(:label_comment_plural) %></h3>
 <% @comments.each do |comment| %>
     <% next if comment.new_record? %>
 <table width="660px" border="0" align="center">
@@ -54,7 +44,7 @@
     <td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(comment.author), :class => "avatar")%></td>
     <td><table width="580px" border="0">
       <tr>
-        <td colspan="2" valign="top"><strong><%=link_to_user(comment.author) if comment.respond_to?(:author) %></strong> <span class="font_lighter">发表了<%= l(:label_comment_plural) %></span></td>
+        <td colspan="2" valign="top"><strong><%=link_to_user(comment.author) if comment.respond_to?(:author) %></strong> <a class="font_lighter">添加了</a><%= l(:label_comment_plural) %></td>
         </tr>
       <tr>
         <td colspan="2" width="580px" ><p class="font_description"> <%= textilizable(comment.comments) %></p></td>
@@ -71,7 +61,7 @@
 </div>
 
 
-<!-- <% if @news.commentable? %>
+<% if @news.commentable? %>
 <p><%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments" %></p>
 <%= form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form", :style => "display:none;") do %>
 <div class="box">
@@ -80,10 +70,10 @@
 </div>
 <p><%= submit_tag l(:button_add) %></p>
 <% end %>
-<% end %> -->
+<% end %>
 
 <% html_title @news.title -%>
 
 <% content_for :header_tags do %>
   <%= stylesheet_link_tag 'scm' %>
-<% end %>
+<% end %>
\ No newline at end of file