From 24b000fb242eb71c3c55bfaf30039edbbf359c6a Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Mon, 24 Sep 2007 19:26:09 +0000 Subject: [PATCH] Slight change to issues/show. git-svn-id: http://redmine.rubyforge.org/svn/trunk@762 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/attachments/_links.rhtml | 2 +- app/views/issues/show.rhtml | 10 +++++----- public/stylesheets/application.css | 2 ++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/views/attachments/_links.rhtml b/app/views/attachments/_links.rhtml index afae91a7b..cce11292e 100644 --- a/app/views/attachments/_links.rhtml +++ b/app/views/attachments/_links.rhtml @@ -3,7 +3,7 @@

<%= link_to attachment.filename, {:controller => 'attachments', :action => 'download', :id => attachment }, :class => 'icon icon-attachment' %> (<%= number_to_human_size attachment.filesize %>) <% unless options[:no_author] %> - <%= attachment.author.name %>, <%= format_date(attachment.created_on) %> + <%= attachment.author.name %>, <%= format_date(attachment.created_on) %> <% end %> <% if options[:delete_url] %> <%= link_to image_tag('delete.png'), options[:delete_url].update({:attachment_id => attachment}), :confirm => l(:text_are_you_sure), :method => :post %> diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml index de9e38bb9..593fdad10 100644 --- a/app/views/issues/show.rhtml +++ b/app/views/issues/show.rhtml @@ -62,9 +62,13 @@ end %> <% end %> -

<%=l(:field_description)%>

+

<%=l(:field_description)%>

<%= textilizable @issue.description, :attachments => @issue.attachments %> +<% if @issue.attachments.any? %> +<%= link_to_attachments @issue.attachments, :delete_url => (authorize_for('issues', 'destroy_attachment') ? {:controller => 'issues', :action => 'destroy_attachment', :id => @issue} : nil) %> +<% end %> + <% if authorize_for('issue_relations', 'new') || @issue.relations.any? %>
@@ -72,10 +76,6 @@ end %>
<% end %> -<% if @issue.attachments.any? %> -<%= link_to_attachments @issue.attachments, :delete_url => (authorize_for('issues', 'destroy_attachment') ? {:controller => 'issues', :action => 'destroy_attachment', :id => @issue} : nil) %> -<% end %> - <% if authorize_for('issues', 'change_status') and @status_options and !@status_options.empty? %> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 1f030cfbd..af79e9b10 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -131,6 +131,8 @@ margin*/ .required {color: #bb0000;} .summary {font-style: italic;} +div.attachments p { margin:4px 0 2px 0; } + /***** Flash & error messages ****/ #flash div, #errorExplanation, .nodata { padding: 4px 4px 4px 30px; -- 2.39.5