From: Go MAEDA <maeda@farend.jp>
Date: Sun, 4 Nov 2018 07:26:29 +0000 (+0000)
Subject: Move attachments to their own section in issue page (#29033).
X-Git-Tag: 4.0.0~66
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2f1c9f54119763aae616fd9e9a3408198ee40620;p=redmine.git

Move attachments to their own section in issue page (#29033).

Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@17619 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 97a2448d6..5a1cc8599 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -75,9 +75,8 @@ end %>
 <%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
 </div>
 
-<% if @issue.description? || @issue.attachments.any? -%>
-<hr />
 <% if @issue.description? %>
+<hr />
 <div class="description">
   <div class="contextual">
   <%= link_to l(:button_quote), quoted_issue_path(@issue), :remote => true, :method => 'post', :class => 'icon icon-comment' if @issue.notes_addable? %>
@@ -89,8 +88,11 @@ end %>
   </div>
 </div>
 <% end %>
-<%= link_to_attachments @issue, :thumbnails => true %>
-<% end -%>
+<% if @issue.attachments.any? %>
+  <hr />
+  <p><strong><%=l(:label_attachment_plural)%></strong></p>
+  <%= link_to_attachments @issue, :thumbnails => true %>
+<% end %>
 
 <%= render_full_width_custom_fields_rows(@issue) %>
 
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index ec5bb57df..19fb90f58 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -795,7 +795,6 @@ a.remove-upload:hover {text-decoration:none !important;}
 
 div.fileover { background-color: lavender; }
 
-div.attachments { margin: 12px 0; }
 div.attachments p { margin:4px 0 2px 0; }
 div.attachments img { vertical-align: middle; }
 div.attachments span.author { font-size: 0.9em; color: #888; }