From ac5b10f4fbbe76579cc7c7f3325bd28a1814506c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= <karel.picman@kontron.com>
Date: Tue, 17 May 2022 15:34:05 +0200
Subject: [PATCH] Add download icon #1359

---
 app/views/dmsf_files/_link.html.erb       | 23 ++++++++++++++++++-----
 app/views/dmsf_files/_links.html.erb      | 14 ++++++++++----
 app/views/dmsf_files/_thumbnails.html.erb |  2 +-
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/app/views/dmsf_files/_link.html.erb b/app/views/dmsf_files/_link.html.erb
index ddcd0437..a697ed3e 100644
--- a/app/views/dmsf_files/_link.html.erb
+++ b/app/views/dmsf_files/_link.html.erb
@@ -20,10 +20,12 @@
   # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 %>
 <% if link %>
-  <p class="dmsf-gray">
+  <% cls = 'dmsf-gray' %>
 <% else %>
-  <p>
+  <% cls = '' %>
 <% end %>
+
+<td class="<%= cls %>">
   <% file_view_url = url_for({ controller: :dmsf_files, action: 'view', id: dmsf_file }) %>
   <%= link_to h(link ? link.name : dmsf_file.title),
     file_view_url,
@@ -31,10 +33,21 @@
     class: "icon icon-file #{DmsfHelper.filetype_css(dmsf_file.name)}",
     title: h(dmsf_file.last_revision.try(:tooltip)),
     'data-downloadurl' => "#{dmsf_file.last_revision.detect_content_type}:#{h(dmsf_file.name)}:#{file_view_url}" %>
-  <%= " - #{dmsf_file.description}" unless dmsf_file.description.blank? %>
+</td>
+<td class="<%= cls %>">
   <span class="size">(<%= number_to_human_size dmsf_file.last_revision.size %>)</span>
+  <%= link_to '', view_dmsf_file_path(dmsf_file, download: dmsf_file.last_revision, disposition: 'attachment'),
+        title: l(:title_title_version_version_download, title: h(dmsf_file.last_revision.title),
+        version: dmsf_file.last_revision.version), class: 'icon icon-download dmsf-revision-action-button' %>
+</td>
+<td class="<%= cls %>">
+  <%= dmsf_file.description unless dmsf_file.description.blank? %>
+</td>
+<td class="<%= cls %>">
   <span class="author"><%= dmsf_file.last_revision.user %>, <%= format_time(dmsf_file.last_revision.updated_at) %></span>
-  <% # Command icons %>
+</td>
+<% # Command icons %>
+<td class="<%= cls %>">
   <span class="dmsf_upload_select">
     <% # Details %>
     <% if User.current.allowed_to? :file_manipulation, dmsf_file.project %>
@@ -94,4 +107,4 @@
          workflows_available: DmsfWorkflow.where(['project_id = ? OR project_id IS NULL', dmsf_file.project_id]).exists?,
          project: dmsf_file.project, wf: wf, dmsf_link_id: nil, back_url: issue_path(@issue) } %>
   </span>
-</p>
+</td>
diff --git a/app/views/dmsf_files/_links.html.erb b/app/views/dmsf_files/_links.html.erb
index 5744992b..cef5f07a 100644
--- a/app/views/dmsf_files/_links.html.erb
+++ b/app/views/dmsf_files/_links.html.erb
@@ -22,12 +22,18 @@
 
 <% if links.present? %>
   <hr/>
-  <strong><%= l(:menu_dmsf) %></strong>
+  <p>
+    <strong><%= l(:menu_dmsf) %></strong>
+  </p>
   <div class="attachments dmsf-parent-container">
     <% # DMS documents & links %>
-    <% links.each do |dmsf_file, link, _| %>
-        <%= render partial: 'dmsf_files/link', locals: { dmsf_file: dmsf_file, link: link } %>
-    <% end %>
+    <table>
+        <% links.each do |dmsf_file, link, _| %>
+        <tr>
+          <%= render partial: 'dmsf_files/link', locals: { dmsf_file: dmsf_file, link: link } %>
+        </tr>
+        <% end %>
+    </table>
     <%= render partial: 'dmsf_files/thumbnails', locals: { links: links, thumbnails: thumbnails, link_to: true } %>
   </div>
 <% end %>
diff --git a/app/views/dmsf_files/_thumbnails.html.erb b/app/views/dmsf_files/_thumbnails.html.erb
index ca8e0a71..883690b2 100644
--- a/app/views/dmsf_files/_thumbnails.html.erb
+++ b/app/views/dmsf_files/_thumbnails.html.erb
@@ -30,7 +30,7 @@
           <% images.each do |file| %>
               <div>
                 <% if link_to # Redmine classic %>
-                    <%= link_to image_tag(dmsf_thumbnail_path(file)), view_dmsf_file_path(file), alt: file.title %>
+                    <%= link_to image_tag(dmsf_thumbnail_path(file), alt: file.title), view_dmsf_file_path(file) %>
                 <% else # jQuery gallery %>
                     <%= image_tag(dmsf_thumbnail_path(file),
                       { :'data-fullsrc' => view_dmsf_file_path(file), alt: file.title }) %>