aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-07-28 10:28:48 +0200
committerMario Vavti <mario@mariovavti.com>2016-07-28 10:28:48 +0200
commit9fa3956aa886f7522553ac161a42569706613b0c (patch)
treed59fa665a797a4d3ddc957bdd8e16a11dc905782 /include
parent02fc082e45cfaf6b313f40f1107122837019dd32 (diff)
downloadvolse-hubzilla-9fa3956aa886f7522553ac161a42569706613b0c.tar.gz
volse-hubzilla-9fa3956aa886f7522553ac161a42569706613b0c.tar.bz2
volse-hubzilla-9fa3956aa886f7522553ac161a42569706613b0c.zip
translate mime types to icons, update some icons, move file preview (upload progress) below table header
Diffstat (limited to 'include')
-rw-r--r--include/attach.php1
-rw-r--r--include/text.php33
2 files changed, 18 insertions, 16 deletions
diff --git a/include/attach.php b/include/attach.php
index b3ddfee88..7123d59fe 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -74,6 +74,7 @@ function z_mime_content_type($filename) {
// 'webm' => 'audio/webm',
'mp4' => 'video/mp4',
// 'mp4' => 'audio/mp4',
+ 'mkv' => 'video/x-matroska',
// adobe
'pdf' => 'application/pdf',
diff --git a/include/text.php b/include/text.php
index dd7d9eaa8..1eec2ba0a 100644
--- a/include/text.php
+++ b/include/text.php
@@ -2608,32 +2608,33 @@ function getIconFromType($type) {
'application/octet-stream' => 'fa-file-o',
//Text
'text/plain' => 'fa-file-text-o',
- 'application/msword' => 'fa-file-text-o',
- 'application/pdf' => 'fa-file-text-o',
- 'application/vnd.oasis.opendocument.text' => 'fa-file-text-o',
+ 'application/msword' => 'fa-file-word-o',
+ 'application/pdf' => 'fa-file-pdf-o',
+ 'application/vnd.oasis.opendocument.text' => 'fa-file-word-o',
'application/epub+zip' => 'fa-book',
//Spreadsheet
- 'application/vnd.oasis.opendocument.spreadsheet' => 'fa-table',
- 'application/vnd.ms-excel' => 'fa-table',
+ 'application/vnd.oasis.opendocument.spreadsheet' => 'fa-file-excel-o',
+ 'application/vnd.ms-excel' => 'fa-file-excel-o',
//Image
'image/jpeg' => 'fa-picture-o',
'image/png' => 'fa-picture-o',
'image/gif' => 'fa-picture-o',
'image/svg+xml' => 'fa-picture-o',
//Archive
- 'application/zip' => 'fa-archive',
- 'application/x-rar-compressed' => 'fa-archive',
+ 'application/zip' => 'fa-file-archive-o',
+ 'application/x-rar-compressed' => 'fa-file-archive-o',
//Audio
- 'audio/mpeg' => 'fa-music',
- 'audio/wav' => 'fa-music',
- 'application/ogg' => 'fa-music',
- 'audio/ogg' => 'fa-music',
- 'audio/webm' => 'fa-music',
- 'audio/mp4' => 'fa-music',
+ 'audio/mpeg' => 'fa-file-audio-o',
+ 'audio/wav' => 'fa-file-audio-o',
+ 'application/ogg' => 'fa-file-audio-o',
+ 'audio/ogg' => 'fa-file-audio-o',
+ 'audio/webm' => 'fa-file-audio-o',
+ 'audio/mp4' => 'fa-file-audio-o',
//Video
- 'video/quicktime' => 'fa-film',
- 'video/webm' => 'fa-film',
- 'video/mp4' => 'fa-film'
+ 'video/quicktime' => 'fa-file-video-o',
+ 'video/webm' => 'fa-file-video-o',
+ 'video/mp4' => 'fa-file-video-o',
+ 'video/x-matroska' => 'fa-file-video-o'
);
$iconFromType = 'fa-file-o';