Merge r23860 from trunk to 6.0-stable (#42794).

git-svn-id: https://svn.redmine.org/redmine/branches/6.0-stable@23870 e93f8b46-1217-0410-a6f0-8f06a7374b81

5 files changed, 7 insertions, 7 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f5971d138..be346a109 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -782,7 +782,7 @@ module ApplicationHelper
   end
 
   def other_formats_links(&)
-    concat('<p class="other-formats">'.html_safe + l(:label_export_to))
+    concat('<p class="other-formats hide-when-print">'.html_safe + l(:label_export_to))
     yield Redmine::Views::OtherFormatsBuilder.new(self)
     concat('</p>'.html_safe)
   end
diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index df562c6f2..e8b151ef6 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -15,7 +15,7 @@
       <% query.inline_columns.each do |column| %>
         <%= column_header(query, column, query_options) %>
       <% end %>
-      <th class="buttons"></th>
+      <th class="buttons hide-when-print"></th>
     </tr>
   </thead>
   <tbody>
@@ -36,7 +36,7 @@
     <% query.inline_columns.each do |column| %>
     <%= content_tag('td', column_content(column, issue), :class => column.css_classes) %>
     <% end %>
-    <td class="buttons"><%= link_to_context_menu %></td>
+    <td class="buttons hide-when-print"><%= link_to_context_menu %></td>
   </tr>
   <% query.block_columns.each do |column|
        if (text = column_content(column, issue)) && text.present? -%>
diff --git a/app/views/timelog/_list.html.erb b/app/views/timelog/_list.html.erb
index 1a82b5f51..6c518161f 100644
--- a/app/views/timelog/_list.html.erb
+++ b/app/views/timelog/_list.html.erb
@@ -11,7 +11,7 @@
     <% @query.inline_columns.each do |column| %>
       <%= column_header(@query, column) %>
     <% end %>
-    <th></th>
+    <th class="hide-when-print"></th>
   </tr>
 </thead>
 <tbody>
@@ -36,7 +36,7 @@
     <% @query.inline_columns.each do |column| %>
     <%= content_tag('td', column_content(column, entry), :class => column.css_classes) %>
     <% end %>
-    <td class="buttons">
+    <td class="buttons hide-when-print">
     <% if entry.editable_by?(User.current) -%>
         <%= link_to sprite_icon('edit', l(:button_edit)), edit_time_entry_path(entry),
                     :title => l(:button_edit),
diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb
index 6c3d518bc..45b254a7d 100644
--- a/app/views/versions/index.html.erb
+++ b/app/views/versions/index.html.erb
@@ -40,7 +40,7 @@
             <td class="checkbox"><%= check_box_tag 'ids[]', issue.id, false, :id => nil %></td>
             <td class="assigned_to"><%= assignee_avatar(issue.assigned_to, :size => 16) %></td>
             <td class="subject"><%= link_to_issue(issue, :project => (@project != issue.project)) %></td>
-            <td class="buttons"><%= link_to_context_menu %></td>
+            <td class="buttons hide-when-print"><%= link_to_context_menu %></td>
           </tr>
         <% end -%>
         </table>
diff --git a/app/views/versions/show.html.erb b/app/views/versions/show.html.erb
index f83aff80d..cdd2b3029 100644
--- a/app/views/versions/show.html.erb
+++ b/app/views/versions/show.html.erb
@@ -54,7 +54,7 @@
       <td class="checkbox"><%= check_box_tag 'ids[]', issue.id, false, :id => nil %></td>
       <td class="assigned_to"><%= assignee_avatar(issue.assigned_to, :size => 16) %></td>
       <td class="subject"><%= link_to_issue(issue, :project => (@project != issue.project)) %></td>
-      <td class="buttons"><%= link_to_context_menu %></td>
+      <td class="buttons hide-when-print"><%= link_to_context_menu %></td>
     </tr>
   <% end %>
   </table>