From f8279b99da34caac63d39f5c521eaa7144c45156 Mon Sep 17 00:00:00 2001 From: "karel.picman@lbcfree.net" Date: Sun, 25 Apr 2021 09:16:44 +0200 Subject: [PATCH] Double link icon --- app/helpers/dmsf_queries_helper.rb | 4 ++-- app/views/dmsf_context_menus/_file.html.erb | 2 +- app/views/dmsf_context_menus/_folder.html.erb | 2 +- app/views/dmsf_context_menus/_main.html.erb | 2 +- app/views/dmsf_context_menus/_revisions.html.erb | 2 +- assets/stylesheets/easy_extensions.css | 5 +++++ assets/stylesheets/redmine_dmsf.css | 2 +- 7 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/helpers/dmsf_queries_helper.rb b/app/helpers/dmsf_queries_helper.rb index be0cfd26..9a04ba42 100644 --- a/app/helpers/dmsf_queries_helper.rb +++ b/app/helpers/dmsf_queries_helper.rb @@ -137,9 +137,9 @@ module DmsfQueriesHelper tag + content_tag('div', item.filename, class: 'dmsf-filename', title: l(:title_filename_for_download)) when 'url-link' if item&.deleted? - tag = content_tag('span', value, class: 'icon icon-link') + tag = content_tag('span', value, class: 'icon dmsf-icon-link') else - tag = link_to(h(value), item.filename, target: '_blank', class: 'icon icon-link') + tag = link_to(h(value), item.filename, target: '_blank', class: 'icon dmsf-icon-link') unless filter_any? tag = "".html_safe + tag end diff --git a/app/views/dmsf_context_menus/_file.html.erb b/app/views/dmsf_context_menus/_file.html.erb index ed36f1e3..eff1c647 100644 --- a/app/views/dmsf_context_menus/_file.html.erb +++ b/app/views/dmsf_context_menus/_file.html.erb @@ -33,7 +33,7 @@ <%= link_to l(:label_link_to), new_dmsf_link_path(project_id: dmsf_file.project.id, dmsf_folder_id: dmsf_file.dmsf_folder&.id, dmsf_file_id: dmsf_file.id, type: 'link_to'), - title: l(:title_create_link), class: 'icon icon-link' %> + title: l(:title_create_link), class: 'icon dmsf-icon-link' %> <% end %>
  • diff --git a/app/views/dmsf_context_menus/_folder.html.erb b/app/views/dmsf_context_menus/_folder.html.erb index 400dcda2..fd736f4c 100644 --- a/app/views/dmsf_context_menus/_folder.html.erb +++ b/app/views/dmsf_context_menus/_folder.html.erb @@ -32,7 +32,7 @@
  • <%= context_menu_link l(:label_link_to), new_dmsf_link_path(project_id: dmsf_folder.id, dmsf_folder_id: dmsf_folder.id, type: 'link_to'), - class: 'icon icon-link' %> + class: 'icon dmsf-icon-link' %>
  • <% end %>
  • diff --git a/app/views/dmsf_context_menus/_main.html.erb b/app/views/dmsf_context_menus/_main.html.erb index 25204d0a..d97c83fb 100644 --- a/app/views/dmsf_context_menus/_main.html.erb +++ b/app/views/dmsf_context_menus/_main.html.erb @@ -57,7 +57,7 @@ <%= link_to l(:label_link_from), new_dmsf_link_path(project_id: project.id, dmsf_folder_id: folder ? folder.id : folder, type: 'link_from'), title: l(:title_create_link), - class: 'icon icon-link' %> + class: 'icon dmsf-icon-link' %> <% end %> <% end %> <% if trash_enabled %> diff --git a/app/views/dmsf_context_menus/_revisions.html.erb b/app/views/dmsf_context_menus/_revisions.html.erb index d9b98696..70ee0d11 100644 --- a/app/views/dmsf_context_menus/_revisions.html.erb +++ b/app/views/dmsf_context_menus/_revisions.html.erb @@ -34,7 +34,7 @@ <%= link_to l(:label_link_to), new_dmsf_link_path(project_id: project.id, dmsf_folder_id: file.dmsf_folder ? file.dmsf_folder.id : nil, dmsf_file_id: file.id, type: 'link_to'), title: l(:title_create_link), - class: 'icon icon-link' %> + class: 'icon dmsf-icon-link' %> <%= link_to "#{l(:button_copy)}/#{l(:button_move)}", copy_file_path(id: file), title: l(:title_copy), class: 'icon icon-copy' %> <%= delete_link(dmsf_file_path(id: file, details: true)) if file_delete_allowed %> diff --git a/assets/stylesheets/easy_extensions.css b/assets/stylesheets/easy_extensions.css index 2cffc120..5ac3be18 100644 --- a/assets/stylesheets/easy_extensions.css +++ b/assets/stylesheets/easy_extensions.css @@ -78,6 +78,11 @@ td.dmsf-title a.icon-folder::before { color: #FFE9A2; } +.dmsf-icon-link:before { + content: "\F0337" !important; + font-family: "Material Icons"; +} + /* +/- icons */ .dmsf-row-control { width: auto; diff --git a/assets/stylesheets/redmine_dmsf.css b/assets/stylesheets/redmine_dmsf.css index 7058bb39..131f152f 100644 --- a/assets/stylesheets/redmine_dmsf.css +++ b/assets/stylesheets/redmine_dmsf.css @@ -137,7 +137,7 @@ div[id*="revision_access_"] { } /* Command icons */ -.icon-link { background-image: url(../../../images/link.png); } +.dmsf-icon-link { background-image: url(../../../images/link.png); } .icon-approvalworkflows { background-image: url(../../../images/ticket_go.png); } /* File types */