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 @@ --> - - -
<%= link_to h(document.title), document_path(document) %>
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) %> -

<%=h @news.title %>

+

<%=h @news.title %>

+ <% if authorize_for('news', 'edit') %> --> -<% if @news.commentable? %>
-

<%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments" %>

-<%= form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form", :style => "display:none;") do %> -
- <%= text_area 'comment', 'comments', :cols => 80, :rows => 15, :class => 'wiki-edit' %> - <%= wikitoolbar_for 'comment_comments' %> -
-

<%= submit_tag l(:button_add) %>

-<% end %> -<% end %> -
-

<%= l(:label_comment_plural) %>

+

<%= l(:label_comment_plural) %>

<% @comments.each do |comment| %> <% next if comment.new_record? %> @@ -54,7 +44,7 @@
<%= image_tag(url_to_avatar(comment.author), :class => "avatar")%> - + @@ -71,7 +61,7 @@ - +<% end %> <% html_title @news.title -%> <% content_for :header_tags do %> <%= stylesheet_link_tag 'scm' %> -<% end %> +<% end %> \ No newline at end of file
<%=link_to_user(comment.author) if comment.respond_to?(:author) %> 发表了<%= l(:label_comment_plural) %><%=link_to_user(comment.author) if comment.respond_to?(:author) %> 添加了<%= l(:label_comment_plural) %>

<%= textilizable(comment.comments) %>