diff --git a/app/helpers/dmsf_helper.rb b/app/helpers/dmsf_helper.rb index 2d3a1a4c..99576739 100644 --- a/app/helpers/dmsf_helper.rb +++ b/app/helpers/dmsf_helper.rb @@ -63,7 +63,8 @@ module DmsfHelper else cls = Redmine::MimeType.css_class_of(filename) end - cls + ' dmsf-icon-file' + cls << ' dmsf-icon-file' if cls + cls end def plugin_asset_path(plugin, asset_type, source) diff --git a/app/views/dmsf/_dir_trash.html.erb b/app/views/dmsf/_dir_trash.html.erb index 12760578..bc581341 100644 --- a/app/views/dmsf/_dir_trash.html.erb +++ b/app/views/dmsf/_dir_trash.html.erb @@ -81,7 +81,7 @@ :data => {:confirm => l(:text_are_you_sure)}, :title => l(:title_delete), :method => :delete, - :class => 'icon-only icon-delete') %> + :class => 'icon-only icon-del') %> <% end %> <% end %> diff --git a/app/views/dmsf/_file_trash.html.erb b/app/views/dmsf/_file_trash.html.erb index 5844678f..55f54355 100644 --- a/app/views/dmsf/_file_trash.html.erb +++ b/app/views/dmsf/_file_trash.html.erb @@ -76,7 +76,7 @@ :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:title_delete), - :class => 'icon-only icon-delete') %> + :class => 'icon-only icon-del') %> <% end %> 1 diff --git a/app/views/dmsf_files/show.html.erb b/app/views/dmsf_files/show.html.erb index 73c2dc14..9dd32195 100644 --- a/app/views/dmsf_files/show.html.erb +++ b/app/views/dmsf_files/show.html.erb @@ -81,13 +81,13 @@
- <%= link_to_function image_tag('rev_downloads.png', :plugin => 'redmine_dmsf'), + <%= link_to_function image_tag('group.png'), "$('#revision_access-#{revision.id}').toggle()", :title => l(:title_download_entries) %> - <%= link_to image_tag('rev_download.png', :plugin => 'redmine_dmsf'), + <%= link_to image_tag('download.png'), view_dmsf_file_path(@file, :download => revision), :title => l(:title_title_version_version_download, :title => h(revision.title), :version => revision.version) %> - <%= link_to image_tag('rev_delete.png', :plugin => 'redmine_dmsf'), + <%= link_to image_tag('delete.png'), delete_revision_path(revision), :data => {:confirm => l(:text_are_you_sure)}, :title => l(:title_delete_revision) if @file_delete_allowed && (@file.dmsf_file_revisions.visible.count > 1) %> diff --git a/assets/images/rev_delete.png b/assets/images/rev_delete.png deleted file mode 100644 index 8c631734..00000000 Binary files a/assets/images/rev_delete.png and /dev/null differ diff --git a/assets/images/rev_download.png b/assets/images/rev_download.png deleted file mode 100644 index c3c74e1a..00000000 Binary files a/assets/images/rev_download.png and /dev/null differ diff --git a/assets/images/rev_downloads.png b/assets/images/rev_downloads.png deleted file mode 100644 index d1d9debc..00000000 Binary files a/assets/images/rev_downloads.png and /dev/null differ diff --git a/assets/stylesheets/redmine_dmsf.css b/assets/stylesheets/redmine_dmsf.css index 1bcfba2c..3c822a67 100644 --- a/assets/stylesheets/redmine_dmsf.css +++ b/assets/stylesheets/redmine_dmsf.css @@ -199,9 +199,6 @@ div.dmsf_revision_inner_box .attribute .label { .icon-wf-none { background-image: url(../images/none.png); } .icon-wf-waiting { background-image: url(../images/waiting_for_approval.png); } .icon-wf-assigned { background-image: url(../images/assigned.png); } -.icon-delete { background-image: url(../images/rev_delete.png); } -.icon-download { background-image: url(../images/rev_download.png); } -.icon-downloads { background-image: url(../images/rev_downloads.png); } .icon-link { background-image: url(../../../images/link.png); } .icon-approvalworkflows { background-image: url(../../../images/ticket_go.png); }