diff --git a/app/models/dmsf_file_revision.rb b/app/models/dmsf_file_revision.rb index 22cdbb71..66f01560 100644 --- a/app/models/dmsf_file_revision.rb +++ b/app/models/dmsf_file_revision.rb @@ -49,6 +49,7 @@ class DmsfFileRevision < ActiveRecord::Base 'application/vnd.oasis.opendocument.spreadsheet' => 'ms-excel', 'application/vnd.oasis.opendocument.text' => 'ms-word', 'application/vnd.oasis.opendocument.presentation' => 'ms-powerpoint', + 'application/vnd.ms-excel.sheet.macroEnabled.12' => 'ms-exel' }.freeze scope :visible, -> { where(deleted: STATUS_ACTIVE) } diff --git a/assets/images/filetypes/docx.png b/assets/images/filetypes/docx.png deleted file mode 100644 index 8cca68cd..00000000 Binary files a/assets/images/filetypes/docx.png and /dev/null differ diff --git a/assets/images/filetypes/xlsx.png b/assets/images/filetypes/xlsx.png deleted file mode 100644 index 0f227dc1..00000000 Binary files a/assets/images/filetypes/xlsx.png and /dev/null differ diff --git a/assets/stylesheets/redmine_dmsf.css b/assets/stylesheets/redmine_dmsf.css index d884d278..3a1f3a0f 100644 --- a/assets/stylesheets/redmine_dmsf.css +++ b/assets/stylesheets/redmine_dmsf.css @@ -150,7 +150,7 @@ div[id*="revision_access_"] { .dmsf-system .icon-folder { background-image: url(../images/folder_system.png); } .icon-file.filetype-doc, .icon-file.filetype-docx { background-image: url(../images/filetypes/doc.png); } -.icon-file.filetype-xls, .icon-file.filetype-xlsx { background-image: url(../images/filetypes/xls.png); } +.icon-file.filetype-xls, .icon-file.filetype-xlsx, .icon-file.filetype-xlsm { background-image: url(../images/filetypes/xls.png); } .icon-file.filetype-ppt, .icon-file.filetype-pptx { background-image: url(../images/filetypes/ppt.png); } .icon-file.filetype-vsd, .icon-file.filetype-vsdx { background-image: url(../images/filetypes/vsd.png); } .icon-file.filetype-mpp { background-image: url(../images/filetypes/mpp.png); } @@ -164,6 +164,7 @@ div[id*="revision_access_"] { .dmsf-gray .icon-file.filetype-docx { background-image: url(../images/filetypes/doc_gray.png); } .dmsf-gray .icon-file.filetype-xls { background-image: url(../images/filetypes/xls_gray.png); } .dmsf-gray .icon-file.filetype-xlsx { background-image: url(../images/filetypes/xls_gray.png); } +.dmsf-gray .icon-file.filetype-xlsm { background-image: url(../images/filetypes/xls_gray.png); } .dmsf-gray .icon-file.filetype-ppt { background-image: url(../images/filetypes/ppt_gray.png); } .dmsf-gray .icon-file.filetype-pptx { background-image: url(../images/filetypes/ppt_gray.png); } .dmsf-gray .icon-file.filetype-vsd { background-image: url(../images/filetypes/vsd_gray.png); }