From 7b2a73f55d86e17fcc90bbc8d08c46bbf118872f Mon Sep 17 00:00:00 2001 From: yan Date: Thu, 29 Aug 2013 20:30:24 +0800 Subject: [PATCH] fix news/ attachment --- app/views/news/show.html.erb | 145 +++++++++++++++++------------------ 1 file changed, 71 insertions(+), 74 deletions(-) diff --git a/app/views/news/show.html.erb b/app/views/news/show.html.erb index 9e9e46e41..b8296716d 100644 --- a/app/views/news/show.html.erb +++ b/app/views/news/show.html.erb @@ -1,88 +1,85 @@
-<%= watcher_link(@news, User.current) %> -<%= link_to(l(:button_edit), - edit_news_path(@news), - :class => 'icon icon-edit', - :accesskey => accesskey(:edit), - :onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_news, @project) %> -<%= delete_link news_path(@news) if User.current.allowed_to?(:manage_news, @project) %> + <%= watcher_link(@news, User.current) %> + <%= link_to(l(:button_edit), + edit_news_path(@news), + :class => 'icon icon-edit', + :accesskey => accesskey(:edit), + :onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_news, @project) %> + <%= delete_link news_path(@news) if User.current.allowed_to?(:manage_news, @project) %>
-

<%=h @news.title %>

+

<%= h @news.title %>

<% if authorize_for('news', 'edit') %> <% end %> - - +
-
-<%= @news.description %> - - -<% 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 %> +
+ <%= @news.description %> +
+ <%= link_to_attachments @news %> +
+ + <% 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 %> -<% html_title @news.title -%> + <% html_title @news.title -%> -<% content_for :header_tags do %> - <%= stylesheet_link_tag 'scm' %> -<% end %> + <% content_for :header_tags do %> + <%= stylesheet_link_tag 'scm' %> + <% end %> - -
-
-

<%= l(:label_comment_plural) %>

-<% comments = @comments.reverse %> -<% comments.each do |comment| %> - <% next if comment.new_record? %> - - - - - -
<%= image_tag(url_to_avatar(comment.author), :class => "avatar")%> - - - - - - - - - - -
<%=link_to_user(comment.author) if comment.respond_to?(:author) %> - <%= l(:label_project_newadd) %><%= l(:label_comment_plural) %>

<%= textilizable(comment.comments) %>

<%= @news.created_on %><%= link_to_if_authorized image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment}, - :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %>
-<% end if @comments.any? %> + +
+
+

<%= l(:label_comment_plural) %>

+ <% comments = @comments.reverse %> + <% comments.each do |comment| %> + <% next if comment.new_record? %> + + + + + +
<%= image_tag(url_to_avatar(comment.author), :class => "avatar")%> + + + + + + + + + + + +
<%= link_to_user(comment.author) if comment.respond_to?(:author) %> <%= l(:label_project_newadd) %><%= l(:label_comment_plural) %>
+

+ <%= textilizable(comment.comments) %> +

<%= @news.created_on %><%= link_to_if_authorized image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment}, + :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %>
+ <% end if @comments.any? %>